Bug 428336: [core.room] import dependency loader incorrect for different path representations of the same model resource

https://bugs.eclipse.org/428336

Implemented an extensible model resolution machanism

2 files changed, 5 insertions, 3 deletions

diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/GlobalNonPlatformURIEditorOpener.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/GlobalNonPlatformURIEditorOpener.java
index 719384ff6..915f46b16 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/GlobalNonPlatformURIEditorOpener.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/GlobalNonPlatformURIEditorOpener.java
@@ -63,8 +63,10 @@ public class GlobalNonPlatformURIEditorOpener extends GlobalURIEditorOpener {
 			String pluri = files[0].toString();
 			// the pluri starts with L/ which we have to omit for URI.createPlatformResourceURI
 			uri = URI.createPlatformResourceURI(pluri.substring(2), true).appendFragment(uri.fragment());
+			return uri;
 		}
-		return uri;
+		
+		return null;
 	}
 
 	private IEditorPart openExternalFile(URI referenceOwnerURI) {
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/ImportAwareHyperlinkHelper.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/ImportAwareHyperlinkHelper.java
index d5044c7da..d1b2356d5 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/ImportAwareHyperlinkHelper.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/linking/ImportAwareHyperlinkHelper.java
@@ -14,7 +14,7 @@ package org.eclipse.etrice.core.ui.linking;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.core.scoping.NormalizingUriResolver;
+import org.eclipse.etrice.core.scoping.ModelLocatorUriResolver;
 import org.eclipse.jface.text.Region;
 import org.eclipse.xtext.AbstractRule;
 import org.eclipse.xtext.RuleCall;
@@ -39,7 +39,7 @@ public class ImportAwareHyperlinkHelper extends HyperlinkHelper {
 	protected Provider<XtextHyperlink> hyperlinkProvider;
 
 	@Inject
-	protected NormalizingUriResolver uriResolver;
+	protected ModelLocatorUriResolver uriResolver;
 	
 	public ImportAwareHyperlinkHelper() {
 		super();