X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Factions%2FMergeFlagsAction.java;fp=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Factions%2FMergeFlagsAction.java;h=ea0a40593be4500aae06ec4efe4ac97bba91f6f8;hb=47269fe0acb894f346810417d950a1ab59cdc0ea;hp=15d0ed086e42d4915815860429602bf3385e0919;hpb=11309f6516278203264b680235cbbe1dc2bde98e;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/MergeFlagsAction.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/MergeFlagsAction.java
index 15d0ed086..ea0a40593 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/MergeFlagsAction.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/MergeFlagsAction.java
@@ -43,7 +43,7 @@ public class MergeFlagsAction implements ActionFactory {
                     IRunnableWithProgress runnable = new IRunnableWithProgress() {
                         @Override
                         public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-                            final SubMonitor submonitor = SubMonitor.convert(monitor, "Merge Flags", 1000);
+                            final SubMonitor submonitor = SubMonitor.convert(monitor, Messages.MergeFlagsAction_MonitorMergeFlags, 1000);
                             try {
                                 Simantics.getSession().sync(new WriteRequest() {
                                     @Override
@@ -51,14 +51,14 @@ public class MergeFlagsAction implements ActionFactory {
                                         graph.markUndoPoint();
                                         
                                         SubMonitor expand = submonitor.newChild(10);
-                                        expand.subTask("Expand Composite Set");
+                                        expand.subTask(Messages.MergeFlagsAction_ExpandCompositeSet);
                                         MergeFlags.expandCompositeSet(graph, composites);
                                         if (monitor.isCanceled())
                                             throw new CancelTransactionException();
                                         expand.done();
 
                                         SubMonitor collect = submonitor.newChild(490);
-                                        collect.subTask("Collect flags");
+                                        collect.subTask(Messages.MergeFlagsAction_CollectFlag);
                                         collect.setWorkRemaining(composites.size());
                                         ArrayList<ArrayList<Resource>> groups = new ArrayList<ArrayList<Resource>>(); 
                                         for(Resource composite : composites) {
@@ -70,7 +70,7 @@ public class MergeFlagsAction implements ActionFactory {
                                         collect.done();
 
                                         SubMonitor merge = submonitor.newChild(500);
-                                        merge.subTask("Merge collected flags");
+                                        merge.subTask(Messages.MergeFlagsAction_MonitorMergeCollectedFlags);
                                         merge.setWorkRemaining(composites.size());
                                         for(ArrayList<Resource> group : groups) {
                                             MergeFlags.merge(graph, group);