commit eba6f11946156156f0edd2e3c091ff2363b62f99
author Alexandra Buzila <abuzila@eclipsesource.com> Wed Nov 30 12:02:20 2016 +0100
committer Alexandra Buzila <abuzila@eclipsesource.com> Wed Nov 30 12:02:20 2016 +0100
tree b3bd8ed4c05408ea7bcf06fe600f17541acc0bfa
parent 7639c2c12ee8cf8d37965454ec4c91c71564c730

Bug 508118 - Ecore Editor fails to load with NPE


Change-Id: I13abb04306fb566340eb3d3e2094c4e36b70fedb
Signed-off-by: Alexandra Buzila <abuzila@eclipsesource.com>

bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java

diff --git a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java
index 485d169..1867667 100644
--- a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java
+++ b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java
@@ -463,7 +463,8 @@
 	 */
 	protected ResourceSet loadResource(IEditorInput editorInput) {
 		final IURIEditorInput uei = (IURIEditorInput) editorInput;
-		return ResourceSetHelpers.loadResourceSetWithProxies(URI.createURI(uei.getURI().toString(), false),
+		final String uriString = URI.decode(uei.getURI().toString());
+		return ResourceSetHelpers.loadResourceSetWithProxies(URI.createURI(uriString, false),
 			getCommandStack());
 	}