diff options
| author | Karsten Thoms | 2018-02-20 20:26:54 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-02-22 09:22:31 +0000 |
| commit | 9009085b72e9507fdc4b7d0adb87883adefc5637 (patch) | |
| tree | c4ce8132adbb62d954c57868839f65be21f1dd1e /bundles/org.eclipse.equinox.p2.discovery.compatibility | |
| parent | b8aac321885c70774d225f69bf5fe7e397ac20c3 (diff) | |
| download | rt.equinox.p2-9009085b72e9507fdc4b7d0adb87883adefc5637.tar.gz rt.equinox.p2-9009085b72e9507fdc4b7d0adb87883adefc5637.tar.xz rt.equinox.p2-9009085b72e9507fdc4b7d0adb87883adefc5637.zip | |
Bug 531430 - Replace usage of SubProgressMonitor by SubMonitorI20180226-2000I20180225-2000I20180224-1500I20180223-2000I20180222-2000
Change-Id: Iea476f0ceb12d83224e0274c1d6a53c49b81adce
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.discovery.compatibility')
2 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/BundleDiscoveryStrategy.java b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/BundleDiscoveryStrategy.java index b394ba8b0..a83a829f9 100644 --- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/BundleDiscoveryStrategy.java +++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/BundleDiscoveryStrategy.java @@ -42,7 +42,7 @@ public class BundleDiscoveryStrategy extends AbstractDiscoveryStrategy { monitor.beginTask(Messages.BundleDiscoveryStrategy_task_loading_local_extensions, extensions.length == 0 ? 1 : extensions.length); try { if (extensions.length > 0) { - processExtensions(new SubProgressMonitor(monitor, extensions.length), extensions); + processExtensions(SubMonitor.convert(monitor, extensions.length), extensions); } } finally { monitor.done(); diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/RemoteBundleDiscoveryStrategy.java b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/RemoteBundleDiscoveryStrategy.java index 0a21f6332..aa930162b 100644 --- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/RemoteBundleDiscoveryStrategy.java +++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/RemoteBundleDiscoveryStrategy.java @@ -81,7 +81,7 @@ public class RemoteBundleDiscoveryStrategy extends BundleDiscoveryStrategy { TransportUtil.readResource(new URI(directoryUrl), reader -> { DirectoryParser parser = new DirectoryParser(); temp[0] = parser.parse(reader); - }, new SubProgressMonitor(monitor, ticksTenPercent)); + }, SubMonitor.convert(monitor, ticksTenPercent)); directory = temp[0]; if (directory == null) { throw new IllegalStateException(); @@ -160,7 +160,7 @@ public class RemoteBundleDiscoveryStrategy extends BundleDiscoveryStrategy { if (extensionPoint != null) { IExtension[] extensions = extensionPoint.getExtensions(); if (extensions.length > 0) { - processExtensions(new SubProgressMonitor(monitor, ticksTenPercent * 3), extensions); + processExtensions(SubMonitor.convert(monitor, ticksTenPercent * 3), extensions); } } } finally { |