Remove static DEBUG flags and use slf4j.Logger.trace()

[simantics/3d.git] / org.simantics.g3d / src / org / simantics / g3d / scl / ScriptNodeMap.java

diff --git a/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java b/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java
index d532e1f0557adbf8b93099713bc56732a9e28a66..fc63fffc381cb2b5cb8da82d4ee349828496aa3d 100644 (file)
--- a/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java
@@ -11,7 +11,7 @@ import java.util.Set;
 import java.util.Stack;
 
 import org.simantics.db.ReadGraph;
-import org.simantics.db.Session;
+import org.simantics.db.RequestProcessor;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.common.request.WriteRequest;
@@ -27,6 +27,8 @@ import org.simantics.objmap.graph.IMapping;
 import org.simantics.objmap.graph.IMappingListener;
 import org.simantics.utils.datastructures.MapSet;
 import org.simantics.utils.datastructures.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * NodeMap implementation used with SCL scripts.
@@ -44,10 +46,10 @@ import org.simantics.utils.datastructures.Pair;
  */
 public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap<DBObject,Object,E>, IMappingListener, NodeListener {
 
-       private static final boolean DEBUG = false;
+       private static final Logger LOGGER = LoggerFactory.getLogger(ScriptNodeMap.class);
        
-       protected Session session;
-       protected IMapping<DBObject,E> mapping;
+       protected RequestProcessor session;
+       protected IMapping<DBObject,INode> mapping;
        
        protected ParentNode<E> rootNode;
        
@@ -55,7 +57,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        
        private boolean dirty = false;
        
-       public ScriptNodeMap(Session session, IMapping<DBObject,E> mapping, ParentNode<E> rootNode) {
+       public ScriptNodeMap(RequestProcessor session, IMapping<DBObject,INode> mapping, ParentNode<E> rootNode) {
                this.session = session;
                this.mapping = mapping;
                this.rootNode = rootNode;
@@ -91,10 +93,9 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                return Collections.EMPTY_LIST;
        }
        
-       @SuppressWarnings("unchecked")
        @Override
        public ParentNode<E> getRootNode() {
-               return (ParentNode<E>)rootNode;
+               return rootNode;
        }
        
        
@@ -120,16 +121,14 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
 
        private boolean rangeModified = false;
        
-       @SuppressWarnings("unchecked")
        @Override
        public void updateRenderObjectsFor(E node) {
-               nodes.add((E)node);
-
+               nodes.add(node);
        }
        
        @SuppressWarnings("unchecked")
        private void receiveAdd(E node, String id, boolean db) {
-               if (DEBUG) System.out.println("receiveAdd " + debugString(node)  + " " + id + " " + db);
+               if (LOGGER.isTraceEnabled()) LOGGER.trace("receiveAdd " + debugString(node)  + " " + id + " " + db);
                synchronized (syncMutex) {
                        for (Pair<E, String> n : added) {
                                if (n.first.equals(node))
@@ -146,7 +145,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        
        @SuppressWarnings("unchecked")
        private void receiveRemove(E node, String id, boolean db) {
-               if (DEBUG) System.out.println("receiveRemove " + debugString(node)  + " " + id + " " + db);
+               if (LOGGER.isTraceEnabled()) LOGGER.trace("receiveRemove " + debugString(node)  + " " + id + " " + db);
                synchronized (syncMutex) {
                        for (Pair<E, String> n : removed) {
                                if (n.first.equals(node))
@@ -160,9 +159,8 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                repaint();
        }
        
-       @SuppressWarnings("unchecked")
        private void receiveUpdate(E node, String id, boolean db) {
-               if (DEBUG) System.out.println("receiveUpdate " + debugString(node)  + " " + id + " " + db);
+               if (LOGGER.isTraceEnabled()) LOGGER.trace("receiveUpdate " + debugString(node)  + " " + id + " " + db);
                synchronized (syncMutex) {
 //          for (Pair<E, String> n : updated) {
 //              if (n.first.equals(node))
@@ -194,7 +192,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                        
                        @Override
                        public void perform(WriteGraph graph) throws DatabaseException {
-                               if (DEBUG) System.out.println("Commit " + commitMessage);
+                               if (LOGGER.isTraceEnabled()) LOGGER.trace("Commit " + commitMessage);
                                if (commitMessage != null) {
                                        Layer0Utils.addCommentMetadata(graph, commitMessage);
                                        graph.markUndoPoint();
@@ -208,12 +206,12 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        
        protected void commit(WriteGraph graph) throws DatabaseException {
                synchronized(syncMutex) {
-                       if (DEBUG) System.out.println("Commit");
+                       if (LOGGER.isTraceEnabled()) LOGGER.trace("Commit");
                        graphUpdates = true;
                        mapping.updateDomain(graph);
                        graphUpdates = false;
                        clearDeletes();
-                       if (DEBUG) System.out.println("Commit done");
+                       if (LOGGER.isTraceEnabled()) LOGGER.trace("Commit done");
                }
        }
        
@@ -223,7 +221,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        public void domainModified() {
                if (graphUpdates)
                        return;
-               if (DEBUG)System.out.println("domainModified");
+               if (LOGGER.isTraceEnabled()) LOGGER.trace("domainModified");
                // FIXME : this is called by IMapping id DB thread
                dirty = true;
 //        session.asyncRequest(new ReadRequest() {
@@ -238,7 +236,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        }
        
        protected void reset(ReadGraph graph) throws MappingException {
-               if (DEBUG) System.out.println("Reset");
+               if (LOGGER.isTraceEnabled()) LOGGER.trace("Reset");
                synchronized (syncMutex) {
                        graphUpdates = true;
                        mapping.getRangeModified().clear();
@@ -251,11 +249,12 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        }
        
        protected void update(ReadGraph graph) throws DatabaseException {
-               if (DEBUG) System.out.println("Graph update start");
+               if (LOGGER.isTraceEnabled()) LOGGER.trace("Graph update start");
                synchronized (syncMutex) {
                        graphUpdates = true;
                        for (DBObject domainObject : mapping.getDomainModified()) {
-                               E rangeObject = mapping.get(domainObject);
+                               @SuppressWarnings("unchecked")
+                               E rangeObject = (E) mapping.get(domainObject);
                                if (rangeObject != null)
                                        graphModified.add(rangeObject);
                        }
@@ -270,7 +269,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                //if (mapping.isRangeModified() && !runUndo) // FIXME : redo?
                if (mapping.isRangeModified())
                        commit((String)null);
-               if (DEBUG) System.out.println("Graph update done");
+               if (LOGGER.isTraceEnabled()) LOGGER.trace("Graph update done");
        }
        
        @Override
@@ -290,7 +289,6 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                                doCommit();
                        }
                        session.syncRequest(new ReadRequest() { 
-                               @SuppressWarnings("unchecked")
                                @Override
                                public void run(ReadGraph graph) throws DatabaseException {
                                        update(graph);
@@ -319,6 +317,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
         * This code here synchronizes removed and added objects to collect deletable objects. (a deletable object is one which is removed but not added).  
         * 
         */
+       @SuppressWarnings("unused")
        protected void syncDeletes() {
                deleteUC.clear();
                for (Pair<E, String> n : removed) {
@@ -327,10 +326,10 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                for (Pair<E, String> n : added) {
                        deleteUC.remove(n.first);   
                } 
-               if (DEBUG && deleteUC.size() > 0) {
-                       System.out.println("Delete sync");
+               if (LOGGER.isTraceEnabled() && deleteUC.size() > 0) {
+                       LOGGER.trace("Delete sync");
                        for (E n : delete) {
-                               System.out.println(debugString(n));
+                               LOGGER.trace(debugString(n));
                        }
                }
                delete.addAll(deleteUC);
@@ -340,10 +339,11 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        /**
         * Clears deletable objects from mapping cache.
         */
+       @SuppressWarnings("unused")
        protected void clearDeletes() {
-               if (DEBUG && delete.size() > 0) System.out.println("Delete");
+               if (LOGGER.isTraceEnabled() && delete.size() > 0) LOGGER.trace("Delete");
                for (E n : delete) {
-                       if (DEBUG) System.out.println(debugString(n));
+                       if (LOGGER.isTraceEnabled()) LOGGER.trace(debugString(n));
                        mapping.getRange().remove(n);
                }
                delete.clear();
@@ -514,7 +514,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        @Override
        public <T extends INode> void nodeAdded(ParentNode<T> node, INode child,
                        String rel) {
-               if (DEBUG) System.out.println("Node added " + child + " parent " + node);
+               if (LOGGER.isTraceEnabled()) LOGGER.trace("Node added " + child + " parent " + node);
                //receiveAdd((E)child, rel ,graphUpdates);
                receiveAdd((E)child, rel ,graphModified.contains(node));
                
@@ -524,7 +524,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        @Override
        public <T extends INode> void nodeRemoved(ParentNode<T> node, INode child,
                        String rel) {
-               if (DEBUG) System.out.println("Node removed " + child + " parent " + node);
+               if (LOGGER.isTraceEnabled()) LOGGER.trace("Node removed " + child + " parent " + node);
                //receiveRemove((E)child, rel, graphUpdates);
                receiveRemove((E)child, rel, graphModified.contains(node));
                
@@ -561,7 +561,8 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                
        }
        
-       public IMapping<DBObject,E> getMapping() {
+       @Override
+       public IMapping<DBObject,INode> getMapping() {
                return mapping;
        }