Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwpiers2009-09-04 13:35:03 +0000
committerwpiers2009-09-04 13:35:03 +0000
commit3dffb8f1c31a2414967a4538735f4019e67d027f (patch)
treeccad9b369498567aa4585854b3372f39c8abfe65 /plugins/org.eclipse.m2m.atl.engine.emfvm/src
parent6bfafde0c52e8b571d25f78daf881cbff4511d5a (diff)
downloadorg.eclipse.atl-3dffb8f1c31a2414967a4538735f4019e67d027f.tar.gz
org.eclipse.atl-3dffb8f1c31a2414967a4538735f4019e67d027f.tar.xz
org.eclipse.atl-3dffb8f1c31a2414967a4538735f4019e67d027f.zip
corrected oclType bug
Diffstat (limited to 'plugins/org.eclipse.m2m.atl.engine.emfvm/src')
-rw-r--r--plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclType.java27
1 files changed, 13 insertions, 14 deletions
diff --git a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclType.java b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclType.java
index b5f5f345..ab0a51f7 100644
--- a/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclType.java
+++ b/plugins/org.eclipse.m2m.atl.engine.emfvm/src/org/eclipse/m2m/atl/engine/emfvm/lib/OclType.java
@@ -166,21 +166,20 @@ public abstract class OclType {
* @return the ocl type
*/
public static OclType getOclTypeFromObject(Object cl) {
- OclType res = null;
- if (cl instanceof Collection) {
- if (cl instanceof List) {
- return SEQUENCE;
- } else if (cl instanceof Set) {
- return SET;
+ OclType res = oclTypes.get(cl.getClass());
+ if (res == null) {
+ if (cl instanceof Collection) {
+ if (cl instanceof List) {
+ return SEQUENCE;
+ } else if (cl instanceof Set) {
+ return SET;
+ } else {
+ return BAG;
+ }
} else {
- return BAG;
- }
- } else {
- res = oclTypes.get(cl.getClass());
- if (res == null) {
- res = OCL_ANY;
- }
- }
+ res = OCL_ANY;
+ }
+ }
return res;
}

Back to the top