You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by ho...@apache.org on 2004/05/12 00:59:52 UTC
cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv JstlCoreTLV.java JstlXmlTLV.java
horwat 2004/05/11 15:59:52
Modified: standard/src/org/apache/taglibs/standard/tlv
JstlCoreTLV.java JstlXmlTLV.java
Log:
Bugzilla #16773
- Substituted static values where Boolean objects were created.
- Minor code cleanup of unused private fields and methods.
Revision Changes Path
1.24 +4 -13 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
Index: JstlCoreTLV.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv/JstlCoreTLV.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JstlCoreTLV.java 28 Feb 2004 01:01:47 -0000 1.23
+++ JstlCoreTLV.java 11 May 2004 22:59:52 -0000 1.24
@@ -80,7 +80,6 @@
private final String TEXT = "text";
// attribute names
- private final String EVAL = "evaluator";
private final String VALUE = "value";
private final String DEFAULT = "default";
private final String VAR_READER = "varReader";
@@ -171,7 +170,7 @@
// mark <choose> for the first the first <when>
if (isCoreTag(ns, ln, WHEN)) {
chooseHasWhen.pop();
- chooseHasWhen.push(new Boolean(true));
+ chooseHasWhen.push(Boolean.TRUE);
}
// ensure <choose> has the right children
@@ -187,7 +186,7 @@
}
if (isCoreTag(ns, ln, OTHERWISE)) {
chooseHasOtherwise.pop();
- chooseHasOtherwise.push(new Boolean(true));
+ chooseHasOtherwise.push(Boolean.TRUE);
}
}
@@ -216,8 +215,8 @@
// we're a choose, so record new choose-specific state
if (isCoreTag(ns, ln, CHOOSE)) {
chooseDepths.push(new Integer(depth));
- chooseHasWhen.push(new Boolean(false));
- chooseHasOtherwise.push(new Boolean(false));
+ chooseHasWhen.push(Boolean.FALSE);
+ chooseHasOtherwise.push(Boolean.FALSE);
}
// if we're introducing a URL-related tag, record it
@@ -323,13 +322,5 @@
&& (depth - 1) == ((Integer) chooseDepths.peek()).intValue());
}
- // returns the top int depth (peeked at) from a Stack of Integer
- private int topDepth(Stack s) {
- if (s == null || s.empty())
- return -1;
- else
- return ((Integer) s.peek()).intValue();
- }
-
}
}
1.18 +4 -5 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
Index: JstlXmlTLV.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv/JstlXmlTLV.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JstlXmlTLV.java 28 Feb 2004 01:01:47 -0000 1.17
+++ JstlXmlTLV.java 11 May 2004 22:59:52 -0000 1.18
@@ -80,7 +80,6 @@
private final String JSP_TEXT = "jsp:text";
// attribute names
- private final String EVAL = "evaluator";
private final String VALUE = "value";
private final String SOURCE = "xml";
@@ -166,7 +165,7 @@
// mark <choose> for the first the first <when>
if (isXmlTag(ns, ln, WHEN)) {
chooseHasWhen.pop();
- chooseHasWhen.push(new Boolean(true));
+ chooseHasWhen.push(Boolean.TRUE);
}
// ensure <choose> has the right children
@@ -182,7 +181,7 @@
}
if (isXmlTag(ns, ln, OTHERWISE)) {
chooseHasOtherwise.pop();
- chooseHasOtherwise.push(new Boolean(true));
+ chooseHasOtherwise.push(Boolean.TRUE);
}
}
@@ -204,8 +203,8 @@
// we're a choose, so record new choose-specific state
if (isXmlTag(ns, ln, CHOOSE)) {
chooseDepths.push(new Integer(depth));
- chooseHasWhen.push(new Boolean(false));
- chooseHasOtherwise.push(new Boolean(false));
+ chooseHasWhen.push(Boolean.FALSE);
+ chooseHasOtherwise.push(Boolean.FALSE);
}
// set up a check against illegal attribute/body combinations
---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org