diff options
author | Lars Vogel | 2016-09-20 08:43:06 +0000 |
---|---|---|
committer | Lars Vogel | 2016-09-26 10:54:10 +0000 |
commit | baabf08ce07d529345b63f343637286ed3aa0931 (patch) | |
tree | bee5fcca0d300f4d5ed823c0d51c1873f7f6c2e3 | |
parent | 19c6d8cfc0ee0a07eb9675a97441ceeda8d97d30 (diff) | |
download | eclipse.pde.ui-baabf08ce07d529345b63f343637286ed3aa0931.tar.gz eclipse.pde.ui-baabf08ce07d529345b63f343637286ed3aa0931.tar.xz eclipse.pde.ui-baabf08ce07d529345b63f343637286ed3aa0931.zip |
Bug 501801 - Use SubMonitor.split in org.eclipse.pde.ui instead ofI20160927-0800
#worked
Change-Id: I36262dbffe76215aae4d225b5b09e5bdd5c19887
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
2 files changed, 12 insertions, 15 deletions
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java index b0593040fd..d6f0d6c795 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java @@ -16,8 +16,7 @@ import org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchShortcut; import org.eclipse.ant.launching.IAntLaunchConstants; import org.eclipse.core.commands.*; import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.*; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.jdt.core.IJavaProject; @@ -97,23 +96,21 @@ public abstract class BaseBuildAction extends AbstractHandler { } private void doBuild(IProgressMonitor monitor) throws CoreException, InvocationTargetException { - monitor.beginTask(PDEUIMessages.BuildAction_Validate, 4); - if (!ensureValid(fManifestFile, monitor)) { - monitor.done(); + + SubMonitor subMonitor = SubMonitor.convert(monitor, PDEUIMessages.BuildAction_Validate, 4); + if (!ensureValid(fManifestFile, subMonitor.split(1))) { + subMonitor.step(3); // consume all remaining work return; } - monitor.worked(1); - monitor.setTaskName(PDEUIMessages.BuildAction_Generate); - makeScripts(monitor); - monitor.worked(1); - monitor.setTaskName(PDEUIMessages.BuildAction_Update); - refreshLocal(monitor); - monitor.worked(1); + subMonitor.setTaskName(PDEUIMessages.BuildAction_Generate); + makeScripts(subMonitor.split(1)); + subMonitor.setTaskName(PDEUIMessages.BuildAction_Update); + refreshLocal(subMonitor.split(1)); IProject project = fManifestFile.getProject(); IFile generatedFile = (IFile) project.findMember("build.xml"); //$NON-NLS-1$ if (generatedFile != null) setDefaultValues(generatedFile); - monitor.worked(1); + subMonitor.step(1); } diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/FindClassResolutionsOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/FindClassResolutionsOperation.java index b43637168a..3ddb6da590 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/FindClassResolutionsOperation.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/java/FindClassResolutionsOperation.java @@ -158,14 +158,14 @@ public class FindClassResolutionsOperation implements IRunnableWithProgress { if (model != null && model.getBundleDescription() != null) { importPkgs = model.getBundleDescription().getImportPackages(); } - subMonitor.worked(1); + subMonitor.step(1); if (importPkgs != null) { if (packageName != null) { if (!isImportedPackage(packageName, importPkgs)) { validPackages = getValidPackages(packageName); } - subMonitor.worked(1); + subMonitor.step(1); } else { // find possible types in the global packages validPackages = findValidPackagesContainingSimpleType(typeName, importPkgs, packagesToExport, subMonitor.split(1)); |