Attachment 157964 Details for Bug 301598 – patch

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

[patch] patch

jsp.custom_tags_in_attributeregions.patch (text/plain), 10.97 KB, created by Nick Sandonato

on 2010-02-02 15:59:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Sandonato

Created: 2010-02-02 15:59:42 EST

Size: 10.97 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jsp.core
>Index: src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java,v
>retrieving revision 1.79.2.7.6.3
>diff -u -r1.79.2.7.6.3 JSPTranslator.java
>--- src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java	22 Jan 2010 07:13:58 -0000	1.79.2.7.6.3
>+++ src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java	2 Feb 2010 20:58:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2009 IBM Corporation and others.
>+ * Copyright (c) 2004, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -116,6 +116,8 @@
> 
> 	public static final String ENDL = "\n"; //$NON-NLS-1$
> 
>+	private static final String JSP_PREFIX = "jsp:"; //$NON-NLS-1$
>+
> 	String fClassHeader = null;
> 	String fClassname = null;
> 
>@@ -820,129 +822,166 @@
> 	}
> 
> 	protected void addTaglibVariables(String tagToAdd, ITextRegionCollection customTag) {
>-		IFile f = getFile();
>-
>-		if (f == null || !f.exists())
>-			return;
>-
>-		TaglibHelper helper = TaglibHelperManager.getInstance().getTaglibHelper(f);
> 		/*
> 		 * Variables can declare as available when NESTED, AT_BEGIN, or
> 		 * AT_END. For AT_END variables, store the entire list of variables in
> 		 * the map field so it can be used on the end tag.
> 		 */
>-		String decl = ""; //$NON-NLS-1$
> 		if (customTag.getFirstRegion().getType().equals(DOMRegionContext.XML_TAG_OPEN)) {
> 			/*
> 			 * Start tag
> 			 */
>-			List problems = new ArrayList();
>-			CustomTag tag = helper.getCustomTag(tagToAdd, getStructuredDocument(), customTag, problems);
>-			TaglibVariable[] taglibVars = tag.getTagVariables();
>-			fTranslationProblems.addAll(problems);
>-			// Bug 199047
>-			/*
>-			 * Add AT_BEGIN variables
>-			 */
>-			for (int i = 0; i < taglibVars.length; i++) {
>-				if (taglibVars[i].getScope() == VariableInfo.AT_BEGIN) {
>-					decl = taglibVars[i].getDeclarationString();
>-					appendToBuffer(decl, fUserCode, false, customTag);
>-				}
>-			}
>-
>-			boolean isEmptyTag = customTag.getLastRegion().getType().equals(DOMRegionContext.XML_EMPTY_TAG_CLOSE);
>+			addStartTagVariable(tagToAdd, customTag);
>+		}
>+		/**
>+		 * Pop from stack, add ending curly brace and AT_END variables
>+		 */
>+		else if (customTag.getFirstRegion().getType().equals(DOMRegionContext.XML_END_TAG_OPEN)) {
>+			addEndTagVariable(tagToAdd, customTag);
>+		}
>+	}
> 
>-			/**
>-			 * Add opening curly brace
>-			 */
>+	private void addEndTagVariable(String tagToAdd, ITextRegionCollection customTag){
>+		IFile f = getFile();
>+		if (f == null || !f.exists())
>+			return;
>+		String decl = ""; //$NON-NLS-1$
>+		RegionTag regionTag = (RegionTag) fTagToVariableMap.pop(tagToAdd);
>+		if (regionTag != null) {
>+			TaglibVariable[] taglibVars = regionTag.tag.getTagVariables();
>+			// even an empty array will indicate a need for a closing
>+			// brace
> 			StringBuffer text = new StringBuffer();
>-			if (!isEmptyTag && tag.isIterationTag() && tag.getTagClassName() != null)
>-				text.append("\nwhile (true) "); //$NON-NLS-1$
>-			text.append("{ // <"); //$NON-NLS-1$
>+			if (regionTag.tag.isIterationTag())
>+				doAfterBody(text, regionTag);
>+			text.append("} // </"); //$NON-NLS-1$
> 			text.append(tagToAdd);
>-			if (isEmptyTag)
>-				text.append("/>\n"); //$NON-NLS-1$
>-			else
>-				text.append(">\n"); //$NON-NLS-1$
>-
>+			text.append(">\n"); //$NON-NLS-1$
> 			appendToBuffer(text.toString(), fUserCode, false, customTag); //$NON-NLS-1$
> 
>-			/**
>-			 * Add NESTED variables
>+			/*
>+			 * Add AT_END variables
> 			 */
> 			for (int i = 0; i < taglibVars.length; i++) {
>-				if (taglibVars[i].getScope() == VariableInfo.NESTED) {
>+				if (taglibVars[i].getScope() == VariableInfo.AT_END) {
> 					decl = taglibVars[i].getDeclarationString();
> 					appendToBuffer(decl, fUserCode, false, customTag);
> 				}
> 			}
>+		}
>+		else {
>+			// report an unmatched end tag in fTranslationProblems ?
>+		}
>+	}
>+	
>+	private void addStartTagVariable(String tagToAdd,ITextRegionCollection customTag){
>+		IFile f = getFile();
> 
>-			/**
>-			 * If empty, pop from stack, add ending curly brace and AT_END
>-			 * variables
>-			 */
>-			if (isEmptyTag) {
>-				text = new StringBuffer();
>-				text.append("} // <"); //$NON-NLS-1$
>-				text.append(tagToAdd);
>-				text.append("/>\n"); //$NON-NLS-1$
>-				appendToBuffer(text.toString(), fUserCode, false, customTag); //$NON-NLS-1$
>-				for (int i = 0; i < taglibVars.length; i++) {
>-					if (taglibVars[i].getScope() == VariableInfo.AT_END) {
>-						decl = taglibVars[i].getDeclarationString();
>-						appendToBuffer(decl, fUserCode, false, customTag);
>-					}
>-				}
>+		if (f == null || !f.exists())
>+			return;
>+		TaglibHelper helper = TaglibHelperManager.getInstance().getTaglibHelper(f);
>+		/*
>+		 * Variables can declare as available when NESTED, AT_BEGIN, or
>+		 * AT_END. For AT_END variables, store the entire list of variables in
>+		 * the map field so it can be used on the end tag.
>+		 */
>+		String decl = ""; //$NON-NLS-1$
>+		List problems = new ArrayList();
>+		CustomTag tag = helper.getCustomTag(tagToAdd, getStructuredDocument(), customTag, problems);
>+		TaglibVariable[] taglibVars = tag.getTagVariables();
>+		fTranslationProblems.addAll(problems);
>+		// Bug 199047
>+		/*
>+		 * Add AT_BEGIN variables
>+		 */
>+		for (int i = 0; i < taglibVars.length; i++) {
>+			if (taglibVars[i].getScope() == VariableInfo.AT_BEGIN) {
>+				decl = taglibVars[i].getDeclarationString();
>+				appendToBuffer(decl, fUserCode, false, customTag);
> 			}
>-			else {
>-				/*
>-				 * Store for use at end tag and for accurate pairing even with
>-				 * extra end tags (with empty non-null array)
>-				 */
>-				fTagToVariableMap.push(tagToAdd, new RegionTag(customTag, tag));
>+		}
>+
>+		boolean isEmptyTag = customTag.getLastRegion().getType().equals(DOMRegionContext.XML_EMPTY_TAG_CLOSE);
>+		if (!isEmptyTag){
>+			if (customTag.getLastRegion().getType().equals(DOMRegionContext.WHITE_SPACE)){
>+				int len = customTag.getRegions().size();
>+				if (len >2){
>+					isEmptyTag = customTag.getRegions().get(len-2).getType().equals(DOMRegionContext.XML_EMPTY_TAG_CLOSE);
>+				}
>+				
> 			}
> 		}
>+
> 		/**
>-		 * Pop from stack, add ending curly brace and AT_END variables
>+		 * Add opening curly brace
> 		 */
>-		else if (customTag.getFirstRegion().getType().equals(DOMRegionContext.XML_END_TAG_OPEN)) {
>-			// pop the variables
>-			RegionTag regionTag = (RegionTag) fTagToVariableMap.pop(tagToAdd);
>-			if (regionTag != null) {
>-				TaglibVariable[] taglibVars = regionTag.tag.getTagVariables();
>-				// even an empty array will indicate a need for a closing
>-				// brace
>-				StringBuffer text = new StringBuffer();
>-				if (regionTag.tag.isIterationTag())
>-					doAfterBody(text, regionTag);
>-				text.append("} "); //$NON-NLS-1$
>-				text.append("// </"); //$NON-NLS-1$
>-				text.append(tagToAdd);
>-				if (customTag.getLastRegion().getType().equals(DOMRegionContext.XML_EMPTY_TAG_CLOSE)) {
>-					text.append("/>\n"); //$NON-NLS-1$
>-				}
>-				else {
>-					text.append(">\n"); //$NON-NLS-1$
>-				}
>-				appendToBuffer(text.toString(), fUserCode, false, customTag); //$NON-NLS-1$
>+		StringBuffer text = new StringBuffer();
>+		if (!isEmptyTag && tag.isIterationTag() && tag.getTagClassName() != null)
>+			text.append("\nwhile (true) "); //$NON-NLS-1$
>+		text.append("{ // <"); //$NON-NLS-1$
>+		text.append(tagToAdd);
>+		if (isEmptyTag)
>+			text.append("/>\n"); //$NON-NLS-1$
>+		else
>+			text.append(">\n"); //$NON-NLS-1$
> 
>-				/*
>-				 * Add AT_END variables
>-				 */
>-				for (int i = 0; i < taglibVars.length; i++) {
>-					if (taglibVars[i].getScope() == VariableInfo.AT_END) {
>-						decl = taglibVars[i].getDeclarationString();
>-						appendToBuffer(decl, fUserCode, false, customTag);
>-					}
>-				}
>+		appendToBuffer(text.toString(), fUserCode, false, customTag); //$NON-NLS-1$
>+
>+		/**
>+		 * Add NESTED variables
>+		 */
>+		for (int i = 0; i < taglibVars.length; i++) {
>+			if (taglibVars[i].getScope() == VariableInfo.NESTED) {
>+				decl = taglibVars[i].getDeclarationString();
>+				appendToBuffer(decl, fUserCode, false, customTag);
> 			}
>-			else {
>-				// report an unmatched end tag in fTranslationProblems ?
>+		}
>+
>+		/**
>+		 * If empty, pop from stack, add ending curly brace and AT_END
>+		 * variables
>+		 */
>+		if (isEmptyTag) {
>+			text = new StringBuffer();
>+			text.append("} // <"); //$NON-NLS-1$
>+			text.append(tagToAdd);
>+			text.append("/>\n"); //$NON-NLS-1$
>+			appendToBuffer(text.toString(), fUserCode, false, customTag); //$NON-NLS-1$
>+			/* Treat this as the end for empty tags */
>+			for (int i = 0; i < taglibVars.length; i++) {
>+				if (taglibVars[i].getScope() == VariableInfo.AT_END) {
>+					decl = taglibVars[i].getDeclarationString();
>+					appendToBuffer(decl, fUserCode, false, customTag);
>+				}
> 			}
> 		}
>+		else {
>+			/*
>+			 * Store for use at end tag and for accurate pairing even with
>+			 * extra end tags (with empty non-null array)
>+			 */
>+			fTagToVariableMap.push(tagToAdd, new RegionTag(customTag, tag));
>+		}
>+		
> 	}
>+	
>+	private void addCustomTaglibVariables(String tagToAdd, ITextRegionCollection customTag, ITextRegion prevRegion) {
>+		//Can't judge by first region as start and end tag are part of same ContextRegionContainer		
>+		if (prevRegion != null && prevRegion.getType().equals(DOMRegionContext.XML_END_TAG_OPEN)) {
>+			/*
>+			 * End tag
>+			 */
>+			addEndTagVariable(tagToAdd, customTag);
>+		}
>+		else if (customTag.getFirstRegion().getType().equals(DOMRegionContext.XML_TAG_OPEN)) {
>+			/*
>+			 * Start tag
>+			 */
>+			addStartTagVariable(tagToAdd,customTag);
>+		}
> 
>+	}
>+	
> 	private void doAfterBody(StringBuffer buffer, RegionTag regionTag) {
> 		buffer.append("\tif ( (new "); //$NON-NLS-1$
> 		buffer.append(regionTag.tag.getTagClassName());
>@@ -1711,6 +1750,16 @@
> 			// possible delimiter, check later
> 			delim = embeddedRegions.get(i);
> 			type = delim.getType();
>+			if (type == DOMRegionContext.XML_TAG_NAME )
>+			{
>+				String fullTagName = embeddedContainer.getText(delim);
>+				if (fullTagName.indexOf(':') > -1 && !fullTagName.startsWith(JSP_PREFIX)) {
>+					ITextRegion prevRegion =null;
>+					if (i>0)
>+						prevRegion = embeddedRegions.get(i-1);
>+					addCustomTaglibVariables(fullTagName, embeddedContainer,prevRegion); // it may be a custom tag
>+				}
>+			}
> 			if(type == DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE || type == DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE
> 				|| type == DOMJSPRegionContexts.JSP_TAG_ATTRIBUTE_VALUE_DQUOTE || type == DOMJSPRegionContexts.JSP_TAG_ATTRIBUTE_VALUE_SQUOTE)
> 				quotetype = type;

Actions: View | Diff

Attachments on bug 301598: 157964