Attachment 67538 Details for Bug 132450 – The proposed patch

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

[patch] The proposed patch

132450.txt (text/plain), 4.91 KB, created by Dejan Glozic

on 2007-05-16 18:06:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dejan Glozic

Created: 2007-05-16 18:06:43 EDT

Size: 4.91 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.update.core
>Index: src/org/eclipse/update/internal/operations/UpdateUtils.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/operations/UpdateUtils.java,v
>retrieving revision 1.35
>diff -u -r1.35 UpdateUtils.java
>--- src/org/eclipse/update/internal/operations/UpdateUtils.java	12 Apr 2007 22:27:48 -0000	1.35
>+++ src/org/eclipse/update/internal/operations/UpdateUtils.java	16 May 2007 21:56:54 -0000
>@@ -393,9 +393,13 @@
> //	}
> 	
> 	public static UpdateSearchRequest createNewUpdatesRequest(IFeature [] features) {
>+		return createNewUpdatesRequest(features, true);
>+	}
>+	
>+	public static UpdateSearchRequest createNewUpdatesRequest(IFeature [] features, boolean automatic) {
> 		UpdateSearchScope scope = new UpdateSearchScope();
> 		scope.setUpdateMapURL(UpdateUtils.getUpdateMapURL());
>-		UpdatesSearchCategory category = new UpdatesSearchCategory();
>+		UpdatesSearchCategory category = new UpdatesSearchCategory(automatic);
> 		if (features!=null)
> 			category.setFeatures(features);
> 		UpdateSearchRequest searchRequest = new UpdateSearchRequest(category, scope);
>Index: src/org/eclipse/update/internal/search/UpdatesSearchCategory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java,v
>retrieving revision 1.28
>diff -u -r1.28 UpdatesSearchCategory.java
>--- src/org/eclipse/update/internal/search/UpdatesSearchCategory.java	22 Mar 2007 20:01:17 -0000	1.28
>+++ src/org/eclipse/update/internal/search/UpdatesSearchCategory.java	16 May 2007 21:56:54 -0000
>@@ -43,6 +43,7 @@
> 	private static final String CATEGORY_ID =
> 		"org.eclipse.update.core.new-updates"; //$NON-NLS-1$
> 	private IFeature [] features;
>+	private boolean automatic;
> 
> 	class Candidate {
> 		ArrayList children;
>@@ -316,7 +317,12 @@
> 	private ArrayList candidates;
> 
> 	public UpdatesSearchCategory() {
>+		this(true);
>+	}
>+	
>+	public UpdatesSearchCategory(boolean automatic) {
> 		super(CATEGORY_ID);
>+		this.automatic = automatic;
> 	}
> 
> 	private void collectValidHits(
>@@ -335,12 +341,18 @@
> 				UpdateCore.log(job.getFeature().getVersionedIdentifier() + ": " + Messages.DefaultFeatureParser_NoLicenseText, null);  //$NON-NLS-1$
> 				continue;
> 			}
>-			IStatus status;
>-			if( hit.getPatchedJob()==null){
>-				status = OperationsManager.getValidator().validatePendingInstall(job.getOldFeature(), job.getFeature());
>-			}else{
>-				status = OperationsManager.getValidator().validatePendingChanges(new IInstallFeatureOperation[]{hit.getPatchedJob(), job});
>-						
>+			IStatus status = null;
>+			
>+			// Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=132450
>+			// Only validate for automatic updates because
>+			// non-automatic once will arrive in the review wizard
>+			// where additional validation will be performed
>+			if (automatic) {
>+				if( hit.getPatchedJob()==null){
>+					status = OperationsManager.getValidator().validatePendingInstall(job.getOldFeature(), job.getFeature());
>+				}else{
>+					status = OperationsManager.getValidator().validatePendingChanges(new IInstallFeatureOperation[]{hit.getPatchedJob(), job});
>+				}
> 			}
> 			if (status == null || status.getCode() == IStatus.WARNING) {
> 				if (hit.isPatch()) {
>#P org.eclipse.update.ui
>Index: src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java,v
>retrieving revision 1.19
>diff -u -r1.19 ModeSelectionPage.java
>--- src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java	18 May 2005 23:14:24 -0000	1.19
>+++ src/org/eclipse/update/internal/ui/wizards/ModeSelectionPage.java	16 May 2007 21:56:56 -0000
>@@ -59,7 +59,7 @@
> 
> 	private void initializeSearch() {
> 		if (searchRequest!=null) return;
>-		searchRequest = UpdateUtils.createNewUpdatesRequest(null);
>+		searchRequest = UpdateUtils.createNewUpdatesRequest(null, false);
> 	}
> 
> 	/* (non-Javadoc)
>Index: src/org/eclipse/update/ui/UpdateJob.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.ui/src/org/eclipse/update/ui/UpdateJob.java,v
>retrieving revision 1.12
>diff -u -r1.12 UpdateJob.java
>--- src/org/eclipse/update/ui/UpdateJob.java	20 Apr 2006 17:47:37 -0000	1.12
>+++ src/org/eclipse/update/ui/UpdateJob.java	16 May 2007 21:56:56 -0000
>@@ -115,7 +115,7 @@
> 		this.isAutomatic = isAutomatic;
> 		this.download = download;
> 		updates = new ArrayList();
>-		searchRequest = UpdateUtils.createNewUpdatesRequest(features);
>+		searchRequest = UpdateUtils.createNewUpdatesRequest(features, isAutomatic);
> 		setPriority(Job.DECORATE);
> 		mirrorIndex = 0;
> 	}

Flags:

dejan: review?

Actions: View | Diff

Attachments on bug 132450: 36556 | 36557 | 36558 | 67538 | 67539 | 67540 | 98311