Replace System.err and System.out with SLF4J Logging

[simantics/platform.git] / bundles / org.simantics.modeling.ui / src / org / simantics / modeling / ui / actions / MergeFlagsHandler.java

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/MergeFlagsHandler.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/MergeFlagsHandler.java
index a003c13283304746e62e31547b2db73527a1403f..9a7b1055cd08fc90bd0ddec2208fa66131371ea0 100644 (file)
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/MergeFlagsHandler.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/MergeFlagsHandler.java
@@ -1,56 +1,59 @@
-package org.simantics.modeling.ui.actions;\r
-\r
-import java.util.Collections;\r
-import java.util.List;\r
-\r
-import org.eclipse.core.runtime.IProgressMonitor;\r
-import org.eclipse.ui.PlatformUI;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.diagram.synchronization.runtime.DiagramSelectionUpdater;\r
-import org.simantics.g2d.canvas.ICanvasContext;\r
-import org.simantics.modeling.flags.MergeFlags;\r
-\r
-/**\r
- * @author Hannu Niemistö\r
- * @author Tuukka Lehtonen\r
- */\r
-public class MergeFlagsHandler extends FlagOperationHandler {\r
-\r
-    protected void perform(IProgressMonitor monitor, WriteGraph graph, List<Resource> flags, ICanvasContext canvasContext) throws DatabaseException {\r
-        monitor.beginTask("Merge Selected Flags", IProgressMonitor.UNKNOWN);\r
-        performMerge(graph, flags, canvasContext);\r
-    }\r
-\r
-    public static void performMerge(WriteGraph graph, List<Resource> flags, ICanvasContext canvasContext) throws DatabaseException {\r
-        final String text = MergeFlags.validateForMerge(graph, flags);\r
-        if(text != null) {\r
-            System.err.println(text);\r
-            PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {\r
-                @Override\r
-                public void run() {\r
-                    PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()\r
-                    .getActiveEditor().getEditorSite().getActionBars().getStatusLineManager()\r
-                    .setErrorMessage(text);\r
-                }\r
-            });\r
-        }\r
-        else {\r
-            String result = MergeFlags.merge(graph, flags);\r
-            if(result != null && !result.isEmpty()) {\r
-                System.err.println(result); // Should not happen because of prevalidation\r
-            } else {\r
-                if (canvasContext != null) {\r
-                    // Make sure the diagram selection is set to the\r
-                    // merged flag after the merge.\r
-                    new DiagramSelectionUpdater( canvasContext )\r
-                    .setNewSelection(0, Collections.singleton( flags.get(0) ))\r
-                    .setOneshot(true)\r
-                    .track();\r
-                }\r
-            }\r
-        }\r
-    }\r
-\r
-}\r
+package org.simantics.modeling.ui.actions;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.ui.PlatformUI;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.diagram.synchronization.runtime.DiagramSelectionUpdater;
+import org.simantics.g2d.canvas.ICanvasContext;
+import org.simantics.modeling.flags.MergeFlags;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Hannu Niemist&ouml;
+ * @author Tuukka Lehtonen
+ */
+public class MergeFlagsHandler extends FlagOperationHandler {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(MergeFlagsHandler.class);
+    protected void perform(IProgressMonitor monitor, WriteGraph graph, List<Resource> flags, ICanvasContext canvasContext) throws DatabaseException {
+        monitor.beginTask("Merge Selected Flags", IProgressMonitor.UNKNOWN);
+        performMerge(graph, flags, canvasContext);
+    }
+
+    public static void performMerge(WriteGraph graph, List<Resource> flags, ICanvasContext canvasContext) throws DatabaseException {
+        final String text = MergeFlags.validateForMerge(graph, flags);
+        if(text != null) {
+            LOGGER.error(text);
+            PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+                @Override
+                public void run() {
+                    PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+                    .getActiveEditor().getEditorSite().getActionBars().getStatusLineManager()
+                    .setErrorMessage(text);
+                }
+            });
+        }
+        else {
+            String result = MergeFlags.merge(graph, flags);
+            if(result != null && !result.isEmpty()) {
+                LOGGER.error(result); // Should not happen because of prevalidation
+            } else {
+                if (canvasContext != null) {
+                    // Make sure the diagram selection is set to the
+                    // merged flag after the merge.
+                    new DiagramSelectionUpdater( canvasContext )
+                    .setNewSelection(0, Collections.singleton( flags.get(0) ))
+                    .setOneshot(true)
+                    .track();
+                }
+            }
+        }
+    }
+
+}