X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FTypeComparator.java;h=a8cefa3a5ee4a9175dd0802d07b606602dd85920;hb=refs%2Fchanges%2F04%2F4904%2F1;hp=2ea03d38f8d12ce0e4519b8b5a2328e906d084e1;hpb=37acf1273cdf0be148b22625db2baa15a4077d0b;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 2ea03d3..a8cefa3 100644
--- a/org.simantics.interop/src/org/simantics/interop/test/TypeComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/TypeComparator.java
@@ -40,6 +40,16 @@ public class TypeComparator extends ResourceComparator {
 		return propsDiffCount(g,o1, o2);
 	}
 	
+	/**
+	 * Compares resources based on L0.InstaceOf relations.
+	 * If there are no L0.InstanceOf relations, uses ResourceComparator for comparison.
+	 *  
+	 * @param g
+	 * @param r1
+	 * @param r2
+	 * @return
+	 * @throws DatabaseException
+	 */
 	protected boolean compareType(ReadGraph g,Resource r1, Resource r2) throws DatabaseException {
 		Layer0 l0 = Layer0.getInstance(g);
 		rs1.addAll(g.getObjects(r1, l0.InstanceOf));
@@ -49,7 +59,12 @@ public class TypeComparator extends ResourceComparator {
 			rs2.clear();
 			return false;
 		}
+		
 		Comparator<Resource> rcomp = getComparator().getResourceComparator();
+		if (rs1.size() == 0) {
+			return rcomp.compare(r1, r2) == 0;
+		}
+	
 		getComparator().sortResource(rs1, rs2);
 
 		for (int i = 0; i < rs1.size(); i++) {
@@ -77,6 +92,49 @@ public class TypeComparator extends ResourceComparator {
 		return true;
 	}
 	
+	protected boolean compareInheritance(ReadGraph g, Resource r1, Resource r2) throws DatabaseException {
+		Layer0 l0 = Layer0.getInstance(g);
+		
+		rs1.addAll(g.getObjects(r1, l0.Inherits));
+		rs2.addAll(g.getObjects(r2, l0.Inherits));
+		
+		if (rs1.size() != rs2.size()) {
+			rs1.clear();
+			rs2.clear();
+			return false;
+		}
+		if (rs1.size() == 0) {
+			rs1.addAll(g.getObjects(r1, l0.SubrelationOf));
+			rs2.addAll(g.getObjects(r2, l0.SubrelationOf));
+		}
+		if (rs1.size() != rs2.size()) {
+			rs1.clear();
+			rs2.clear();
+			return false;
+		}
+		Comparator<Resource> rcomp = getComparator().getResourceComparator();
+		if (rs1.size() == 0) {
+			return rcomp.compare(r1, r2) == 0;
+		}
+	
+		getComparator().sortResource(rs1, rs2);
+
+		for (int i = 0; i < rs1.size(); i++) {
+			int c = rcomp.compare(rs1.get(i), rs2.get(i));
+			if (c != 0) {
+				rs1.clear();
+				rs2.clear();
+				return false;
+			}
+		}
+		
+		rs1.clear();
+		rs2.clear();
+		
+		return true;
+	}
+	
+	
 	protected int propsDiffCount(ReadGraph g, Resource r1, Resource r2) throws DatabaseException {
 		Layer0 l0 = Layer0.getInstance(g);
 		ArrayList<Statement> ss1 = new ArrayList<Statement>();
@@ -128,15 +186,10 @@ public class TypeComparator extends ResourceComparator {
 					boolean b2 = g.hasValue(s2.getObject());
 					if (b1 == b2) {
 						if (b1) {
-//							Object v1 = g.getValue(s1.getObject());
-//							Object v2 = g.getValue(s2.getObject());
-//							boolean eq = GraphComparator.compareValue(v1, v2);
 							boolean eq = GraphComparator.compareValue(g, l0 , s1.getObject(), s2.getObject());
-							
 							if (!eq) {
 								count++;
 							}
-							//System.out.println("Prop count values " + v1 + " " + v2);
 						} else {
 							count += propsDiffCount(g,s1.getObject(), s2.getObject());
 						}