struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [07/12] git commit: Merge remote-tracking branch 'abrin/feature-WW-4295-localization' into feature/WW-4295-localization
Date Fri, 27 Jun 2014 11:06:52 GMT
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/feature/WW-4295-localization
Commit: 23498a332119486a043e852366dfb73495a510d9
Parents: b78349a 6def514
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Fri Jun 27 08:40:49 2014 +0200
Committer: Lukasz Lenart <lukaszlenart@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;


Mime
View raw message