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 sh...@apache.org on 2002/04/08 21:15:17 UTC
cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv JstlCoreTLV.java JstlFmtTLV.java JstlSqlTLV.java JstlXmlTLV.java
shawn 02/04/08 12:15:17
Modified: standard/src/org/apache/taglibs/standard/tlv
JstlCoreTLV.java JstlFmtTLV.java JstlSqlTLV.java
JstlXmlTLV.java
Log:
Whitespace in body now satisfies bodyNecessary.
Revision Changes Path
1.15 +2 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JstlCoreTLV.java 31 Mar 2002 05:46:35 -0000 1.14
+++ JstlCoreTLV.java 8 Apr 2002 19:15:17 -0000 1.15
@@ -278,6 +278,8 @@
public void characters(char[] ch, int start, int length) {
+ bodyNecessary = false; // body is no longer necessary!
+
// ignore strings that are just whitespace
String s = new String(ch, start, length).trim();
if (s.equals(""))
@@ -286,7 +288,6 @@
// check and update body-related constraints
if (bodyIllegal)
fail(Resources.getMessage("TLV_ILLEGAL_BODY", lastElementName));
- bodyNecessary = false; // body is no longer necessary!
if (!urlTags.empty()
&& urlTags.peek().equals(IMPORT_WITHOUT_READER)) {
// we're in an <import> without a Reader; nothing but
1.13 +2 -1 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
Index: JstlFmtTLV.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv/JstlFmtTLV.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JstlFmtTLV.java 31 Mar 2002 05:46:35 -0000 1.12
+++ JstlFmtTLV.java 8 Apr 2002 19:15:17 -0000 1.13
@@ -217,6 +217,8 @@
public void characters(char[] ch, int start, int length) {
+ bodyNecessary = false; // body is no longer necessary!
+
// ignore strings that are just whitespace
String s = new String(ch, start, length).trim();
if (s.equals(""))
@@ -226,7 +228,6 @@
if (bodyIllegal)
fail(Resources.getMessage("TLV_ILLEGAL_BODY",
lastElementName));
- bodyNecessary = false; // body is no longer necessary!
}
public void endElement(String ns, String ln, String qn) {
1.2 +2 -1 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
Index: JstlSqlTLV.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv/JstlSqlTLV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JstlSqlTLV.java 2 Apr 2002 17:51:55 -0000 1.1
+++ JstlSqlTLV.java 8 Apr 2002 19:15:17 -0000 1.2
@@ -158,6 +158,8 @@
public void characters(char[] ch, int start, int length) {
+ bodyNecessary = false; // body is no longer necessary!
+
// ignore strings that are just whitespace
String s = new String(ch, start, length).trim();
if (s.equals(""))
@@ -166,7 +168,6 @@
// check and update body-related constraints
if (bodyIllegal)
fail(Resources.getMessage("TLV_ILLEGAL_BODY", lastElementName));
- bodyNecessary = false; // body is no longer necessary!
}
public void endElement(String ns, String ln, String qn) {
1.9 +2 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JstlXmlTLV.java 31 Mar 2002 05:46:35 -0000 1.8
+++ JstlXmlTLV.java 8 Apr 2002 19:15:17 -0000 1.9
@@ -257,6 +257,8 @@
public void characters(char[] ch, int start, int length) {
+ bodyNecessary = false; // body is no longer necessary!
+
// ignore strings that are just whitespace
String s = new String(ch, start, length).trim();
if (s.equals(""))
@@ -265,7 +267,6 @@
// check and update body-related constraints
if (bodyIllegal)
fail(Resources.getMessage("TLV_ILLEGAL_BODY", lastElementName));
- bodyNecessary = false; // body is no longer necessary!
// make sure <choose> has no non-whitespace text
if (chooseChild()) {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>