summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2012-12-18 13:05:38 (EST)
committer Ed Merks2012-12-18 13:05:38 (EST)
commit9332ec8af8dafbc9698c4dee540552e785459d2f (patch)
treef8e54ef234b2aa5942d8720a30e1fbfaff9aaf56
parent09bf73b41dbfdfc9978834a6943ea2f314a11879 (diff)
downloadorg.eclipse.emf-9332ec8af8dafbc9698c4dee540552e785459d2f.zip
org.eclipse.emf-9332ec8af8dafbc9698c4dee540552e785459d2f.tar.gz
org.eclipse.emf-9332ec8af8dafbc9698c4dee540552e785459d2f.tar.bz2
[392432] Fix mapping problems and scoping for xcore.lang annotations.
-rw-r--r--plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreImportedNamespaceAwareScopeProvider.java6
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/EcorePlugin.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreImportedNamespaceAwareScopeProvider.java b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreImportedNamespaceAwareScopeProvider.java
index 6cafae8..3f020e5 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreImportedNamespaceAwareScopeProvider.java
+++ b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreImportedNamespaceAwareScopeProvider.java
@@ -538,11 +538,11 @@ public class XcoreImportedNamespaceAwareScopeProvider extends ImportedNamespaceA
}
}
- private static final URI ECORE_XCORE_URI = URI.createURI("platform:/plugin/org.eclipse.emf.ecore/model/Ecore.xcore");
+ private static final URI ECORE_XCORE_URI = URI.createURI("platform:/resource/org.eclipse.emf.ecore/model/Ecore.xcore");
private static final URI ECORE_GEN_MODEL_URI =
EMFPlugin.IS_ECLIPSE_RUNNING ?
- URI.createURI("platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel") :
+ URI.createURI("platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel") :
URI.createURI(EcorePlugin.INSTANCE.getBaseURL().toString() + "model/Ecore.genmodel");
@@ -593,7 +593,7 @@ public class XcoreImportedNamespaceAwareScopeProvider extends ImportedNamespaceA
protected static class XAnnotationDirectiveScope extends AbstractScope
{
- private static final URI LOGICAL_XCORE_LANG_URI = URI.createURI("platform:/plugin/org.eclipse.emf.ecore.xcore/model/XcoreLang.xcore");
+ private static final URI LOGICAL_XCORE_LANG_URI = URI.createURI("platform:/resource/org.eclipse.emf.ecore.xcore/model/XcoreLang.xcore");
private static final URI PHYSICAL_XCORE_LANG_URI =
EMFPlugin.IS_ECLIPSE_RUNNING ?
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/EcorePlugin.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/EcorePlugin.java
index 4283d92..83ed94a 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/EcorePlugin.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/plugin/EcorePlugin.java
@@ -1202,7 +1202,7 @@ public class EcorePlugin extends EMFPlugin
{
// If there is an underlying resource, use the platform resource URI referencing the project in the workspace as the location.
//
- location = URI.createPlatformResourceURI(underlyingResource.getFullPath().toString(), true);
+ location = URI.createPlatformResourceURI(underlyingResource.getProject().getFullPath().toString(), true);
}
else if (installLocation != null)
{