diff options
| author | Markus Kuppe | 2015-03-16 09:46:01 +0000 |
|---|---|---|
| committer | Vikas Chandra | 2015-03-16 09:46:01 +0000 |
| commit | 8952937e7f3d89ad871dcdb9e139857b2fc5b864 (patch) | |
| tree | 7ba6ae7842dd6af5b0fa094ed0a76971dbc90783 | |
| parent | f6ac669bc1a17c14a0d8b24e5823161ccbf2e5ec (diff) | |
| download | eclipse.pde.ui-8952937e7f3d89ad871dcdb9e139857b2fc5b864.tar.gz eclipse.pde.ui-8952937e7f3d89ad871dcdb9e139857b2fc5b864.tar.xz eclipse.pde.ui-8952937e7f3d89ad871dcdb9e139857b2fc5b864.zip | |
Bug 461549 - [patch] [target] Dont increment sequence number during
reload and provide tooltips for reload and update
Signed-off-by: Markus Kuppe <bugs.eclipse.org@lemmster.de>
| -rw-r--r-- | ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java | 8 | ||||
| -rw-r--r-- | ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java index c7e6fd0280..3103eae94c 100644 --- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java +++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java @@ -218,6 +218,14 @@ public class P2TargetUtils { } } + @SuppressWarnings("restriction") + public static void forceCheckTarget(final ITargetDefinition target) { + final P2TargetUtils result = getSynchronizer(target); + if (result != null && result.fProfile != null && result.fProfile instanceof Profile) { + ((Profile) result.fProfile).setProperty(PROP_SEQUENCE_NUMBER, "-1"); //$NON-NLS-1$ + } + } + /** * Performs garbage collection based on remaining profiles. Should be called to avoid * having PDE's bundle pool area grow unbounded. diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java index fdfa816b85..1309bf6064 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java @@ -557,15 +557,13 @@ public class TargetLocationsGroup { //delete profile try { + // TODO might want to merge forceCheckTarget into delete Profile? + P2TargetUtils.forceCheckTarget(fTarget); P2TargetUtils.deleteProfile(fTarget.getHandle()); } catch (CoreException e) { PDEPlugin.log(e); } - // increase sequence number - if (fTarget instanceof TargetDefinition) - ((TargetDefinition) fTarget).incrementSequenceNumber(); - Job job = new UIJob("Reloading...") { //$NON-NLS-1$ @Override public IStatus runInUIThread(IProgressMonitor monitor) { |