Attachment 251461 Details for Bug 461549 – Patch for not increasing sequence number by Markus K

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for not increasing sequence number by Markus K

file_441190.txt (text/plain), 1.84 KB, created by Vikas Chandra

on 2015-03-11 07:53:14 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Vikas Chandra

Created: 2015-03-11 07:53:14 EDT

Size: 1.84 KB

patch

obsolete

>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 de96636..d563fce 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 @@
> 		}
> 	}
> 
>+	@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 fdfa816..f2fd83a 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,14 +557,12 @@
> 
> 		//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

Actions: View | Diff

Attachments on bug 461549: 251461