Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2008-07-01 20:03:54 +0000
committeratikhomirov2008-07-01 20:03:54 +0000
commit3ff5722689ac61c6da617cc04a11833e4d08e5ad (patch)
tree864ec5ee917aee63c5ac51d37bfd94d571d12207 /plugins
parent4c1b50dd6967b14f17f67ea59773dc934fb04b7d (diff)
downloadorg.eclipse.gmf-tooling-3ff5722689ac61c6da617cc04a11833e4d08e5ad.tar.gz
org.eclipse.gmf-tooling-3ff5722689ac61c6da617cc04a11833e4d08e5ad.tar.xz
org.eclipse.gmf-tooling-3ff5722689ac61c6da617cc04a11833e4d08e5ad.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/src/org/eclipse/gmf/internal/xpand/BuiltinMetaModel.java9
1 files changed, 8 insertions, 1 deletions
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 6757547c3..f54d6b293 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 Eclipse.org
+ * Copyright (c) 2006, 2008 Eclipse.org
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -1062,6 +1062,13 @@ public class BuiltinMetaModel {
}
return dt1Class.isAssignableFrom(dt2Class);
}
+ if (dt1Class != null && dt2Class == null) {
+ // special case for dt2 datatype from dynamic model instance
+ // (e.g. model file in same workspace as template)
+ // hence no instance classes yet, but anything is assignable to Object
+ // Fixed while resolving #analyze of enum literals compare (==)
+ return dt1Class == Object.class;
+ }
} catch (NoSuchFieldException ex) {
// IGNORE
} catch (IllegalAccessException ex) {

Back to the top