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=9a7b1055cd08fc90bd0ddec2208fa66131371ea0;hb=1dfeb7d5c49b1391cd9d877e1eddab18995cb151;hp=a426915128b7734890066c63d071713dd3cac728;hpb=c13c4179bda758e77fe1f2032d3c4268bb9e3120;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..9a7b1055c 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,6 +20,7 @@ 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 flags, ICanvasContext canvasContext) throws DatabaseException { monitor.beginTask("Merge Selected Flags", IProgressMonitor.UNKNOWN); performMerge(graph, flags, canvasContext); @@ -26,7 +29,7 @@ public class MergeFlagsHandler extends FlagOperationHandler { public static void performMerge(WriteGraph graph, List 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