Author: husted
Date: Mon Jan 14 19:05:26 2008
New Revision: 611998
URL: http://svn.apache.org/viewvc?rev=611998&view=rev
Log:
WW-2285 Apply FIXBUG patches supplied by Giovanni Azua Garcia.
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java?rev=611998&r1=611997&r2=611998&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java
Mon Jan 14 19:05:26 2008
@@ -137,17 +137,8 @@
Map tmp = (Map) value;
addParameter("list", MakeIterator.convert(tmp));
addParameter("listKey", "key");
- addParameter("listValue", "value");
- } else if (value.getClass().isArray()) {
- Iterator i = MakeIterator.convert(value);
- addParameter("list", i);
- if (listKey != null) {
- addParameter("listKey", listKey);
- }
- if (listValue != null) {
- addParameter("listValue", listValue);
- }
- } else {
+ addParameter("listValue", "value");
+ } else { // also covers "if (value.getClass().isArray())"
Iterator i = MakeIterator.convert(value);
addParameter("list", i);
if (listKey != null) {
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java?rev=611998&r1=611997&r2=611998&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
Mon Jan 14 19:05:26 2008
@@ -44,7 +44,6 @@
params.putAll(typeParams);
if (refParams != null && !refParams.isEmpty())
params.putAll(refParams);
- params.putAll(refParams);
try {
// interceptor instances are long-lived and used across user
sessions, so don't try to pass in any extra
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java?rev=611998&r1=611997&r2=611998&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
Mon Jan 14 19:05:26 2008
@@ -125,7 +125,7 @@
*
* @see org.apache.struts2.util.IteratorGenerator
*/
[EMAIL PROTECTED](name="generator",
tldTagClass="org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag",
[EMAIL PROTECTED](name="generator",
tldTagClass="org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag",
description="Generate an iterator for a iterable source.")
public class IteratorGeneratorTag extends StrutsBodyTagSupport {
@@ -175,7 +175,7 @@
public void setId(String string) {
setVar(string);
}
-
+
@StrutsTagAttribute(description="The name to store the resultant iterator
into page context, if such name is supplied")
public void setVar(String var) {
this.var = var;
@@ -197,17 +197,8 @@
int count = 0;
if (countAttr != null && countAttr.length() > 0) {
Object countObj = findValue(countAttr);
- if (countObj instanceof Integer) {
- count = ((Integer)countObj).intValue();
- }
- else if (countObj instanceof Float) {
- count = ((Float)countObj).intValue();
- }
- else if (countObj instanceof Long) {
- count = ((Long)countObj).intValue();
- }
- else if (countObj instanceof Double) {
- count = ((Double) countObj).intValue();
+ if (countObj instanceof Number) {
+ count = ((Number)countObj).intValue();
}
else if (countObj instanceof String) {
try {
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java?rev=611998&r1=611997&r2=611998&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
Mon Jan 14 19:05:26 2008
@@ -178,13 +178,13 @@
* @s.tagattribute required="false" type="Integer"
* description="Indicate the starting index (eg. first entry is 0) of
entries in the source to be available as the first entry in the resulting
subset iterator"
*/
- @StrutsTagAttribute(type="Integer",
+ @StrutsTagAttribute(type="Integer",
description="Indicate the starting index (eg. first entry is 0) of
entries in the source to be available as the first entry in the resulting
subset iterator")
public void setStart(String start) {
startAttr = start;
}
-
@StrutsTagAttribute(type="org.apache.struts2.util.SubsetIteratorFilter.Decider",
+
@StrutsTagAttribute(type="org.apache.struts2.util.SubsetIteratorFilter.Decider",
description="Extension to plug-in a decider to determine if that
particular entry is to be included in the resulting subset iterator")
public void setDecider(String decider) {
deciderAttr = decider;
@@ -194,7 +194,7 @@
public void setId(String string) {
setVar(string);
}
-
+
@StrutsTagAttribute(description="The name to store the resultant iterator
into page context, if such name is supplied")
public void setVar(String var) {
this.var = var;
@@ -214,17 +214,8 @@
int count = -1;
if (countAttr != null && countAttr.length() > 0) {
Object countObj = findValue(countAttr);
- if (countObj instanceof Integer) {
- count = ((Integer)countObj).intValue();
- }
- else if (countObj instanceof Float) {
- count = ((Float)countObj).intValue();
- }
- else if (countObj instanceof Long) {
- count = ((Long)countObj).intValue();
- }
- else if (countObj instanceof Double) {
- count = ((Double)countObj).intValue();
+ if (countObj instanceof Number) {
+ count = ((Number)countObj).intValue();
}
else if (countObj instanceof String) {
try {
