diff options
| author | Juergen Haug | 2018-06-18 08:25:01 +0000 |
|---|---|---|
| committer | Juergen Haug | 2018-06-18 08:25:01 +0000 |
| commit | 842d1ee0c1cb95148ba3815cc66024317e37eb2e (patch) | |
| tree | e7ee889793d4cf5ec16419fbdc8a73889154361a /plugins/org.eclipse.etrice.core.common | |
| parent | 29873f1151bb915cf3044f21deca9c756d3f95e0 (diff) | |
| parent | 3a0767800bb81a9f3f1f84024cfc3fcd5769df3f (diff) | |
| download | org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.gz org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.xz org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.zip | |
Merge remote-tracking branch 'gerrit/master' into newfsmgen_finalize
Conflicts:
plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java
plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
pom.xml
releng/org.eclipse.etrice.parent/pom.xml
tests/org.eclipse.etrice.generator.c.tests/.gitignore
tests/org.eclipse.etrice.generator.cpp.tests/.gitignore
tests/org.eclipse.etrice.generator.java.tests/.gitignore
Change-Id: I048e62574a0bca94bf86ed19bba6ed4325a37e81
Diffstat (limited to 'plugins/org.eclipse.etrice.core.common')
| -rw-r--r-- | plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/StandardModelLocator.java | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF index e7d6930f9..cfd46ba4d 100644 --- a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Common eTrice Grammar Fragment and Utility Classes Bundle-Vendor: Eclipse eTrice -Bundle-Version: 1.1.1.qualifier +Bundle-Version: 1.1.2.qualifier Bundle-SymbolicName: org.eclipse.etrice.core.common; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport, diff --git a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/StandardModelLocator.java b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/StandardModelLocator.java index ddf23819b..87c13207f 100644 --- a/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/StandardModelLocator.java +++ b/plugins/org.eclipse.etrice.core.common/src/org/eclipse/etrice/core/common/scoping/StandardModelLocator.java @@ -25,6 +25,7 @@ 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.plugin.EcorePlugin; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.URIConverter; import org.eclipse.xtext.resource.ClasspathUriResolutionException; @@ -158,7 +159,18 @@ public class StandardModelLocator implements IModelLocator { } catch (Throwable e) { } + } + else if (uri.isPlatform()) { + String platformResourcePath = uri.toPlatformString(true); + + // if workspace is not available, convert platform URI to absolute URI + if (EcorePlugin.getWorkspaceRoot() == null) { + URI resolvedURI = EcorePlugin.resolvePlatformResourcePath(platformResourcePath); + if(resolvedURI != null) + resolve = resolvedURI.toString(); + } } + return resolve; } |