jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sh...@apache.org
Subject cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv JstlCoreTLV.java JstlXmlTLV.java
Date Thu, 07 Feb 2002 18:21:58 GMT
shawn       02/02/07 10:21:58

  Modified:    standard/src/org/apache/taglibs/standard/resources
                        Resources.properties
               standard/src/org/apache/taglibs/standard/tlv
                        JstlCoreTLV.java JstlXmlTLV.java
  Log:
  Fixed two issues Hans raised.
  
  Revision  Changes    Path
  1.11      +9 -9      jakarta-taglibs/standard/src/org/apache/taglibs/standard/resources/Resources.properties
  
  Index: Resources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/resources/Resources.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Resources.properties	4 Feb 2002 02:39:50 -0000	1.10
  +++ Resources.properties	7 Feb 2002 18:21:58 -0000	1.11
  @@ -202,32 +202,32 @@
   # Parameters 
   
   TLV_PARAMETER_ERROR=\
  -    Invalid value for {0} validator parameter in TLD
  +    Invalid value for "{0}" validator parameter in TLD
   
   # Generic errors
   
   TLV_ILLEGAL_BODY=\
  -    Encountered illegal body of <{0}> tag, given its attributes.
  +    Encountered illegal body of tag "{0}" tag, given its attributes.
   
   TLV_MISSING_BODY=\
  -    A body is necessary inside the <{0}> tag, given its attributes.
  +    A body is necessary inside the "{0}" tag, given its attributes.
   
   TLV_ILLEGAL_CHILD_TAG=\
  -    Illegal child tag in <{0}:{1}>: <{2}>.
  +    Illegal child tag in "{0}:{1}" tag: "{2}" tag
   
   TLV_ILLEGAL_TEXT_BODY=\
  -    Illegal text inside <{0}:{1}>: "{2}...".
  +    Illegal text inside "{0}:{1}" tag: "{2}...".
   
   TLV_INVALID_ATTRIBUTE=\
  -    Invalid "{0}" attribute in <{1}> tag: "{2}"
  +    Invalid "{0}" attribute in "{1}" tag: "{2}"
   
   # Errors customized to particular tags (sort of)  :-)
   
   TLV_ILLEGAL_ORDER=\
  -    Illegal <{0}> after <{1}:{2}> in <{1}:{3}>.
  +    Illegal "{0}" after "{1}:{2}" tag in "{1}:{3}" tag.
   
   TLV_ILLEGAL_PARAM=\
  -    Illegal <{0}:{1}> tag within <{0}:{2} {3}="...">.
  +    Illegal "{0}:{1}" tag within "{0}:{2} {3}='...'" tag
   
   TLV_DANGLING_SCOPE=\
  -    Illegal 'scope' attribute without 'var' in <{0}>.
  +    Illegal 'scope' attribute without 'var' in "{0}" tag.
  
  
  
  1.10      +2 -2      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JstlCoreTLV.java	4 Feb 2002 03:17:19 -0000	1.9
  +++ JstlCoreTLV.java	7 Feb 2002 18:21:58 -0000	1.10
  @@ -202,10 +202,10 @@
   	    }
   
               // validate attributes
  -            if (!hasNoInvalidScope(a))
  +            if (qn.startsWith(prefix + ":") && !hasNoInvalidScope(a))
                   fail(Resources.getMessage("TLV_INVALID_ATTRIBUTE",
                       SCOPE, qn, a.getValue(SCOPE))); 
  -	    if (hasDanglingScope(a))
  +	    if (qn.startsWith(prefix + ":") && hasDanglingScope(a))
   		fail(Resources.getMessage("TLV_DANGLING_SCOPE", qn));
   
   	    // check invariants for <choose>
  
  
  
  1.6       +2 -2      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JstlXmlTLV.java	4 Feb 2002 02:39:52 -0000	1.5
  +++ JstlXmlTLV.java	7 Feb 2002 18:21:58 -0000	1.6
  @@ -202,10 +202,10 @@
   	    }
   
               // validate attributes
  -            if (!hasNoInvalidScope(a))
  +            if (qn.startsWith(prefix + ":") && !hasNoInvalidScope(a))
                   fail(Resources.getMessage("TLV_INVALID_ATTRIBUTE",
                       SCOPE, qn, a.getValue(SCOPE)));
  -            if (hasDanglingScope(a))
  +            if (qn.startsWith(prefix + ":") && hasDanglingScope(a))
                   fail(Resources.getMessage("TLV_DANGLING_SCOPE", qn));
   
   	    // check invariants for <choose>
  
  
  

--
To unsubscribe, e-mail:   <mailto:taglibs-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:taglibs-dev-help@jakarta.apache.org>


Mime
View raw message