X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Factions%2FMergeFlagsHandler.java;h=3671fa9bbb88298038be9ccc86f8128170a7b497;hb=f102c41489c2cbd78116d513cd0e351434bb43eb;hp=a426915128b7734890066c63d071713dd3cac728;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

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 a42691512..3671fa9bb 100644
--- 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
@@ -11,6 +11,8 @@ 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ö
@@ -18,15 +20,16 @@ import org.simantics.modeling.flags.MergeFlags;
  */
 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);
+        monitor.beginTask(Messages.MergeFlagsHandler_MonitorMergeSelectedFlags, 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) {
-            System.err.println(text);
+            LOGGER.error(text);
             PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
                 @Override
                 public void run() {
@@ -39,7 +42,7 @@ public class MergeFlagsHandler extends FlagOperationHandler {
         else {
             String result = MergeFlags.merge(graph, flags);
             if(result != null && !result.isEmpty()) {
-                System.err.println(result); // Should not happen because of prevalidation
+                LOGGER.error(result); // Should not happen because of prevalidation
             } else {
                 if (canvasContext != null) {
                     // Make sure the diagram selection is set to the