[487718] Re-introduce SubMonitor.split(int) now that Mars support is gone

Calls to SubMonitor.split(int) were introduced by e236175a1fd189d, but
at the time we still needed to build on Mars, where this API did not
exist. Commit 96c76f319efea replaced those calls with older APIs, but
it's not clear the behavior was the same. Now that Mars support is
gone, we can reintroduce the original (and more modern) code.

Bug: 487718
Change-Id: I0cc4e35ac11db16c42035f8083dc5cc01553b227
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

2 files changed, 6 insertions, 13 deletions

diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/refresh/TableRefresherHelper.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/refresh/TableRefresherHelper.java
index 9dc438dec3..c01b0343b0 100644
--- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/refresh/TableRefresherHelper.java
+++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/refresh/TableRefresherHelper.java
@@ -13,7 +13,7 @@ package org.eclipse.sirius.table.ui.business.internal.refresh;
 import java.lang.reflect.InvocationTargetException;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
@@ -50,8 +50,7 @@ public final class TableRefresherHelper {
      *            the monitor to use for monitoring the task.
      */
     public static void refreshEditor(AbstractDTableEditor tableEditor, IProgressMonitor theMonitor) {
-        theMonitor.beginTask("Refreshing", 1); //$NON-NLS-1$
-        IProgressMonitor subMonitor = new SubProgressMonitor(theMonitor, 1);
+        SubMonitor subMonitor = SubMonitor.convert(theMonitor, 1);
         final IRunnableWithProgress op = new IRunnableWithProgress() {
             @Override
             public void run(final IProgressMonitor monitor) {
@@ -65,7 +64,7 @@ public final class TableRefresherHelper {
             tableEditor.enablePropertiesUpdate(false);
             RefreshActionListenerRegistry.INSTANCE.notifyRepresentationIsAboutToBeRefreshed(tableEditor.getTableModel());
             monitorDialog.run(true, false, op);
-            subMonitor.worked(1);
+            subMonitor.split(1);
         } catch (final InvocationTargetException e) {
             MessageDialog.openError(activeShell, Messages.Refresh_error, e.getTargetException().getMessage());
             SiriusPlugin.getDefault().error(Messages.Refresh_errorDuringRefresh, e);
@@ -73,7 +72,6 @@ public final class TableRefresherHelper {
             MessageDialog.openInformation(activeShell, Messages.Refresh_cancelled, e.getMessage());
         } finally {
             tableEditor.enablePropertiesUpdate(true);
-            subMonitor.done();
         }
     }
 }
diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/refresh/TreeRefresherHelper.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/refresh/TreeRefresherHelper.java
index a4f435b34d..a335c0daaa 100644
--- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/refresh/TreeRefresherHelper.java
+++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/refresh/TreeRefresherHelper.java
@@ -16,7 +16,7 @@ import java.util.Collection;
 import java.util.LinkedList;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -66,17 +66,12 @@ public final class TreeRefresherHelper {
      *            the monitor to use for monitoring the task.
      */
     public static void refreshEditor(DTreeEditor treeEditor, IStructuredSelection structuredSelection, IProgressMonitor theMonitor) {
-        theMonitor.beginTask("Refreshing", 1); //$NON-NLS-1$
-        IProgressMonitor subMonitor = new SubProgressMonitor(theMonitor, 1);
+        SubMonitor subMonitor = SubMonitor.convert(theMonitor, 1);
         IRunnableWithProgress op = getRunnable(treeEditor, structuredSelection);
         if (op != null) {
             run(op, treeEditor);
         }
-        try {
-            subMonitor.worked(1);
-        } finally {
-            subMonitor.done();
-        }
+        subMonitor.split(1);
     }
 
     /**