Merge commit 'd186091'

[simantics/platform.git] / bundles / org.simantics.annotation.ui / src / org / simantics / annotation / ui / SCL.java

diff --git a/bundles/org.simantics.annotation.ui/src/org/simantics/annotation/ui/SCL.java b/bundles/org.simantics.annotation.ui/src/org/simantics/annotation/ui/SCL.java
index 7a7977f33fe65807d1ebefd260404af0a449d647..f4f99997c5b0e1cd0191be2d4584e065576113a6 100644 (file)
--- a/bundles/org.simantics.annotation.ui/src/org/simantics/annotation/ui/SCL.java
+++ b/bundles/org.simantics.annotation.ui/src/org/simantics/annotation/ui/SCL.java
@@ -34,7 +34,6 @@ import org.simantics.db.VirtualGraph;
 import org.simantics.db.WriteGraph;\r
 import org.simantics.db.common.request.UnaryRead;\r
 import org.simantics.db.common.request.WriteRequest;\r
-import org.simantics.db.common.utils.Logger;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.util.Layer0Utils;\r
 import org.simantics.db.layer0.util.RemoverUtil;\r
@@ -60,6 +59,8 @@ import org.simantics.utils.strings.AlphanumComparator;
 import org.simantics.utils.ui.ISelectionUtils;\r
 import org.simantics.views.swt.client.base.ISWTViewNode;\r
 import org.simantics.views.swt.client.impl.SWTExplorer;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 \r
 import gnu.trove.map.hash.THashMap;\r
 import gnu.trove.set.hash.THashSet;\r
@@ -69,6 +70,8 @@ import gnu.trove.set.hash.THashSet;
  * @author Tuukka Lehtonen\r
  */\r
 public class SCL {\r
+    \r
+    private static final Logger LOGGER = LoggerFactory.getLogger(SCL.class);\r
 \r
     final public static String EMPTY = "";\r
     final public static String MAPPED = "Mapped";\r
@@ -493,7 +496,7 @@ public class SCL {
                        try {\r
                                doAdd((Variable)properties.input);\r
                        } catch (DatabaseException e) {\r
-                               Logger.defaultLogError(e);\r
+                           LOGGER.error("newAnnotationModifier failed", e);\r
                        }\r
                        return null;\r
                        \r
@@ -670,7 +673,7 @@ public class SCL {
                        String name = graph.getPossibleRelatedValue(r, L0.HasName, Bindings.STRING);\r
                        if(name != null) {\r
                                if (result.put(name, r) != null)\r
-                                       System.err.println(this + ": The database contains siblings with the same name " + name + " (resource=$" + resource.getResourceId() +").");\r
+                                   LOGGER.error("The database contains siblings with the same name " + name + " (resource=$" + resource.getResourceId() +").");\r
                        }\r
                }\r
                return result;\r