tmf: Replace usage of SubProgressMonitor with SubMonitor

SubProgressMonitor is now deprecated, replace its usage with the
recommended SubMonitor instead. This fixes the staging target.

Change-Id: I9ae99c1e8da2da5a98c90ea2f45fbd0207d3b734
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-on: https://git.eclipse.org/r/60823
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/DeleteTraceFolderElementHandler.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/DeleteTraceFolderElementHandler.java
index 0b71336daec44125c5db3f8bb994c4d9465c83ee..f483e7b8e185f0c88ea05e5681184d0662815b54 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/DeleteTraceFolderElementHandler.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/DeleteTraceFolderElementHandler.java
@@ -27,7 +27,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -259,7 +258,7 @@ public class DeleteTraceFolderElementHandler extends AbstractHandler {
                         throw new OperationCanceledException();
                     }
                     Object element = iterator.next();
-                    SubProgressMonitor elementSubMonitor = new SubProgressMonitor(subMonitor, 1);
+                    IProgressMonitor elementSubMonitor = subMonitor.newChild(1);
                     if (element instanceof TmfTraceElement) {
                         final TmfTraceElement trace = (TmfTraceElement) element;
                         if (!trace.getResource().exists()) {
@@ -294,14 +293,13 @@ public class DeleteTraceFolderElementHandler extends AbstractHandler {
                             // delete all traces under this folder
                             SubMonitor childrenSubMonitor = SubMonitor.convert(elementSubMonitor, folder.getTraces().size() + 1);
                             for (TmfTraceElement traceElement : folder.getTraces()) {
-                                SubProgressMonitor deleteSubMonitor = new SubProgressMonitor(childrenSubMonitor, 1);
-                                traceElement.delete(deleteSubMonitor);
+                                traceElement.delete(childrenSubMonitor.newChild(1));
                             }
 
                             // Finally, delete the folder. For the Traces
                             // folder, we only delete the children since the
                             // folder should always be there.
-                            final SubProgressMonitor deleteSubMonitor = new SubProgressMonitor(subMonitor, 1);
+                            final IProgressMonitor deleteSubMonitor = subMonitor.newChild(1);
                             if (folder instanceof TmfTracesFolder) {
                                 resource.accept(new IResourceVisitor() {
                                     @Override
@@ -346,4 +344,4 @@ public class DeleteTraceFolderElementHandler extends AbstractHandler {
         return null;
     }
 
-}
\ No newline at end of file
+}

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TraceValidateAndImportOperation.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TraceValidateAndImportOperation.java
index d6a7e40b9b9790145e9130750b25276943dec4da..b8c31b34114ce9f2d2ab08f780778c0e6700225c 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TraceValidateAndImportOperation.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/TraceValidateAndImportOperation.java
@@ -37,7 +37,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.core.runtime.URIUtil;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.operation.ModalContext;
@@ -150,10 +149,10 @@ public class TraceValidateAndImportOperation implements IRunnableWithProgress {
             // Temporary directory to contain any extracted files
             IFolder destTempFolder = fTraceFolderElement.getProject().getResource().getFolder(TRACE_IMPORT_TEMP_FOLDER);
             if (destTempFolder.exists()) {
-                SubProgressMonitor monitor = new SubProgressMonitor(subMonitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK);
+                SubMonitor monitor = subMonitor.newChild(1);
                 destTempFolder.delete(true, monitor);
             }
-            SubProgressMonitor monitor = new SubProgressMonitor(subMonitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK);
+            SubMonitor monitor = subMonitor.newChild(1);
             destTempFolder.create(IResource.HIDDEN, true, monitor);
 
             subMonitor = SubMonitor.convert(progressMonitor, 2);
@@ -446,7 +445,7 @@ public class TraceValidateAndImportOperation implements IRunnableWithProgress {
         operation.setOverwriteResources(false);
         operation.setVirtualFolders(false);
 
-        operation.run(new SubProgressMonitor(progressMonitor, subList.size(), SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+        operation.run(SubMonitor.convert(progressMonitor).newChild(subList.size()));
     }
 
     private static TraceFileSystemElement getRootElement(TraceFileSystemElement element) {
@@ -609,7 +608,7 @@ public class TraceValidateAndImportOperation implements IRunnableWithProgress {
         operation.setCreateLinks(createLinksInWorkspace);
         operation.setVirtualFolders(false);
 
-        operation.run(new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+        operation.run(SubMonitor.convert(monitor).newChild(1));
         String sourceLocation = fileSystemElement.getSourceLocation();
         IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(tracePath);
         if (sourceLocation != null) {

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExportOperation.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExportOperation.java
index 5170c32e9a9d2bb3b27ca253e7d38d7aa05aafa4..1456bdae924333ec4bdd31b223598ab1d699770a 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExportOperation.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageExportOperation.java
@@ -35,7 +35,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jface.operation.ModalContext;
 import org.eclipse.tracecompass.internal.tmf.ui.Activator;
 import org.eclipse.tracecompass.internal.tmf.ui.project.wizards.tracepkg.AbstractTracePackageOperation;
@@ -134,7 +134,7 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
 
             setStatus(exportToArchive(progressMonitor, totalWork));
 
-            fExportFolder.delete(true, new SubProgressMonitor(progressMonitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+            fExportFolder.delete(true, SubMonitor.convert(progressMonitor));
 
             progressMonitor.done();
 
@@ -150,7 +150,7 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
         if (folder.exists()) {
             folder.delete(true, null);
         }
-        folder.create(IResource.FORCE | IResource.HIDDEN, true, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+        folder.create(IResource.FORCE | IResource.HIDDEN, true, SubMonitor.convert(monitor));
         return folder;
     }
 
@@ -194,9 +194,9 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
 
                 // project/.traceExport/.tracing/A/B
                 IFolder folder = fExportFolder.getFolder(relativeToExportFolder.removeLastSegments(1));
-                TraceUtils.createFolder(folder, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+                TraceUtils.createFolder(folder, SubMonitor.convert(monitor));
 
-                res.refreshLocal(0, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+                res.refreshLocal(0, SubMonitor.convert(monitor));
                 createExportResource(folder, res);
                 Element suppFileElement = doc.createElement(ITracePackageConstants.SUPPLEMENTARY_FILE_ELEMENT);
 
@@ -220,7 +220,7 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
 
         // project/.traceExport/A/B
         IFolder folder = fExportFolder.getFolder(relativeToExportFolder.removeLastSegments(1));
-        TraceUtils.createFolder(folder, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+        TraceUtils.createFolder(folder, SubMonitor.convert(monitor));
 
         createExportResource(folder, resource);
         Element fileElement = doc.createElement(ITracePackageConstants.TRACE_FILE_ELEMENT);
@@ -295,7 +295,7 @@ public class TracePackageExportOperation extends AbstractTracePackageOperation {
         op.setCreateLeadupStructure(false);
         op.setUseCompression(fUseCompression);
         op.setUseTarFormat(fUseTar);
-        op.run(new SubProgressMonitor(monitor, totalWork / 2, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+        op.run(SubMonitor.convert(monitor).newChild(totalWork / 2));
 
         return op.getStatus();
     }

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java
index 433808295901e55caddd76bfb2185fed06de133f..9b2acfe255ef2c290f618b15bf27ae033b7bd36f 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java
@@ -37,7 +37,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.core.runtime.URIUtil;
 import org.eclipse.jface.operation.ModalContext;
 import org.eclipse.tracecompass.internal.tmf.ui.Activator;
@@ -263,7 +263,7 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i
             TmfTraceElement existingTrace = getMatchingTraceElement(traceElement);
             if (existingTrace != null) {
                 try {
-                    existingTrace.delete(new SubProgressMonitor(progressMonitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+                    existingTrace.delete(SubMonitor.convert(progressMonitor));
                 } catch (CoreException e) {
                     return new Status(IStatus.ERROR, Activator.PLUGIN_ID, org.eclipse.tracecompass.internal.tmf.ui.project.wizards.tracepkg.Messages.TracePackage_ErrorOperation, e);
                 }
@@ -473,7 +473,7 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i
         operation.setOverwriteResources(true);
 
         try {
-            operation.run(new SubProgressMonitor(monitor, fileNameAndLabelPairs.size(), SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
+            operation.run(SubMonitor.convert(monitor));
             archiveFile.close();
         } catch (InvocationTargetException e) {
             return new Status(IStatus.ERROR, Activator.PLUGIN_ID, org.eclipse.tracecompass.internal.tmf.ui.project.wizards.tracepkg.Messages.TracePackage_ErrorOperation, e);