Attachment 25385 Details for Bug 82333 – patch to handle simple /-starting cases

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

[patch] patch to handle simple /-starting cases

TLDCMDocumentManager.patch (text/plain), 1.81 KB, created by Nitin Dahyabhai

on 2005-07-27 18:09:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nitin Dahyabhai

Created: 2005-07-27 18:09:56 EDT

Size: 1.81 KB

patch

obsolete

>Index: TLDCMDocumentManager.java
>===================================================================
>RCS file: /home/webtools/jst/components/jsp/plugins/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contentmodel/tld/TLDCMDocumentManager.java,v
>retrieving revision 1.18
>diff -u -r1.18 TLDCMDocumentManager.java
>--- TLDCMDocumentManager.java	11 Jul 2005 21:28:16 -0000	1.18
>+++ TLDCMDocumentManager.java	27 Jul 2005 22:07:17 -0000
>@@ -250,14 +250,22 @@
> 			}
> 			if (includedFile != null) {
> 				IPath root = TaglibIndex.getContextRoot(getCurrentBaseLocation());
>-				IPath fileLocation = new Path(URIHelper.normalize(StringUtils.strip(includedFile).trim(), getCurrentBaseLocation().toString(), root.toString()));
>+				// strip any extraneous quotes and white space
>+				includedFile = StringUtils.strip(includedFile).trim();
>+				IPath fileLocation = null;
>+				if (includedFile.startsWith("/")) {
>+					fileLocation = root.append(includedFile);
>+				}
>+				else {
>+					fileLocation = new Path(URIHelper.normalize(includedFile, getCurrentBaseLocation().toString(), root.toString()));
>+				}
> 				// check for "loops"
> 				if (!getIncludes().contains(fileLocation) && fileLocation != null && !fileLocation.equals(getCurrentBaseLocation())) {
> 					/*
> 					 * Prevent slow performance when editing scriptlet part of
>-					 * the JSP only process includes if they've been modified.
>-					 * The IncludeHelper remembers any CMDocuments created
>-					 * from the files it parses. Caching the URI and
>+					 * the JSP by only processing includes if they've been
>+					 * modified. The IncludeHelper remembers any CMDocuments
>+					 * created from the files it parses. Caching the URI and
> 					 * prefix/tagdir allows us to just enable the CMDocument
> 					 * when the previously parsed files.
> 					 */

Actions: View | Diff

Attachments on bug 82333: 25385