Attachment 25310 Details for Bug 103306 – patch for ComponentResolver

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

[patch] patch for ComponentResolver

ComponentResolver.patch (text/plain), 2.46 KB, created by Nitin Dahyabhai

on 2005-07-26 12:58:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nitin Dahyabhai

Created: 2005-07-26 12:58:23 EDT

Size: 2.46 KB

patch

obsolete

>Index: ComponentResolver.java
>===================================================================
>RCS file: /home/webtools/wst/components/common/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java,v
>retrieving revision 1.4
>diff -u -r1.4 ComponentResolver.java
>--- ComponentResolver.java	23 Jun 2005 03:44:44 -0000	1.4
>+++ ComponentResolver.java	26 Jul 2005 16:54:46 -0000
>@@ -26,7 +26,8 @@
> 
> public class ComponentResolver implements URIResolverExtension {
> 	private static boolean _DEBUG = "true".equals(Platform.getDebugOption("org.eclipse.wst.common.modulecore/ComponentResolver")); //$NON-NLS-1$ //$NON-NLS-2$ 
>-	private static final String FILE_PROTOCOL = "file://"; //$NON-NLS-1$
>+	private static final String FILE_PROTOCOL = "file:///"; //$NON-NLS-1$
>+	private static final String FILE_PROTOCOL2 = "file://"; //$NON-NLS-1$
> 	private static final String ROOT_PATH_STRING = Path.ROOT.toString(); //$NON-NLS-1$
> 
> 	/**
>@@ -46,6 +47,9 @@
> 			if (uri.startsWith(FILE_PROTOCOL)) {
> 				location = uri.substring(FILE_PROTOCOL.length());
> 			}
>+			else if (uri.startsWith(FILE_PROTOCOL2)) {
>+				location = uri.substring(FILE_PROTOCOL2.length());
>+			}
> 			else {
> 				location = uri;
> 			}
>@@ -62,7 +66,7 @@
> 
> 	public String resolve(IFile file, String baseLocation, String publicId, String systemId) {
> 		if (_DEBUG) {
>-			System.out.print("ComponentResolver: resolve \"[" + publicId + "/" + systemId + "]\" from \"" + baseLocation + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
>+			System.out.print("ComponentResolver: resolve \"[{" + publicId + "}{" + systemId + "}]\" from \"" + baseLocation + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
> 		}
> 		/*
> 		 * Check for a system reference; without one, there's no point in
>@@ -113,6 +117,7 @@
> 		}
> 
> 		boolean prependFilePrefix = baseLocation.startsWith(FILE_PROTOCOL) && baseLocation.length() > 7;
>+		boolean prependFilePrefix2 = baseLocation.startsWith(FILE_PROTOCOL2) && baseLocation.length() > 8;
> 
> 		String resolvedPath = null;
> 		IVirtualResource[] virtualResources = ComponentCore.createResources(file);
>@@ -132,6 +137,9 @@
> 					if (prependFilePrefix) {
> 						resolvedPath = FILE_PROTOCOL + resolvedFile.getLocation().toString();
> 					}
>+					else if (prependFilePrefix2) {
>+						resolvedPath = FILE_PROTOCOL2 + resolvedFile.getLocation().toString();
>+					}
> 					else {
> 						resolvedPath = resolvedFile.getLocation().toString();
> 					}

Actions: View | Diff

Attachments on bug 103306: 25033 | 25034 | 25123 | 25287 | 25310 | 25311