Replace log4j with slf4j

[simantics/interop.git] / org.simantics.interop.mapping / src / org / simantics / interop / mapping / data / GraphNode.java

diff --git a/org.simantics.interop.mapping/src/org/simantics/interop/mapping/data/GraphNode.java b/org.simantics.interop.mapping/src/org/simantics/interop/mapping/data/GraphNode.java
index c775e8b1c68e62df7b1f0c6d2f1976b721703b7d..cdebb512d33c4e25526cdbca9774be01ba29022e 100644 (file)
--- a/org.simantics.interop.mapping/src/org/simantics/interop/mapping/data/GraphNode.java
+++ b/org.simantics.interop.mapping/src/org/simantics/interop/mapping/data/GraphNode.java
@@ -6,8 +6,8 @@ import java.util.HashSet;
 import java.util.List;\r
 import java.util.Set;\r
 \r
-import org.simantics.interop.mapping.Logger;\r
 import org.simantics.utils.datastructures.hints.HintContext;\r
+import org.slf4j.Logger;\r
 \r
 \r
 /**\r
@@ -18,6 +18,9 @@ import org.simantics.utils.datastructures.hints.HintContext;
  * @param <T>\r
  */\r
 public class GraphNode<T> extends HintContext {\r
+       \r
+       private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(GraphNode.class);\r
+       \r
        protected T data;\r
        private List<Link<T>> nodes = new ArrayList<Link<T>>();\r
 \r
@@ -56,9 +59,9 @@ public class GraphNode<T> extends HintContext {
         */\r
        public Link<T> addLink(String relationName, String inverseRelationName,GraphNode<T> node) {\r
                _checkDisposed();\r
-               Logger.defaultLogInfo("Node link " + data + " " + node.data + " " + relationName + " " + inverseRelationName +"\n");\r
+               LOGGER.info("Node link " + data + " " + node.data + " " + relationName + " " + inverseRelationName +"\n");\r
                if(containsLink(relationName, node) && node.containsLink(inverseRelationName, this)) {\r
-                       Logger.defaultLogWarning("Node " + getData() + " has already given child " +  node.getData() + " ,with name " + relationName + " / " + inverseRelationName);\r
+                       LOGGER.warn("Node " + getData() + " has already given child " +  node.getData() + " ,with name " + relationName + " / " + inverseRelationName);\r
                        return null;\r
                }\r
                Link<T> rel = _addLink(relationName,node);\r
@@ -77,7 +80,7 @@ public class GraphNode<T> extends HintContext {
        public Link<T> addLink(String relationName,GraphNode<T> node) {\r
                _checkDisposed();\r
                if(containsLink(relationName, node)) {\r
-                       Logger.defaultLogWarning("Node " + getData() + " has already given child " +  node.getData() + " ,with name " + relationName );\r
+                       LOGGER.warn("Node " + getData() + " has already given child " +  node.getData() + " ,with name " + relationName );\r
                        return null;\r
                }\r
                Link<T> rel = _addLink(relationName,node);\r
@@ -96,7 +99,7 @@ public class GraphNode<T> extends HintContext {
        public Link<T> addLink(Link<T> link ,GraphNode<T> node) {\r
                _checkDisposed();\r
                if(containsLink(link.getName(), node) && node.containsLink(link.getInverseName(), this)) {\r
-                       Logger.defaultLogWarning("Node " + getData() + " has already given child " +  node.getData() + " ,with name " + link.getName() + " / " + link.getInverseName());\r
+                       LOGGER.warn("Node " + getData() + " has already given child " +  node.getData() + " ,with name " + link.getName() + " / " + link.getInverseName());\r
                        return null;\r
                }\r
                Link<T> rel = _addLink(link.getName(),node);\r
@@ -713,12 +716,12 @@ public class GraphNode<T> extends HintContext {
        \r
 \r
        /**\r
-        * Disposes this node. Removes all the links that connect to thi snode.\r
+        * Disposes this node. Removes all the links that connect to this node.\r
         */\r
        public void destroy() {\r
                if (disposed)\r
                        return;\r
-               Logger.defaultLogInfo("Node destroy " + data + " " + this);\r
+               LOGGER.info("Node destroy " + data + " " + this);\r
                Collection<Link<T>> coll = new ArrayList<Link<T>>();\r
                coll.addAll(nodes);\r
                nodes.clear();\r
@@ -736,17 +739,17 @@ public class GraphNode<T> extends HintContext {
                if (disposed)\r
                        return;\r
                // FIXME: link.to may be *this.\r
-               Logger.defaultLogInfo("Node remove " + data + " " + this);\r
+               LOGGER.info("Node remove " + data + " " + this);\r
                if (nodes.size() == 1) {\r
                        Link<T> link = nodes.get(0);\r
                        link.to().removeLink(link.getInverseName(), link.getName(), this);\r
                } else {\r
                        for (int i = 0; i < nodes.size() -1 ; i++) {\r
                                Link<T> link1 = nodes.get(i);\r
-                               link1.to().removeLink(link1.getInverseName(), link1.getName(), this);\r
-                               for (int j = i; j < nodes.size(); j++) {\r
+                               link1.to()._removeLink(link1.getInverseName(), link1.getName(), this);\r
+                               for (int j = i+1; j < nodes.size(); j++) {\r
                                        Link<T> link2 = nodes.get(j);\r
-                                       link2.to().removeLink(link2.getInverseName(), link2.getName(), this);\r
+                                       link2.to()._removeLink(link2.getInverseName(), link2.getName(), this);\r
                                        if (link1.to().equals(link2.to()))\r
                                                continue;\r
                                        link1.to().addLink(link1.getInverseName(),link2.getInverseName(),link2.to());\r
@@ -770,7 +773,7 @@ public class GraphNode<T> extends HintContext {
        }\r
        \r
        /**\r
-        * Disposed the node and all nodes that are in the same graph.\r
+        * Dispose the node and all nodes that are in the same graph.\r
         */\r
        public void dispose() {\r
                if (disposed)\r
@@ -788,7 +791,7 @@ public class GraphNode<T> extends HintContext {
 \r
        protected void _checkDisposed() {\r
                if (disposed) {\r
-                       Logger.defaultLogError("Remove Node, disposed " + this);\r
+                       LOGGER.error("Remove Node, disposed " + this);\r
                        throw new RuntimeException("Node " + this + " is disposed.");\r
                }\r
        }\r
@@ -817,4 +820,8 @@ public class GraphNode<T> extends HintContext {
                                return count;\r
                }\r
        }\r
+       \r
+       public String toString() {\r
+               return "Node : " + data;\r
+       }\r
 }\r