Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Oehme2014-07-25 07:19:29 +0000
committerEd Merks2014-07-31 08:39:12 +0000
commit97075c44a2ff923ea72c2fbf6eecc04e3b08ef58 (patch)
tree0008f520bd5579f66859a7cfb211fdf0153a0c54
parent921bc84b4f1e2476d55dd15a65358f7e90bdceb7 (diff)
downloadorg.eclipse.emf-97075c44a2ff923ea72c2fbf6eecc04e3b08ef58.tar.gz
org.eclipse.emf-97075c44a2ff923ea72c2fbf6eecc04e3b08ef58.tar.xz
org.eclipse.emf-97075c44a2ff923ea72c2fbf6eecc04e3b08ef58.zip
[440718] Index only JVM types, not their members.
Change-Id: I4065aac65794e05b62b5a0939cb9435a9960b880 Signed-off-by: Stefan Oehme <stefan.oehme@itemis.de>
-rw-r--r--plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreResourceDescriptionStrategy.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreResourceDescriptionStrategy.java b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreResourceDescriptionStrategy.java
index 691769342..0902d2a89 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreResourceDescriptionStrategy.java
+++ b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/scoping/XcoreResourceDescriptionStrategy.java
@@ -17,6 +17,8 @@ import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.xcore.XAnnotationDirective;
import org.eclipse.emf.ecore.xcore.XPackage;
import org.eclipse.emf.ecore.xcore.XcorePackage;
+import org.eclipse.xtext.common.types.JvmType;
+import org.eclipse.xtext.common.types.TypesPackage;
import org.eclipse.xtext.ecore.EcoreResourceDescriptionStrategy;
import org.eclipse.xtext.resource.IEObjectDescription;
import org.eclipse.xtext.util.IAcceptor;
@@ -62,6 +64,15 @@ public class XcoreResourceDescriptionStrategy extends XbaseResourceDescriptionSt
}
return false;
}
+ else if (ePackage == TypesPackage.eINSTANCE)
+ {
+ if (eObject instanceof JvmType)
+ {
+ super.createEObjectDescriptions(eObject, acceptor);
+ return true;
+ }
+ return false;
+ }
else
{
return super.createEObjectDescriptions(eObject, acceptor);

Back to the top