git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@22965...

[simantics/interop.git] / org.simantics.interop / src / org / simantics / interop / test / NameComparator.java

diff --git a/org.simantics.interop/src/org/simantics/interop/test/NameComparator.java b/org.simantics.interop/src/org/simantics/interop/test/NameComparator.java
index abc2ab2cbd29263538d869b719416c53c189fb0c..125d05912b6d443a7687f8635b9d2023b7759bf0 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/test/NameComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/NameComparator.java
@@ -3,10 +3,14 @@ package org.simantics.interop.test;
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.exception.DatabaseException;\r
+import org.simantics.db.exception.ManyObjectsForFunctionalRelationException;\r
+import org.simantics.db.exception.ServiceException;\r
 import org.simantics.layer0.Layer0;\r
 \r
 /**\r
- * * Object comparator that uses type and name of objects to check if objects are comparable. \r
+ * Object comparator that uses type and name of objects to check if objects are comparable.\r
+ * If objects have no name, compare returns unreliable as result.\r
+ *  \r
  * \r
  * Difference value is amount of properties that have different values.\r
  * \r
@@ -21,18 +25,35 @@ public class NameComparator extends TypeComparator {
                if (!compareType(g,o1, o2)) {\r
                        return Integer.MAX_VALUE;\r
                }\r
+               if (hasName(g, o1, o2)) {\r
+                       if(!compareName(g, o1, o2))\r
+                               return Integer.MAX_VALUE;\r
+                       return propsDiffCount(g,o1, o2);\r
+               }\r
+               return 0;\r
+               \r
+       }\r
+       \r
+       protected boolean compareName(ReadGraph g, Resource o1, Resource o2) throws ManyObjectsForFunctionalRelationException, ServiceException {\r
                Layer0 l0 = Layer0.getInstance(g);\r
                String n1 = g.getPossibleRelatedValue(o1, l0.HasName);\r
                String n2 = g.getPossibleRelatedValue(o2, l0.HasName);\r
-               if (n1 != null && n2 != null) {\r
-                       if (!n1.equals(n2))\r
-                               return Integer.MAX_VALUE;\r
-               } else if (n1 == null && n2 == null) {\r
+               if (n1 != null && n2 != null)\r
+                       return n1.equals(n2);\r
+               if (n1 == null && n2 == null)\r
+                       return true;\r
+               return false;\r
+                       \r
+       }\r
+       \r
+       protected boolean hasName(ReadGraph g, Resource o1, Resource o2) throws ManyObjectsForFunctionalRelationException, ServiceException {\r
+               Layer0 l0 = Layer0.getInstance(g);\r
+               String n1 = g.getPossibleRelatedValue(o1, l0.HasName);\r
+               String n2 = g.getPossibleRelatedValue(o2, l0.HasName);\r
+               if (n1 != null && n2 != null)\r
+                       return true;\r
+               return false;\r
                        \r
-               } else {\r
-                       return Integer.MAX_VALUE;\r
-               }\r
-               return propsDiffCount(g,o1, o2);\r
        }\r
 \r
 }\r