X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FTypeComparator.java;h=1417588f10f7ac828386176d8edaace5d55a1196;hb=499167aa0bcc2cab0066b87ef4a690c16ea92754;hp=fc0268ec6372a4258d05ea43c902a0b52ebc43b6;hpb=4399a40e11996b9a373f522af995a19a05493dd3;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 fc0268e..1417588 100644 --- a/org.simantics.interop/src/org/simantics/interop/test/TypeComparator.java +++ b/org.simantics.interop/src/org/simantics/interop/test/TypeComparator.java @@ -16,12 +16,13 @@ import org.simantics.layer0.Layer0; /** * Object comparator that uses type of objects to check if objects are comparable. * - * Difference value is amount of properties that have different values. + * Difference value is amount of properties that have different values. If objects have no properties, the result is 0 (unreliable). + * * * @author Marko Luukkainen * */ -public class TypeComparator extends ObjectComparator { +public class TypeComparator extends ResourceComparator { ArrayList rs1 = new ArrayList(); @@ -69,11 +70,14 @@ public class TypeComparator extends ObjectComparator { ss1.addAll(g.getStatements(r1, l0.HasProperty)); ss2.addAll(g.getStatements(r2, l0.HasProperty)); + if (ss1.size() == 0 && ss2.size() == 0) + return 0; + Comparator scomp = getComparator().getStatementComparator(); getComparator().sortStatement(ss1, ss2); - int count = 0; + int count = 1; int i1 = 0; int i2 = 0;