Author: markt
Date: Mon Aug 30 18:17:41 2010
New Revision: 990888
URL: http://svn.apache.org/viewvc?rev=990888&view=rev
Log:
Remove some unused code
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=990888&r1=990887&r2=990888&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Mon Aug 30
18:17:41 2010
@@ -255,17 +255,9 @@ public class JspUtil {
boolean mandatory;
- boolean rtexprvalue; // not used now
-
- public ValidAttribute(String name, boolean mandatory,
- boolean rtexprvalue) {
+ public ValidAttribute(String name, boolean mandatory) {
this.name = name;
this.mandatory = mandatory;
- this.rtexprvalue = rtexprvalue;
- }
-
- public ValidAttribute(String name, boolean mandatory) {
- this(name, mandatory, false);
}
public ValidAttribute(String name) {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=990888&r1=990887&r2=990888&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Mon Aug 30
18:17:41 2010
@@ -436,15 +436,15 @@ class Validator {
new JspUtil.ValidAttribute("prefix", true) };
private static final JspUtil.ValidAttribute[] includeActionAttrs = {
- new JspUtil.ValidAttribute("page", true, true),
+ new JspUtil.ValidAttribute("page", true),
new JspUtil.ValidAttribute("flush") };
private static final JspUtil.ValidAttribute[] paramActionAttrs = {
new JspUtil.ValidAttribute("name", true),
- new JspUtil.ValidAttribute("value", true, true) };
+ new JspUtil.ValidAttribute("value", true) };
- private static final JspUtil.ValidAttribute[] forwardActionAttrs = {
new JspUtil.ValidAttribute(
- "page", true, true) };
+ private static final JspUtil.ValidAttribute[] forwardActionAttrs = {
+ new JspUtil.ValidAttribute("page", true) };
private static final JspUtil.ValidAttribute[] getPropertyAttrs = {
new JspUtil.ValidAttribute("name", true),
@@ -453,7 +453,7 @@ class Validator {
private static final JspUtil.ValidAttribute[] setPropertyAttrs = {
new JspUtil.ValidAttribute("name", true),
new JspUtil.ValidAttribute("property", true),
- new JspUtil.ValidAttribute("value", false, true),
+ new JspUtil.ValidAttribute("value", false),
new JspUtil.ValidAttribute("param") };
private static final JspUtil.ValidAttribute[] useBeanAttrs = {
@@ -461,7 +461,7 @@ class Validator {
new JspUtil.ValidAttribute("scope"),
new JspUtil.ValidAttribute("class"),
new JspUtil.ValidAttribute("type"),
- new JspUtil.ValidAttribute("beanName", false, true) };
+ new JspUtil.ValidAttribute("beanName", false) };
private static final JspUtil.ValidAttribute[] plugInAttrs = {
new JspUtil.ValidAttribute("type", true),
@@ -469,12 +469,12 @@ class Validator {
new JspUtil.ValidAttribute("codebase"),
new JspUtil.ValidAttribute("align"),
new JspUtil.ValidAttribute("archive"),
- new JspUtil.ValidAttribute("height", false, true),
+ new JspUtil.ValidAttribute("height", false),
new JspUtil.ValidAttribute("hspace"),
new JspUtil.ValidAttribute("jreversion"),
new JspUtil.ValidAttribute("name"),
new JspUtil.ValidAttribute("vspace"),
- new JspUtil.ValidAttribute("width", false, true),
+ new JspUtil.ValidAttribute("width", false),
new JspUtil.ValidAttribute("nspluginurl"),
new JspUtil.ValidAttribute("iepluginurl") };
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
