Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2008-07-01 18:45:02 +0000
committeratikhomirov2008-07-01 18:45:02 +0000
commit5b83cad0de3b955b949c6de654f79eae1a104ed8 (patch)
tree2c37b8d327b14a6897fe0cf5bd2bef428c7ec530 /plugins
parent273180b5c39800d6cda886a4548d8402b3da4753 (diff)
downloadorg.eclipse.gmf-tooling-5b83cad0de3b955b949c6de654f79eae1a104ed8.tar.gz
org.eclipse.gmf-tooling-5b83cad0de3b955b949c6de654f79eae1a104ed8.tar.xz
org.eclipse.gmf-tooling-5b83cad0de3b955b949c6de654f79eae1a104ed8.zip
recognizez java object operations (like == or !=) on EnumType::EnumLiteral during analyze phase
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.gmf.xpand/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.gmf.xpand/src/org/eclipse/gmf/internal/xpand/BuiltinMetaModel.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.gmf.xpand/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.xpand/META-INF/MANIFEST.MF
index cd49b30eb..e7706abb1 100644
--- a/plugins/org.eclipse.gmf.xpand/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.xpand/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.xpand;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.gmf.xpand/src/org/eclipse/gmf/internal/xpand/BuiltinMetaModel.java b/plugins/org.eclipse.gmf.xpand/src/org/eclipse/gmf/internal/xpand/BuiltinMetaModel.java
index 673542587..6757547c3 100644
--- a/plugins/org.eclipse.gmf.xpand/src/org/eclipse/gmf/internal/xpand/BuiltinMetaModel.java
+++ b/plugins/org.eclipse.gmf.xpand/src/org/eclipse/gmf/internal/xpand/BuiltinMetaModel.java
@@ -410,7 +410,10 @@ public class BuiltinMetaModel {
});
List<InternalOperation> unmodifiableObjectOps = Collections.unmodifiableList(objectOps);
internalOperationsMap.put(ecorePkg.getEJavaObject(), unmodifiableObjectOps);
+ // EEnumerator are enum literal instances at runtime (#evaluate),
+ // while EEnum are their types during #analyze phase
internalOperationsMap.put(ecorePkg.getEEnumerator(), unmodifiableObjectOps);
+ internalOperationsMap.put(ecorePkg.getEEnum(), unmodifiableObjectOps);
final List<InternalOperation> stringOps = new LinkedList<InternalOperation>();

Back to the top