[392432] Fix mapping problems and scoping for xcore.lang annotations.

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)
         {