[487718] Avoid SubMonitor.split(int) which does not exist on Mars

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

2 files changed, 13 insertions, 6 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 c01b0343b0..9dc438dec3 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.SubMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
@@ -50,7 +50,8 @@ public final class TableRefresherHelper {
      *            the monitor to use for monitoring the task.
      */
     public static void refreshEditor(AbstractDTableEditor tableEditor, IProgressMonitor theMonitor) {
-        SubMonitor subMonitor = SubMonitor.convert(theMonitor, 1);
+        theMonitor.beginTask("Refreshing", 1); //$NON-NLS-1$
+        IProgressMonitor subMonitor = new SubProgressMonitor(theMonitor, 1);
         final IRunnableWithProgress op = new IRunnableWithProgress() {
             @Override
             public void run(final IProgressMonitor monitor) {
@@ -64,7 +65,7 @@ public final class TableRefresherHelper {
             tableEditor.enablePropertiesUpdate(false);
             RefreshActionListenerRegistry.INSTANCE.notifyRepresentationIsAboutToBeRefreshed(tableEditor.getTableModel());
             monitorDialog.run(true, false, op);
-            subMonitor.split(1);
+            subMonitor.worked(1);
         } catch (final InvocationTargetException e) {
             MessageDialog.openError(activeShell, Messages.Refresh_error, e.getTargetException().getMessage());
             SiriusPlugin.getDefault().error(Messages.Refresh_errorDuringRefresh, e);
@@ -72,6 +73,7 @@ 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 a335c0daaa..a4f435b34d 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.SubMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -66,12 +66,17 @@ public final class TreeRefresherHelper {
      *            the monitor to use for monitoring the task.
      */
     public static void refreshEditor(DTreeEditor treeEditor, IStructuredSelection structuredSelection, IProgressMonitor theMonitor) {
-        SubMonitor subMonitor = SubMonitor.convert(theMonitor, 1);
+        theMonitor.beginTask("Refreshing", 1); //$NON-NLS-1$
+        IProgressMonitor subMonitor = new SubProgressMonitor(theMonitor, 1);
         IRunnableWithProgress op = getRunnable(treeEditor, structuredSelection);
         if (op != null) {
             run(op, treeEditor);
         }
-        subMonitor.split(1);
+        try {
+            subMonitor.worked(1);
+        } finally {
+            subMonitor.done();
+        }
     }
 
     /**