You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by he...@apache.org on 2006/11/14 00:30:19 UTC
svn commit: r474574 - in /struts/struts2/trunk/core/src/main:
java/org/apache/struts2/components/UIBean.java
java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
resources/META-INF/struts-tags.tld
Author: hermanns
Date: Mon Nov 13 15:30:17 2006
New Revision: 474574
URL: http://svn.apache.org/viewvc?view=rev&rev=474574
Log:
UI Tag Shortcuts (key shortcut in place of name, value, and label)
Issue Number: WW-1458
Submitted by: David H. DeWolf
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?view=diff&rev=474574&r1=474573&r2=474574
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Mon Nov 13 15:30:17 2006
@@ -297,6 +297,12 @@
* <td>500</td>
* <td>Tooltip shows up after the specified timeout (miliseconds). A behavior similar to that of OS based tooltips.</td>
* </tr>
+ * <tr>
+ * <td>key</td>
+ * <td>simple</td>
+ * <td>String</td>
+ * <td>The name of the property this input field represents. This will auto populate the name, label, and value</td>
+ * </tr>
* </table>
*
* <!-- END SNIPPET: tooltipattributes -->
@@ -413,6 +419,9 @@
protected String templateDir;
protected String theme;
+ // shortcut, sets label, name, and value
+ protected String key;
+
protected String cssClass;
protected String cssStyle;
protected String disabled;
@@ -447,7 +456,7 @@
// javascript tooltip attribute
protected String tooltip;
protected String tooltipConfig;
-
+
protected String defaultTemplateDir;
protected String defaultUITheme;
protected TemplateEngineManager templateEngineManager;
@@ -456,12 +465,12 @@
public void setDefaultTemplateDir(String dir) {
this.defaultTemplateDir = dir;
}
-
+
@Inject(StrutsConstants.STRUTS_UI_THEME)
public void setDefaultUITheme(String theme) {
this.defaultUITheme = theme;
}
-
+
@Inject
public void setTemplateEngineManager(TemplateEngineManager mgr) {
this.templateEngineManager = mgr;
@@ -580,6 +589,21 @@
String name = null;
+ if (this.key != null) {
+ if(this.name == null) {
+ this.name = key;
+ }
+
+ if(this.label == null) {
+ this.label = "%{getText('"+key +"')}";
+ }
+
+ if(this.value == null) {
+ this.value = "%{"+key +"}";
+ }
+ }
+
+
if (this.name != null) {
name = findString(this.name);
addParameter("name", name);
@@ -1107,5 +1131,13 @@
*/
public void setTooltipConfig(String tooltipConfig) {
this.tooltipConfig = tooltipConfig;
+ }
+
+ /**
+ * Set the key (name, value, label) for this particular component
+ * @s.tagattribute required="false" type="String" default=""
+ */
+ public void setKey(String key) {
+ this.key = key;
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java?view=diff&rev=474574&r1=474573&r2=474574
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java Mon Nov 13 15:30:17 2006
@@ -59,6 +59,8 @@
protected String onchange;
protected String accesskey;
+ protected String key;
+
// tooltip attributes
protected String tooltip;
protected String tooltipConfig;
@@ -100,6 +102,7 @@
uiBean.setTooltip(tooltip);
uiBean.setTooltipConfig(tooltipConfig);
uiBean.setAccesskey(accesskey);
+ uiBean.setKey(key);
}
public void setCssClass(String cssClass) {
@@ -225,4 +228,8 @@
public void setAccesskey(String accesskey) {
this.accesskey = accesskey;
}
+
+ public void setKey(String key) {
+ this.key = key;
+ }
}
Modified: struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld?view=diff&rev=474574&r1=474573&r2=474574
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld (original)
+++ struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld Mon Nov 13 15:30:17 2006
@@ -457,6 +457,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -725,6 +734,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -993,6 +1011,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1389,6 +1416,14 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -1784,6 +1819,14 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2142,6 +2185,14 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2572,6 +2623,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -2848,6 +2908,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -3293,6 +3362,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -3597,6 +3675,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -3958,6 +4045,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -4260,6 +4356,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -4661,6 +4766,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -4946,6 +5060,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -5667,6 +5790,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -5967,6 +6099,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -6551,6 +6692,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -6851,6 +7001,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -7179,6 +7338,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -7586,6 +7754,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -7877,6 +8054,16 @@
<description><![CDATA[The name to set for element]]></description>
</attribute>
+
+ <attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
<attribute>
<name>required</name>
<required>false</required>
@@ -8286,6 +8473,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -8595,6 +8791,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -8888,6 +9093,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -9156,6 +9370,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -9616,6 +9839,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -9972,6 +10204,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -10239,6 +10480,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -10508,6 +10758,15 @@
</attribute>
<attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
+ <attribute>
<name>required</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -10943,6 +11202,16 @@
<description><![CDATA[The name to set for element]]></description>
</attribute>
+
+ <attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
<attribute>
<name>required</name>
<required>false</required>
@@ -11332,6 +11601,16 @@
<description><![CDATA[The name to set for element]]></description>
</attribute>
+
+ <attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
<attribute>
<name>required</name>
<required>false</required>
@@ -11620,6 +11899,16 @@
<description><![CDATA[The name to set for element]]></description>
</attribute>
+
+ <attribute>
+ <name>key</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ <description><![CDATA[The i18n key for the name value]]></description>
+
+ </attribute>
+
<attribute>
<name>required</name>
<required>false</required>