husted 2004/04/28 16:12:12
Modified: src/share/org/apache/struts/taglib TagUtils.java
LocalStrings_ja.properties LocalStrings.properties
Log:
Apply #28671 "RequestUtils.lookup() / TagUtils.lookup()" submitted by Sascha Gro.
Still could use a Japanese translation of the error message.
Revision Changes Path
1.35 +9 -4 jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java
Index: TagUtils.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- TagUtils.java 24 Apr 2004 06:37:00 -0000 1.34
+++ TagUtils.java 28 Apr 2004 23:12:12 -0000 1.35
@@ -1012,6 +1012,11 @@
throw new JspException(
messages.getMessage("lookup.access", property, name));
+ } catch (IllegalArgumentException e) {
+ saveException(pageContext, e);
+ throw new JspException(
+ messages.getMessage("lookup.argument", property, name));
+
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
if (t == null) {
1.2 +1 -0
jakarta-struts/src/share/org/apache/struts/taglib/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/LocalStrings_ja.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalStrings_ja.properties 28 Feb 2004 01:26:38 -0000 1.1
+++ LocalStrings_ja.properties 28 Apr 2004 23:12:12 -0000 1.2
@@ -3,6 +3,7 @@
computeURL.forward={0}\u3068\u3044\u3046\u540D\u524D\u306EActionForward\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
computeURL.specifier="forward", "href","page","action"
\u306E\u3046\u3061\u306E\u4E00\u3064\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
lookup.access=Bean {1} \u306E \u30D7\u30ED\u30D1\u30C6\u30A3{0}
\u306B\u5BFE\u3059\u308B\u53C2\u7167\u306F\u4E0D\u6B63\u306A\u30A2\u30AF\u30BB\u30B9\u3067\u3059
+lookup.argument=Bean {1} \u306E \u30D7\u30ED\u30D1\u30C6\u30A3{0}
\u306B\u5BFE\u3059\u308B\u53C2\u7167\u306F\u4E0D\u6B63\u306A\u30A2\u30AF\u30BB\u30B9\u3067\u3059
lookup.bean.any=\u3069\u306E\u30B9\u30B3\u30FC\u30D7\u306B\u3082Bean {0}
\u304C\u3042\u308A\u307E\u305B\u3093
lookup.bean=\u30B9\u30B3\u30FC\u30D7 {1} \u306BBean {0}
\u304C\u3042\u308A\u307E\u305B\u3093
lookup.method=Bean {1} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3 {0}
\u306B\u5BFE\u3059\u308B\u30B2\u30C3\u30BF\u30FC\u30E1\u30BD\u30C3\u30C9\u304C\u3042\u308A\u307E\u305B\u3093
1.15 +1 -0
jakarta-struts/src/share/org/apache/struts/taglib/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/LocalStrings.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LocalStrings.properties 9 Sep 2003 03:44:42 -0000 1.14
+++ LocalStrings.properties 28 Apr 2004 23:12:12 -0000 1.15
@@ -3,6 +3,7 @@
computeURL.forward=Cannot retrieve ActionForward named {0}
computeURL.specifier=You must specify exactly one of "forward", "href", "page" or
"action"
lookup.access=Invalid access looking up property {0} of bean {1}
+lookup.argument=Invalid argument looking up property {0} of bean {1}
lookup.bean.any=Cannot find bean {0} in any scope
lookup.bean=Cannot find bean {0} in scope {1}
lookup.method=No getter method for property {0} of bean {1}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
