X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FTypeComparator.java;h=2ea03d38f8d12ce0e4519b8b5a2328e906d084e1;hb=37acf1273cdf0be148b22625db2baa15a4077d0b;hp=6e1faa98067971c4b88de8c09114d07f0e0219c2;hpb=aa4da931fd1a692a877f90e4bc676640b09ba5c1;p=simantics%2Finterop.git

diff --git a/org.simantics.interop/src/org/simantics/interop/test/TypeComparator.java b/org.simantics.interop/src/org/simantics/interop/test/TypeComparator.java
index 6e1faa9..2ea03d3 100644
--- a/org.simantics.interop/src/org/simantics/interop/test/TypeComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/TypeComparator.java
@@ -27,19 +27,15 @@ public class TypeComparator extends ResourceComparator {
 	@Override
 	public int compare(ReadGraph g, Resource o1, Resource o2, boolean local) throws DatabaseException {
 		if (o1.equals(o2)) {
-			return 1;
+			return EXACT_MATCH;
 		}
 		return compare(g, o1, o2);
-//		if (local)
-//			return new TypeComparator().compare(g, o1, o2);
-//		else
-//			return compare(g, o1, o2);
 	}
 	
 	@Override
 	public int compare(ReadGraph g, Resource o1, Resource o2) throws DatabaseException{
 		if (!compareType(g,o1, o2)) {
-			return (Integer.MAX_VALUE);
+			return NO_MATCH;
 		}
 		return propsDiffCount(g,o1, o2);
 	}
@@ -64,6 +60,16 @@ public class TypeComparator extends ResourceComparator {
 				return false;
 			}
 		}
+		if (rs1.size() == 1) {
+			// Check for enumeration type. Without this enumeration instances could be mixed together.
+			if (g.hasStatement(rs1.get(0), l0.Enumeration, rs1.get(0))) {
+				if (!r1.equals(r2)) {
+					rs1.clear();
+					rs2.clear();
+					return false;
+				}
+			}
+		}
 		
 		rs1.clear();
 		rs2.clear();