You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/07/30 09:16:43 UTC
[07/17] git commit: Merge remote-tracking branch
'abrin/feature-WW-4295-localization' into feature/WW-4295-localization
Merge remote-tracking branch 'abrin/feature-WW-4295-localization' into feature/WW-4295-localization
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/23498a33
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/23498a33
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/23498a33
Branch: refs/heads/develop
Commit: 23498a332119486a043e852366dfb73495a510d9
Parents: b78349a 6def514
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Jun 27 08:40:49 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Jun 27 08:40:49 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/struts2/components/ListUIBean.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/23498a33/core/src/main/java/org/apache/struts2/components/ListUIBean.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/struts2/components/ListUIBean.java
index 11e59aa,69deae4..c9f704a
--- a/core/src/main/java/org/apache/struts2/components/ListUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/ListUIBean.java
@@@ -48,8 -48,8 +48,9 @@@ import java.util.Map
public abstract class ListUIBean extends UIBean {
protected Object list;
protected String listKey;
+ protected String listValueKey;
protected String listValue;
+ protected String listLabelKey;
protected String listCssClass;
protected String listCssStyle;
protected String listTitle;