Remove debug messages

refs #3138

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@25097 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
index 58e2c0531cb41bec456b451663450b6a6a030881..0366df96a2a33749eb7074aae083e22d7b5fede2 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
@@ -52,6 +52,8 @@ import org.simantics.utils.datastructures.Pair;
  *\r
  */\r
 public class GraphComparator {\r
+       \r
+       private static final boolean DEBUG = false;\r
 \r
        private Resource r1;\r
        private Resource r2;\r
@@ -587,10 +589,7 @@ public class GraphComparator {
                                                                addComparable(left.getStatements().get(i),right.getStatements().get(i),false);\r
                                                        }\r
                                                }\r
-                                               //System.out.println("Compare not implemented");\r
-                                       } else {\r
-                                               //System.out.println("Compare not implemented");\r
-                                       }\r
+                                       } \r
                                }\r
                        }\r
                        \r
@@ -847,7 +846,7 @@ public class GraphComparator {
                                        break;\r
                                } else {\r
                                        while (i2 < ss2.size()) {\r
-                                               System.out.println("Compare Statements diff2 " + printStatement(g,ss2.get(i2)));\r
+                                               if (DEBUG) System.out.println("Compare Statements diff2 " + printStatement(g,ss2.get(i2)));\r
                                                \r
                                                addAddition(ss2.get(i2));\r
                                                i2++;\r
@@ -856,7 +855,7 @@ public class GraphComparator {
                                }\r
                        } else if (i2 >= ss2.size()) {\r
                                while (i1 < ss1.size()) {\r
-                                       System.out.println("Compare Statements diff1 " + printStatement(g,ss1.get(i1)));\r
+                                       if (DEBUG) System.out.println("Compare Statements diff1 " + printStatement(g,ss1.get(i1)));\r
                                        addDeletion(ss1.get(i1));\r
                                        i1++;\r
                                }\r
@@ -871,13 +870,13 @@ public class GraphComparator {
                                i2+=same2;\r
                        } else if (c < 0) {\r
                                for (int i = 0; i < same1; i++) {\r
-                                       System.out.println("Compare Statements diff1 " + printStatement(g,ss1.get(i+i1)));\r
+                                       if (DEBUG) System.out.println("Compare Statements diff1 " + printStatement(g,ss1.get(i+i1)));\r
                                        addDeletion(ss1.get(i+i1));\r
                                }\r
                                i1 += same1;\r
                        } else {\r
                                for (int i = 0; i < same2; i++) {\r
-                                       System.out.println("Compare Statements diff2 " + printStatement(g,ss2.get(i+i2)));\r
+                                       if (DEBUG) System.out.println("Compare Statements diff2 " + printStatement(g,ss2.get(i+i2)));\r
                                        addAddition(ss2.get(i+i2));\r
                                }\r
                                \r
@@ -979,8 +978,6 @@ public class GraphComparator {
                                                        Statement s2  = ss2.get(i2+off2);\r
                                                        \r
                                                        if (objectsLeft != null) {\r
-                                                               if (s1.getObject().getResourceId() == 52825217 || s1.getObject().getResourceId() == 52825127)\r
-                                                                       System.out.println();\r
                                                                objectsLeft.add(s1.getObject());\r
                                                                objectsRight.add(s2.getObject());\r
                                                        } \r
@@ -1029,13 +1026,13 @@ public class GraphComparator {
                }\r
                for (int i1 = off1; i1 < off1 + len1; i1++) {\r
                        if (!used1[i1-off1]) {\r
-                               System.out.println("Compare Object diff1 " + printStatement(g,ss1.get(i1)));\r
+                               if (DEBUG) System.out.println("Compare Object diff1 " + printStatement(g,ss1.get(i1)));\r
                                addDeletion(ss1.get(i1));\r
                        }\r
                }\r
                for (int i2 = off2; i2 < off2 + len2; i2++) {\r
                        if (!used2[i2-off2]) {\r
-                               System.out.println("Compare Object diff2 " + printStatement(g,ss2.get(i2)));\r
+                               if (DEBUG) System.out.println("Compare Object diff2 " + printStatement(g,ss2.get(i2)));\r
                                addAddition(ss2.get(i2));\r
                        }\r
                }\r
@@ -1052,7 +1049,7 @@ public class GraphComparator {
         * @throws ValidationException \r
         */\r
        private void compareProps(Resource r1, Resource r2) throws DatabaseException {\r
-               System.out.println("compareProps " + r1 + " " + NameUtils.getSafeName(g, r1) + " " + r2 + " " + NameUtils.getSafeName(g, r2));\r
+               if (DEBUG) System.out.println("compareProps " + r1 + " " + NameUtils.getSafeName(g, r1) + " " + r2 + " " + NameUtils.getSafeName(g, r2));\r
                ArrayList<Statement> ss1 = new ArrayList<Statement>();\r
                ArrayList<Statement> ss2 = new ArrayList<Statement>();\r
                ss1.addAll(g.getStatements(r1, b.HasProperty));\r
@@ -1068,7 +1065,7 @@ public class GraphComparator {
                                        break;\r
                                else {\r
                                        while (i2 < ss2.size()) {\r
-                                               System.out.println("Compare Prop diff2 " + printStatement(g,ss2.get(i2)));\r
+                                               if (DEBUG) System.out.println("Compare Prop diff2 " + printStatement(g,ss2.get(i2)));\r
                                                addAddition(ss2.get(i2));\r
                                                i2++;\r
                                        }\r
@@ -1076,7 +1073,7 @@ public class GraphComparator {
                                }\r
                        } else if (i2 >= ss2.size()) {\r
                                while (i1 < ss1.size()) {\r
-                                       System.out.println("Compare Prop diff1 " + printStatement(g,ss1.get(i1)));\r
+                                       if (DEBUG) System.out.println("Compare Prop diff1 " + printStatement(g,ss1.get(i1)));\r
                                        addDeletion(ss1.get(i1));\r
                                        i1++;\r
                                }\r
@@ -1116,14 +1113,14 @@ public class GraphComparator {
                                        break;\r
                                }\r
                                case -1:{\r
-                                       System.out.println("Compare Prop diff1s " + printStatement(g,s1));\r
+                                       if (DEBUG) System.out.println("Compare Prop diff1s " + printStatement(g,s1));\r
                                        addDeletion(s1);\r
                                        i1++;\r
                                        break;\r
                                }\r
                                        \r
                                case 1:{\r
-                                       System.out.println("Compare Prop diff2s " + printStatement(g,s2));\r
+                                       if (DEBUG) System.out.println("Compare Prop diff2s " + printStatement(g,s2));\r
                                        addAddition(s2);\r
                                        i2++;\r
                                        break;\r