Attachment 55699 Details for Bug 167016 – new patch

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

[patch] new patch

167016.patch3 (text/plain), 3.05 KB, created by Branko Tripkovic

on 2006-12-14 14:40:07 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Branko Tripkovic

Created: 2006-12-14 14:40:07 EST

Size: 3.05 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.33
>diff -u -r1.33 UpdateUtils.java
>--- src/org/eclipse/update/internal/operations/UpdateUtils.java	2 Jun 2006 00:01:33 -0000	1.33
>+++ src/org/eclipse/update/internal/operations/UpdateUtils.java	14 Dec 2006 19:34:20 -0000
>@@ -400,6 +400,7 @@
> 			category.setFeatures(features);
> 		UpdateSearchRequest searchRequest = new UpdateSearchRequest(category, scope);
> 		searchRequest.addFilter(new EnvironmentFilter());
>+		searchRequest.addFilter(new BackLevelFilter());
> 		return searchRequest;
> 	}
> 
>Index: src/org/eclipse/update/search/BackLevelFilter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/search/BackLevelFilter.java,v
>retrieving revision 1.7
>diff -u -r1.7 BackLevelFilter.java
>--- src/org/eclipse/update/search/BackLevelFilter.java	1 Mar 2005 20:29:16 -0000	1.7
>+++ src/org/eclipse/update/search/BackLevelFilter.java	14 Dec 2006 19:34:20 -0000
>@@ -30,7 +30,26 @@
>  * @since 3.0
>  */
> public class BackLevelFilter extends BaseFilter {
>-	public boolean accept(IFeatureReference match) {
>+	
>+	public boolean accept(IFeature match) {
>+		
>+			PluginVersionIdentifier matchVid = match.getVersionedIdentifier().getVersion();
>+			IFeature [] installed = UpdateUtils.getInstalledFeatures(match.getVersionedIdentifier(), false);
>+			if (installed.length==0) return true;
>+			
>+			for (int i=0; i<installed.length; i++) {
>+				PluginVersionIdentifier ivid = installed[i].getVersionedIdentifier().getVersion();
>+				if (matchVid.isGreaterThan(ivid))
>+					continue;
>+				// installed version is the same or newer than
>+				// the match - filter out
>+				return false;
>+			}
>+			return true;
>+		
>+	}
>+	
>+	public boolean accept(IFeatureReference match) {		
> 		try {
> 			PluginVersionIdentifier matchVid = match.getVersionedIdentifier().getVersion();
> 			IFeature [] installed = UpdateUtils.getInstalledFeatures(match.getVersionedIdentifier(), false);
>Index: src/org/eclipse/update/search/EnvironmentFilter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/search/EnvironmentFilter.java,v
>retrieving revision 1.8
>diff -u -r1.8 EnvironmentFilter.java
>--- src/org/eclipse/update/search/EnvironmentFilter.java	1 Mar 2005 20:29:16 -0000	1.8
>+++ src/org/eclipse/update/search/EnvironmentFilter.java	14 Dec 2006 19:34:20 -0000
>@@ -29,6 +29,11 @@
>  * @since 3.0
>  */
> public class EnvironmentFilter extends BaseFilter {
>+	
>+	public boolean accept(IFeature match) {
>+		return UpdateManagerUtils.isValidEnvironment(match);
>+	}
>+	
> 	public boolean accept(IFeatureReference match) {
> 		return UpdateManagerUtils.isValidEnvironment(match);
> 	}

Actions: View | Diff

Attachments on bug 167016: 55622 | 55699