Attachment 99536 Details for Bug 231178 – patch

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

[patch] patch

231178.txt (text/plain), 2.65 KB, created by DJ Houghton

on 2008-05-09 14:55:14 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: DJ Houghton

Created: 2008-05-09 14:55:14 EDT

Size: 2.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.extensionlocation
>Index: src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java,v
>retrieving revision 1.5
>diff -u -r1.5 SiteListener.java
>--- src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java	8 May 2008 15:24:41 -0000	1.5
>+++ src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java	9 May 2008 18:51:48 -0000
>@@ -14,7 +14,8 @@
> import java.net.MalformedURLException;
> import java.net.URL;
> import java.util.*;
>-import org.eclipse.core.runtime.*;
>+import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Status;
> import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
> import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
> import org.eclipse.equinox.internal.p2.metadata.generator.features.FeatureParser;
>@@ -179,8 +180,6 @@
> 			String line = (String) e.nextElement();
> 			StringTokenizer tokenizer = new StringTokenizer(line, ";"); //$NON-NLS-1$
> 			String targetSite = tokenizer.nextToken();
>-			if (targetSite.startsWith("file:") && new Path(targetSite).lastSegment().equals("eclipse")) //$NON-NLS-1$//$NON-NLS-2$
>-				targetSite = targetSite.substring(0, targetSite.length() - 8);
> 			if (!url.equals(targetSite))
> 				continue;
> 			result.add(tokenizer.nextToken());
>#P org.eclipse.equinox.p2.reconciler.dropins
>Index: src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java,v
>retrieving revision 1.16
>diff -u -r1.16 PlatformXmlListener.java
>--- src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java	8 May 2008 15:24:39 -0000	1.16
>+++ src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java	9 May 2008 18:51:49 -0000
>@@ -155,8 +155,6 @@
> 		for (Iterator iter = sites.iterator(); iter.hasNext();) {
> 			Site site = (Site) iter.next();
> 			String siteURL = site.getUrl();
>-			if (siteURL.startsWith("file:") && new Path(siteURL).lastSegment().equals("eclipse")) //$NON-NLS-1$ //$NON-NLS-2$
>-				siteURL = siteURL.substring(0, siteURL.length() - 8);
> 			IMetadataRepository match = getMatchingRepo(configRepositories, siteURL);
> 			if (match == null) {
> 				try {

Actions: View | Diff

Attachments on bug 231178: 99536