svn commit: r568790 - in /struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean: LocalStrings.properties LocalStrings_ja.properties SizeTag.java

[pb...@apache.org]

Author: pbenedict
Date: Wed Aug 22 18:24:02 2007
New Revision: 568790

URL: http://svn.apache.org/viewvc?rev=568790&view=rev
Log:
STR-2779: Better explain why invalid collection (thanks to Ralf Hauser)

Modified:
    struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings.properties
    struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings_ja.properties
    struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTag.java

Modified: struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings.properties
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings.properties?rev=568790&r1=568789&r2=568790&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings.properties (original)
+++ struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings.properties Wed Aug 22 18:24:02 2007
@@ -30,7 +30,7 @@
 page.selector=Invalid page context selector {0}
 parameter.get=No parameter {0} was included in this request
 resource.get=No resource {0} available in this application
-size.collection=No valid collection specified for size tag
+size.collection=No valid collection specified for size tag: {0}
 size.noCollectionOrName=Must specify either a collection or name attribute for size tag
 struts.missing=No Struts internal object named {0} is available
 struts.selector=You must specify exactly one of formBean, forward, or mapping

Modified: struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings_ja.properties?rev=568790&r1=568789&r2=568790&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings_ja.properties (original)
+++ struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings_ja.properties Wed Aug 22 18:24:02 2007
@@ -30,7 +30,7 @@
 page.selector=\u4e0d\u6b63\u306a\u30da\u30fc\u30b8\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30bb\u30ec\u30af\u30bf {0}
 parameter.get=\u30d1\u30e9\u30e1\u30fc\u30bf {0} \u306f\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u5185\u306b\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093
 resource.get=\u30ea\u30bd\u30fc\u30b9 {0} \u306f\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3067\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093
-size.collection=size\u30bf\u30b0\u306b\u5bfe\u3057\u3066\u6709\u52b9\u306a\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+size.collection=size\u30bf\u30b0\u306b\u5bfe\u3057\u3066\u6709\u52b9\u306a\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093: {0}
 size.noCollectionOrName=size\u30bf\u30b0\u306b\u306f\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u304bname\u5c5e\u6027\u306e\u3046\u3061\u3069\u3061\u3089\u304b\u3092\u6b63\u78ba\u306b\u6307\u5b9a\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093
 struts.missing= {0} \u3068\u3044\u3046\u540d\u79f0\u306eStruts\u306e\u5185\u90e8\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093
 struts.selector=formBean\u3001forward\u3001mapping\u306e\u3044\u305a\u308c\u304b\u4e00\u3064\u3092\u6b63\u78ba\u306b\u6307\u5b9a\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093

Modified: struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTag.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTag.java?rev=568790&r1=568789&r2=568790&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTag.java (original)
+++ struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTag.java Wed Aug 22 18:24:02 2007
@@ -147,7 +147,8 @@
 
         if (value == null) {
             JspException e =
-                new JspException(messages.getMessage("size.collection"));
+                new JspException(messages.getMessage("size.collection", 
+                        "value == null"));
 
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;
@@ -159,7 +160,8 @@
             size = ((Map) value).size();
         } else {
             JspException e =
-                new JspException(messages.getMessage("size.collection"));
+                new JspException(messages.getMessage("size.collection", 
+                        value.getClass().getName()));
 
             TagUtils.getInstance().saveException(pageContext, e);
             throw e;