Path comparisons are now much more reliable

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

diff --git a/org.simantics.interop/src/org/simantics/interop/test/Path.java b/org.simantics.interop/src/org/simantics/interop/test/Path.java
index b772267caa349b0a218e2cda22c5a299d8f8c9c8..4d4bb60c2b8f8715391fd62ccd4df7b8e18edfc0 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/test/Path.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/Path.java
@@ -86,14 +86,27 @@ public class Path {
                if (statements.size() != other.statements.size())\r
                        return false;\r
                for (int i = 0; i < statements.size(); i++) {\r
-                       if (!statements.get(i).equals(other.statements.get(i)))\r
+                       if (!statements.get(i).getPredicate().equals(other.statements.get(i).getPredicate())||\r
+                           !statements.get(i).getObject().equals(other.statements.get(i).getObject()))\r
                                return false;\r
                }\r
-               return false;\r
+               return true;\r
        }\r
        \r
        @Override\r
        public int hashCode() {\r
                return begin.hashCode() + end.hashCode();\r
        }\r
+       \r
+       @Override\r
+       public String toString() {\r
+               String s = "";\r
+               for (int i = 0; i < statements.size() ; i++) {\r
+                       s += statements.get(i).getSubject();\r
+                       s += "<" + statements.get(i).getPredicate() +">";\r
+                       if (i == statements.size() -1)\r
+                               s += statements.get(i).getObject();\r
+               }\r
+               return s;\r
+       }\r
 }\r