Fix adding components to configurationBySolverName map in MappingBase

[simantics/platform.git] / bundles / org.simantics.structural.synchronization / src / org / simantics / structural / synchronization / utils / DiagnosticSynchronizationEventHandler.java

diff --git a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/DiagnosticSynchronizationEventHandler.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/DiagnosticSynchronizationEventHandler.java
index c343b396b1cf47866afc90a6ec9a5f4276aa0b6e..974c632469b557a40663febcde1eba502bf41372 100644 (file)
--- a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/DiagnosticSynchronizationEventHandler.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/DiagnosticSynchronizationEventHandler.java
@@ -1,82 +1,91 @@
-package org.simantics.structural.synchronization.utils;\r
-\r
-import java.util.Collection;\r
-\r
-import org.simantics.structural.synchronization.protocol.ChildInfo;\r
-import org.simantics.structural.synchronization.protocol.Connection;\r
-import org.simantics.structural.synchronization.protocol.SerializedVariable;\r
-import org.simantics.structural.synchronization.protocol.SynchronizationEventHandler;\r
-import org.simantics.structural.synchronization.protocol.SynchronizationException;\r
-\r
-public class DiagnosticSynchronizationEventHandler implements SynchronizationEventHandler {\r
-\r
-    int indentation;\r
-\r
-    @Override\r
-    public void beginSynchronization() {\r
-    }\r
-\r
-    @Override\r
-    public void endSynchronization() {\r
-    }\r
-\r
-    @Override\r
-    public void beginComponent(String name, String typeId,\r
-            Collection<SerializedVariable> properties,\r
-            Collection<Connection> connections, Collection<ChildInfo> children)\r
-                    throws SynchronizationException {\r
-        for(int i=0;i<indentation;++i)\r
-            System.out.print("  ");\r
-        System.out.print(name);\r
-        if(typeId != null)\r
-            System.out.print(" :: " + typeId);\r
-        System.out.println();\r
-        for(SerializedVariable var : properties) {\r
-            for(int i=0;i<=indentation;++i)\r
-                System.out.print("  ");\r
-            System.out.println(SerializedVariable.print(var, indentation*2+2));\r
-        }\r
-        for(Connection connection : connections) {\r
-            for(int i=0;i<=indentation;++i)\r
-                System.out.print("  ");\r
-            System.out.println(connection);\r
-        }\r
-        if(!children.isEmpty()) {\r
-            for(int i=0;i<=indentation;++i)\r
-                System.out.print("  ");\r
-            System.out.print("Children ");\r
-            if(children != null)\r
-                System.out.println(children);\r
-        }\r
-        ++indentation;\r
-    }\r
-\r
-    @Override\r
-    public void endComponent() {\r
-        --indentation;\r
-    }\r
-\r
-    @Override\r
-    public void beginType(String id, Collection<SerializedVariable> properties) {\r
-        System.out.println("--- Type " + id + " --------------------------------");\r
-        for(SerializedVariable var : properties)\r
-            System.out.println(SerializedVariable.print(var, 2));\r
-    }\r
-\r
-    @Override\r
-    public void endType() {\r
-        System.out.println("----------------------------------------------------");\r
-    }\r
-\r
-    @Override\r
-    public void reportProblem(String description) {\r
-        System.err.println(description);\r
-    }\r
-\r
-    @Override\r
-    public void reportProblem(String description, Exception e) {\r
-        System.err.println(description);\r
-        e.printStackTrace();\r
-    }\r
-\r
-}\r
+package org.simantics.structural.synchronization.utils;
+
+import java.util.Collection;
+
+import org.simantics.structural.synchronization.protocol.ChildInfo;
+import org.simantics.structural.synchronization.protocol.Connection;
+import org.simantics.structural.synchronization.protocol.SerializedVariable;
+import org.simantics.structural.synchronization.protocol.SynchronizationEventHandler;
+import org.simantics.structural.synchronization.protocol.SynchronizationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DiagnosticSynchronizationEventHandler implements SynchronizationEventHandler {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DiagnosticSynchronizationEventHandler.class);
+    int indentation;
+
+    @Override
+    public void beginSynchronization() {
+    }
+
+    @Override
+    public void endSynchronization() {
+    }
+
+    @Override
+    public void beginComponent(String name, String typeId,
+            Collection<SerializedVariable> properties,
+            Collection<Connection> connections, Collection<ChildInfo> children)
+                    throws SynchronizationException {
+        StringBuilder indent = new StringBuilder();
+        for(int i=0;i<indentation;++i)
+            indent.append("  ");
+        indent.append(name);
+        if(typeId != null)
+            indent.append(" :: " + typeId);
+        LOGGER.info(indent.toString());
+        for(SerializedVariable var : properties) {
+            indent = new StringBuilder();
+            for(int i=0;i<=indentation;++i)
+                indent.append("  ");
+            indent.append(SerializedVariable.print(var, indentation*2+2));
+            LOGGER.info(indent.toString());
+        }
+        for(Connection connection : connections) {
+            indent = new StringBuilder();
+            for(int i=0;i<=indentation;++i)
+                indent.append("  ");
+            indent.append(connection);
+            LOGGER.info(indent.toString());
+        }
+        if(!children.isEmpty()) {
+            indent = new StringBuilder();
+            for(int i=0;i<=indentation;++i)
+                indent.append("  ");
+            indent.append("Children ");
+            if(children != null)
+                indent.append(children);
+            LOGGER.info(indent.toString());
+        }
+        ++indentation;
+    }
+
+    @Override
+    public void endComponent() {
+        --indentation;
+    }
+
+    @Override
+    public void beginType(String id, Collection<SerializedVariable> properties) {
+        LOGGER.info("--- Type " + id + " --------------------------------");
+        for(SerializedVariable var : properties)
+            LOGGER.info(SerializedVariable.print(var, 2));
+    }
+
+    @Override
+    public void endType() {
+        LOGGER.info("----------------------------------------------------");
+    }
+
+    @Override
+    public void reportProblem(String description) {
+        LOGGER.error(description);
+    }
+
+    @Override
+    public void reportProblem(String description, Exception e) {
+        LOGGER.error(description, e);
+    }
+
+}