diff options
| author | Juergen Haug | 2017-06-20 17:50:24 +0000 |
|---|---|---|
| committer | Juergen Haug | 2017-06-21 08:14:39 +0000 |
| commit | 2155f1814e5ee3d11bde20152b4ab8bcd9a1db02 (patch) | |
| tree | 2a94ba0b1242fab811a92ff5b7e10f44002cf943 /plugins/org.eclipse.etrice.core.common | |
| parent | 7ca492dcdee1b6c6b98c99517d8237398079ed16 (diff) | |
| download | org.eclipse.etrice-2155f1814e5ee3d11bde20152b4ab8bcd9a1db02.tar.gz org.eclipse.etrice-2155f1814e5ee3d11bde20152b4ab8bcd9a1db02.tar.xz org.eclipse.etrice-2155f1814e5ee3d11bde20152b4ab8bcd9a1db02.zip | |
[ui.tests] fixed classpath and test
Change-Id: I7d96f600a0d38e285429a6bde0e31990c58e103d
Diffstat (limited to 'plugins/org.eclipse.etrice.core.common')
| -rw-r--r-- | plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/RelativeFileURIHandler.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/RelativeFileURIHandler.java b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/RelativeFileURIHandler.java index 6c9884ad4..c419f3211 100644 --- a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/RelativeFileURIHandler.java +++ b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/RelativeFileURIHandler.java @@ -18,6 +18,7 @@ import org.apache.log4j.Logger; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.xmi.XMIResource; import org.eclipse.emf.ecore.xmi.XMLResource.URIHandler; @@ -59,9 +60,12 @@ public class RelativeFileURIHandler extends URIHandlerImpl { URI resolvedFileURI = fileURI.resolve(baseFileURI, true); // System.out.println("resolve: " + fileURI + " -> " + baseFileURI + " = " + resolvedFileURI); - URI platURI = StandardModelLocator.getPlatformURI(resolvedFileURI); - - return (platURI != null) ? platURI : resolvedFileURI; + if(EMFPlugin.IS_ECLIPSE_RUNNING) { + URI platURI = StandardModelLocator.getPlatformURI(resolvedFileURI); + return (platURI != null) ? platURI : resolvedFileURI; + } else { + return resolvedFileURI; + } } return (fallback != null) ? fallback.resolve(uri) : uri; |