Replace log4j with slf4j

[simantics/interop.git] / org.simantics.interop.mapping / src / org / simantics / interop / mapping / Mapper.java

diff --git a/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java b/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
index 1c787cc6d335e862d097b6bc665def4e3ee8a93c..063f8acdfc713379f547ab118f2c87a4e90767af 100644 (file)
--- a/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
+++ b/org.simantics.interop.mapping/src/org/simantics/interop/mapping/Mapper.java
@@ -17,7 +17,6 @@ import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.common.request.WriteResultRequest;\r
 import org.simantics.db.common.utils.NameUtils;\r
 import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.exception.ServiceException;\r
 import org.simantics.db.layer0.util.SessionGarbageCollection;\r
 import org.simantics.db.request.Read;\r
 import org.simantics.interop.mapping.data.GraphNode;\r
@@ -27,6 +26,8 @@ import org.simantics.interop.mapping.data.ResourceIdentifiable;
 import org.simantics.ui.jobs.SessionGarbageCollectorJob;\r
 import org.simantics.utils.datastructures.MapList;\r
 import org.simantics.utils.datastructures.Pair;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 \r
 /**\r
  * \r
@@ -34,7 +35,9 @@ import org.simantics.utils.datastructures.Pair;
  *\r
  */\r
 public class Mapper {\r
-       \r
+\r
+       private static final Logger LOGGER = LoggerFactory.getLogger(Mapper.class);\r
+\r
        public static final boolean USE_SPLIT_TRANSACTIONS = false; // Split transactions\r
        public static int OBJECTS_PER_TRANSACTION = 5000;           // number of objects handled per transaction (split mode) \r
        private static boolean SLEEP_BETWEEN_WRITES = false;        // sleep between transactions (split mode)     \r
@@ -320,7 +323,7 @@ public class Mapper {
        \r
        \r
        \r
-       private void applyGenerations(WriteGraph graph, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
+       protected void applyGenerations(WriteGraph graph, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
                \r
                int size = nodes.size();\r
                int count = 0;\r
@@ -353,9 +356,11 @@ public class Mapper {
                        for (GraphNode<Identifiable> n : nodes) {\r
 \r
                                MapList<Integer,GenerationRule> priRules = n.getHint(MappingHints.KEY_GENERATION_RULES);\r
-                               List<GenerationRule> rules = priRules.getValues(stage);\r
-                               for (GenerationRule r : rules) {\r
-                                       r.generate(graph, n);\r
+                               if (priRules != null) {\r
+                                       List<GenerationRule> rules = priRules.getValues(stage);\r
+                                       for (GenerationRule r : rules) {\r
+                                               r.generate(graph, n);\r
+                                       }\r
                                }\r
 \r
                                monitor.subTask("Generating objects, stage " + stage + " :  ("+ (++count) + "/" + size + ")");\r
@@ -368,7 +373,7 @@ public class Mapper {
                }\r
        }\r
        \r
-       private void applyConnections(WriteGraph g, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
+       protected void applyConnections(WriteGraph g, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
                int size = nodes.size();\r
                int count = 0;\r
                \r
@@ -394,41 +399,9 @@ public class Mapper {
                        return res.toString();\r
        }\r
        \r
-       public class WriteWrapper extends WriteGraphProxy {\r
-               \r
-               \r
-               private Collection<Resource> createdResources = new ArrayList<Resource>();\r
-               \r
-               public WriteWrapper(WriteGraph graph) {\r
-                       super(graph);\r
-               }\r
-               \r
-               public Collection<Resource> getCreatedResources() {\r
-                       return createdResources;\r
-               }\r
-               \r
-               public void clearCreated() {\r
-                       createdResources = new ArrayList<Resource>();\r
-               }\r
-               \r
-               @Override\r
-               public Resource newResource() throws ServiceException {\r
-                       Resource res = graph.newResource();\r
-                       createdResources.add(res);\r
-                       return res;\r
-               }\r
-               \r
-               @Override\r
-               public Resource newResource(long clusterId) throws ServiceException {\r
-                       Resource res = graph.newResource(clusterId);\r
-                       createdResources.add(res);\r
-                       return res;\r
-               }\r
-               \r
-               \r
-       }\r
+\r
        \r
-       private void initializeRules(Session session, VirtualGraph vg, final Resource model ) throws DatabaseException{\r
+       protected void initializeRules(Session session, VirtualGraph vg, final Resource model ) throws DatabaseException{\r
                session.syncRequest(new WriteRequest(vg) {\r
                        @Override\r
                        public void perform(WriteGraph g) throws DatabaseException {\r
@@ -440,7 +413,7 @@ public class Mapper {
                \r
        }\r
                \r
-       private void collect(ReadGraph g) throws DatabaseException {\r
+       protected void collect(ReadGraph g) throws DatabaseException {\r
                if (vg != null)\r
                        return;\r
                SessionGarbageCollection.gc(g, 0, -1);\r
@@ -448,7 +421,7 @@ public class Mapper {
        \r
        int collect = 0;\r
        \r
-       private void collect2(ReadGraph g) throws DatabaseException {\r
+       protected void collect2(ReadGraph g) throws DatabaseException {\r
                if (vg != null)\r
                        return;\r
                \r
@@ -460,7 +433,7 @@ public class Mapper {
                }\r
        }\r
        \r
-       private void applyModifications(Session session, final Collection<GraphNode<Identifiable>> nodes, final IProgressMonitor monitor) throws Exception {\r
+       protected void applyModifications(Session session, final Collection<GraphNode<Identifiable>> nodes, final IProgressMonitor monitor) throws Exception {\r
                \r
                \r
                \r
@@ -576,7 +549,7 @@ public class Mapper {
                });\r
        }\r
        \r
-       private void applyGenerations(Session session, VirtualGraph vg, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
+       protected void applyGenerations(Session session, VirtualGraph vg, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
                \r
                int size = nodes.size();\r
                int count = 0;\r
@@ -709,7 +682,7 @@ public class Mapper {
                }\r
        }\r
        \r
-       private void applyConnections(Session session, VirtualGraph vg, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
+       protected void applyConnections(Session session, VirtualGraph vg, Collection<GraphNode<Identifiable>> nodes, IProgressMonitor monitor) throws Exception {\r
                int size = nodes.size();\r
                int count = 0;\r
                \r
@@ -761,7 +734,7 @@ public class Mapper {
                });\r
        }\r
 \r
-       private void applyModifications(ReadGraph g, GraphNode<Identifiable> n, Pair<IdentificationRule, ModificationRule> modRule, Collection<GraphNode<Identifiable>> ruleModified) throws Exception {\r
+       protected void applyModifications(ReadGraph g, GraphNode<Identifiable> n, Pair<IdentificationRule, ModificationRule> modRule, Collection<GraphNode<Identifiable>> ruleModified) throws Exception {\r
                if (!n.isDisposed() && modRule.first.matches(g, n)) { // we have to check \r
                        Collection<GraphNode<Identifiable>> perRule = new ArrayList<GraphNode<Identifiable>>();\r
                        perRule.add(n);\r
@@ -769,13 +742,13 @@ public class Mapper {
                }\r
        }\r
        \r
-       private void applyConnections(WriteGraph g, GraphNode<Identifiable> node) throws Exception {\r
+       protected void applyConnections(WriteGraph g, GraphNode<Identifiable> node) throws Exception {\r
                for (Link<Identifiable> link : node.getLinks()) {\r
                        if (link.isMain()) {\r
                                \r
                                for (Pair<ConnectionIdentificationRule, ConnectionGenerationRule> r : connectionRules) {\r
                                        if (r.first.mathces(g, node, link.to(), link)) {\r
-                                               Logger.defaultLogInfo("Connecting " +  getName(g, node.getData()) + " to " + getName(g, link.to().getData()) + " " + link.getName() + "/"+link.getInverseName());\r
+                                               LOGGER.info("Connecting " +  getName(g, node.getData()) + " to " + getName(g, link.to().getData()) + " " + link.getName() + "/"+link.getInverseName());\r
                                                r.second.generate(g, node, link.to(), link);\r
                                                break;\r
                                        }\r