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/03/22 09:08:56 UTC
[1/3] git commit: Allows pass Locale as array of parameters
Repository: struts
Updated Branches:
refs/heads/develop 4fbfa3b8b -> 49ecb5f9f
Allows pass Locale as array of parameters
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e99e4b28
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e99e4b28
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e99e4b28
Branch: refs/heads/develop
Commit: e99e4b28e4bc3481aab4f80ed0943535144af4c7
Parents: 4fbfa3b
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 21 21:31:51 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 21 21:31:51 2014 +0100
----------------------------------------------------------------------
.../java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/e99e4b28/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
index 2ce91ad..3deb268 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
@@ -272,7 +272,7 @@ public class I18nInterceptor extends AbstractInterceptor {
protected Object findLocaleParameter(Map<String, Object> params, String parameterName) {
Object requestedLocale = params.remove(parameterName);
if (requestedLocale != null && requestedLocale.getClass().isArray()
- && ((Object[]) requestedLocale).length == 1) {
+ && ((Object[]) requestedLocale).length > 0) {
requestedLocale = ((Object[]) requestedLocale)[0];
if (LOG.isDebugEnabled()) {
[2/3] git commit: WW-4253 Removes duplicated class and style attribute
Posted by lu...@apache.org.
WW-4253 Removes duplicated class and style attribute
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b775b74a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b775b74a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b775b74a
Branch: refs/heads/develop
Commit: b775b74afdf2093d746c6c108d3f580e6d08599a
Parents: e99e4b2
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 21 21:58:21 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 21 21:58:21 2014 +0100
----------------------------------------------------------------------
core/src/main/resources/template/simple/radiomap.ftl | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b775b74a/core/src/main/resources/template/simple/radiomap.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/radiomap.ftl b/core/src/main/resources/template/simple/radiomap.ftl
index ab6d42c..34cf1b1 100644
--- a/core/src/main/resources/template/simple/radiomap.ftl
+++ b/core/src/main/resources/template/simple/radiomap.ftl
@@ -72,17 +72,9 @@
</#if>
<#if itemCssClass?if_exists != "">
class="${itemCssClass?html}"<#rt/>
-<#else>
- <#if parameters.cssClass??>
- class="${parameters.cssClass?html}"<#rt/>
- </#if>
</#if>
<#if itemCssStyle?if_exists != "">
style="${itemCssStyle?html}"<#rt/>
-<#else>
- <#if parameters.cssStyle??>
- style="${parameters.cssStyle?html}"<#rt/>
- </#if>
</#if>
<#if itemTitle?if_exists != "">
title="${itemTitle?html}"<#rt/>
[3/3] git commit: WW-4290 Uses static map instead instance map to
reduce memory consumption
Posted by lu...@apache.org.
WW-4290 Uses static map instead instance map to reduce memory consumption
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/49ecb5f9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/49ecb5f9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/49ecb5f9
Branch: refs/heads/develop
Commit: 49ecb5f9f764b1b2a78072fa68b4377b8d2911fa
Parents: b775b74
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat Mar 22 09:04:15 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat Mar 22 09:07:16 2014 +0100
----------------------------------------------------------------------
.../xwork2/conversion/impl/DefaultTypeConverter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/49ecb5f9/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
index 29316d9..b1342cd 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
@@ -56,9 +56,9 @@ public class DefaultTypeConverter implements TypeConverter {
private static final String NULL_STRING = "null";
- private final Map<Class, Object> primitiveDefaults;
+ private static final Map<Class, Object> primitiveDefaults;
- public DefaultTypeConverter() {
+ static {
Map<Class, Object> map = new HashMap<Class, Object>();
map.put(Boolean.TYPE, Boolean.FALSE);
map.put(Byte.TYPE, Byte.valueOf((byte) 0));