diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiModelFactory.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiModelFactory.java index 45321134afb..764c482c2e2 100644 --- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiModelFactory.java +++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiModelFactory.java @@ -251,94 +251,86 @@ public static IApiBaseline newApiBaseline(String name, ExecutionEnvironmentDescr public static IApiComponent[] addComponents(IApiBaseline baseline, String installLocation, IProgressMonitor monitor) throws CoreException { SubMonitor subMonitor = SubMonitor.convert(monitor, Messages.configuring_baseline, 50); IApiComponent[] result = null; - try { - // Acquire the service - ITargetPlatformService service = null; - ApiPlugin plugin = ApiPlugin.getDefault(); - if (plugin != null) { - service = ApiPlugin.getDefault().acquireService(ITargetPlatformService.class); - subMonitor.split(1); - ITargetLocation container = service.newProfileLocation(installLocation, null); - ITargetDefinition definition = service.newTarget(); - subMonitor.subTask(Messages.resolving_target_definition); - container.resolve(definition, subMonitor.split(30)); - subMonitor.split(1); - TargetBundle[] bundles = container.getBundles(); - List components = new ArrayList<>(); - if (bundles.length > 0) { - subMonitor.setWorkRemaining(bundles.length); - for (TargetBundle bundle : bundles) { - subMonitor.split(1); - if (!bundle.isSourceBundle()) { - IApiComponent component = ApiModelFactory.newApiComponent(baseline, URIUtil.toFile(bundle.getBundleInfo().getLocation()).getAbsolutePath()); - if (component != null) { - subMonitor.subTask(NLS.bind(Messages.adding_component__0, component.getSymbolicName())); - components.add(component); - } - } - } - } - result = components.toArray(new IApiComponent[components.size()]); - } else { - // The target platform service is unavailable (OSGi isn't - // running), add components by searching the plug-ins directory - File dir = new File(installLocation); - if (dir.exists()) { - File[] files = dir.listFiles(); - if (files == null) { - return NO_COMPONENTS; - } - List components = new ArrayList<>(); - for (File bundle : files) { - IApiComponent component = ApiModelFactory.newApiComponent(baseline, bundle.getAbsolutePath()); + // Acquire the service + ITargetPlatformService service = null; + ApiPlugin plugin = ApiPlugin.getDefault(); + if (plugin != null) { + service = ApiPlugin.getDefault().acquireService(ITargetPlatformService.class); + subMonitor.split(1); + ITargetLocation container = service.newProfileLocation(installLocation, null); + ITargetDefinition definition = service.newTarget(); + subMonitor.subTask(Messages.resolving_target_definition); + container.resolve(definition, subMonitor.split(30)); + subMonitor.split(1); + TargetBundle[] bundles = container.getBundles(); + List components = new ArrayList<>(); + if (bundles.length > 0) { + subMonitor.setWorkRemaining(bundles.length); + for (TargetBundle bundle : bundles) { + subMonitor.split(1); + if (!bundle.isSourceBundle()) { + IApiComponent component = ApiModelFactory.newApiComponent(baseline, URIUtil.toFile(bundle.getBundleInfo().getLocation()).getAbsolutePath()); if (component != null) { + subMonitor.subTask(NLS.bind(Messages.adding_component__0, component.getSymbolicName())); components.add(component); } } - result = components.toArray(new IApiComponent[components.size()]); } } - if (result != null) { - baseline.addApiComponents(result); - return result; + result = components.toArray(new IApiComponent[components.size()]); + } else { + // The target platform service is unavailable (OSGi isn't + // running), add components by searching the plug-ins directory + File dir = new File(installLocation); + if (dir.exists()) { + File[] files = dir.listFiles(); + if (files == null) { + return NO_COMPONENTS; + } + List components = new ArrayList<>(); + for (File bundle : files) { + IApiComponent component = ApiModelFactory.newApiComponent(baseline, bundle.getAbsolutePath()); + if (component != null) { + components.add(component); + } + } + result = components.toArray(new IApiComponent[components.size()]); } - return NO_COMPONENTS; - } finally { - subMonitor.done(); } + if (result != null) { + baseline.addApiComponents(result); + return result; + } + return NO_COMPONENTS; } public static IApiBaseline newApiBaselineFromTarget(String name, ITargetDefinition definition, IProgressMonitor monitor) throws CoreException { IApiBaseline baseline = new ApiBaseline(name); SubMonitor subMonitor = SubMonitor.convert(monitor, Messages.configuring_baseline, 50); - try { - IStatus result = definition.resolve(subMonitor.split(30)); - if (!result.isOK()) { - throw new CoreException(result); - } - subMonitor.split(1); - TargetBundle[] bundles = definition.getBundles(); - List components = new ArrayList<>(); - if (bundles.length > 0) { - subMonitor.setWorkRemaining(bundles.length); - for (TargetBundle bundle : bundles) { - subMonitor.split(1); - if (!bundle.isSourceBundle()) { - IApiComponent component = ApiModelFactory.newApiComponent(baseline, URIUtil.toFile(bundle.getBundleInfo().getLocation()).getAbsolutePath()); - if (component != null) { - subMonitor.subTask(NLS.bind(Messages.adding_component__0, component.getSymbolicName())); - components.add(component); - } + IStatus result = definition.resolve(subMonitor.split(30)); + if (!result.isOK()) { + throw new CoreException(result); + } + subMonitor.split(1); + TargetBundle[] bundles = definition.getBundles(); + List components = new ArrayList<>(); + if (bundles.length > 0) { + subMonitor.setWorkRemaining(bundles.length); + for (TargetBundle bundle : bundles) { + subMonitor.split(1); + if (!bundle.isSourceBundle()) { + IApiComponent component = ApiModelFactory.newApiComponent(baseline, URIUtil.toFile(bundle.getBundleInfo().getLocation()).getAbsolutePath()); + if (component != null) { + subMonitor.subTask(NLS.bind(Messages.adding_component__0, component.getSymbolicName())); + components.add(component); } } } - baseline.addApiComponents(components.toArray(new IApiComponent[components.size()])); - baseline.setLocation(generateTargetLocation(definition)); - return baseline; - } finally { - subMonitor.done(); } + baseline.addApiComponents(components.toArray(new IApiComponent[components.size()])); + baseline.setLocation(generateTargetLocation(definition)); + return baseline; } /** diff --git a/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/RefreshFileJob.java b/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/RefreshFileJob.java index a2dd4a4d198..36271bb9270 100644 --- a/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/RefreshFileJob.java +++ b/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/RefreshFileJob.java @@ -55,7 +55,6 @@ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { progress.worked(1); } } - progress.done(); return Status.OK_STATUS; } } diff --git a/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/wizards/AddFilesToRepositoryWizard.java b/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/wizards/AddFilesToRepositoryWizard.java index 057c7a05282..cf73840cc16 100644 --- a/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/wizards/AddFilesToRepositoryWizard.java +++ b/ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/wizards/AddFilesToRepositoryWizard.java @@ -123,7 +123,6 @@ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { if (refreshJob.needsToSchedule()) { refreshJob.schedule(); } - progress.done(); return status; } }; diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/AbstractBundleContainer.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/AbstractBundleContainer.java index 6657688c92d..5b8299fd0fd 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/AbstractBundleContainer.java +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/AbstractBundleContainer.java @@ -104,11 +104,6 @@ public final IStatus resolve(ITargetDefinition definition, IProgressMonitor moni fFeatures = new TargetFeature[0]; fResolutionStatus = e.getStatus(); PDECore.log(e.getStatus()); - } finally { - subMonitor.done(); - if (monitor != null) { - monitor.done(); - } } return fResolutionStatus; } diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java index 691a8d1dd60..1bd9f1f22ec 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java @@ -417,7 +417,6 @@ public IStatus resolve(IProgressMonitor monitor) { } finally { // keep a list of resolved targets with key as handle TargetPlatformHelper.addTargetDefinitionMap(this); - subMonitor.done(); } } diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/CoreUtility.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/CoreUtility.java index 89e3da79fe0..a8218252b82 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/CoreUtility.java +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/CoreUtility.java @@ -142,8 +142,6 @@ public static void deleteContent(File fileToDelete, IProgressMonitor monitor) { } } fileToDelete.delete(); - - subMon.done(); } } diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java index 467a5928547..74e75ceb1fe 100644 --- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java +++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java @@ -584,8 +584,6 @@ protected void clear(ILaunchConfiguration configuration, IProgressMonitor monito if (configuration.getAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, false)) { CoreUtility.deleteContent(getConfigurationDirectory(configuration), subMon.split(25)); } - - subMon.done(); } /** diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java index c039f6669df..bb13eb71a43 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java @@ -33,7 +33,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.IJobChangeListener; import org.eclipse.core.runtime.jobs.Job; @@ -318,15 +317,10 @@ public LoadDefaultTargetJob() { public TargetDefinition defaultTarget; @Override public IStatus run(IProgressMonitor monitor) { - SubMonitor subMon = SubMonitor.convert(monitor); ITargetPlatformService service = getTargetService(); if (service != null) { defaultTarget = (TargetDefinition) service.newDefaultTarget(); } - subMon.done(); - if (monitor != null) { - monitor.done(); - } return Status.OK_STATUS; } } diff --git a/ui/org.eclipse.pde.unittest.junit/src/org/eclipse/pde/unittest/junit/launcher/JUnitPluginLaunchConfigurationDelegate.java b/ui/org.eclipse.pde.unittest.junit/src/org/eclipse/pde/unittest/junit/launcher/JUnitPluginLaunchConfigurationDelegate.java index 40dd6cd76a2..ad2fdf7d4b1 100644 --- a/ui/org.eclipse.pde.unittest.junit/src/org/eclipse/pde/unittest/junit/launcher/JUnitPluginLaunchConfigurationDelegate.java +++ b/ui/org.eclipse.pde.unittest.junit/src/org/eclipse/pde/unittest/junit/launcher/JUnitPluginLaunchConfigurationDelegate.java @@ -1208,8 +1208,6 @@ protected void clear(ILaunchConfiguration configuration, IProgressMonitor monito if (configuration.getAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, false)) { CoreUtility.deleteContent(getConfigurationDirectory(configuration), subMon.split(25)); } - - subMon.done(); } /**