summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSalvador Zalapa2013-04-25 10:21:43 (EDT)
committer Nick Sandonato2013-04-30 14:23:11 (EDT)
commit3f48fda05f529502a4813172e8eca72255de46e2 (patch)
treea12edf075ffac91dc850f763a9915f8ae95dca94
parent6983cd29f17b654791786f248ed81b2ffcd57e19 (diff)
downloadwebtools.sourceediting-3f48fda05f529502a4813172e8eca72255de46e2.zip
webtools.sourceediting-3f48fda05f529502a4813172e8eca72255de46e2.tar.gz
webtools.sourceediting-3f48fda05f529502a4813172e8eca72255de46e2.tar.bz2
[405307] tags files display 'pageContext cannot be resolved' errors when they are openedv201304301825
-rw-r--r--bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java10
-rw-r--r--bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibVariable.java6
2 files changed, 10 insertions, 6 deletions
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java
index c192067..9b9e9f2 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2013 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
@@ -934,7 +934,7 @@ public class JSPTranslator implements Externalizable {
appendToBuffer(text.toString(), fUserCode, false, customTag);
for (int i = 0; i < taglibVars.length; i++) {
if (taglibVars[i].getScope() == VariableInfo.AT_END) {
- decl = taglibVars[i].getDeclarationString();
+ decl = taglibVars[i].getDeclarationString(fContext);
appendToBuffer(decl, fUserCode, true, customTag);
}
}
@@ -965,7 +965,7 @@ public class JSPTranslator implements Externalizable {
*/
for (int i = 0; i < taglibVars.length; i++) {
if (taglibVars[i].getScope() == VariableInfo.AT_BEGIN) {
- decl = taglibVars[i].getDeclarationString();
+ decl = taglibVars[i].getDeclarationString(fContext);
appendToBuffer(decl, fUserCode, true, customTag);
}
}
@@ -993,7 +993,7 @@ public class JSPTranslator implements Externalizable {
for (int i = 0; i < taglibVars.length; i++) {
if (taglibVars[i].getScope() == VariableInfo.NESTED) {
- decl = taglibVars[i].getDeclarationString();
+ decl = taglibVars[i].getDeclarationString(fContext);
appendToBuffer(decl, fUserCode, true, customTag);
}
}
@@ -1009,7 +1009,7 @@ public class JSPTranslator implements Externalizable {
/* 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();
+ decl = taglibVars[i].getDeclarationString(fContext);
appendToBuffer(decl, fUserCode, false, customTag);
}
}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibVariable.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibVariable.java
index d6326d0..1d811f9 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibVariable.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibVariable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2013 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
@@ -111,6 +111,10 @@ public class TaglibVariable {
return getDeclarationString(includeDoc, "pageContext", style); //$NON-NLS-1$
}
+ public final String getDeclarationString(String context) {
+ return getDeclarationString(false, context, M_NONE);
+ }
+
public final String getDeclarationString(boolean includeDoc, String context, int style) {
String declaration = null;
/*