Author: remm
Date: Wed Sep 13 06:38:25 2006
New Revision: 442983
URL: http://svn.apache.org/viewvc?view=rev&rev=442983
Log:
- Fix ArrayELResolver.coerce when using a String.
- Some cleanups.
Modified:
tomcat/tc6.0.x/trunk/java/javax/el/ArrayELResolver.java
tomcat/tc6.0.x/trunk/java/javax/el/ListELResolver.java
tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
Modified: tomcat/tc6.0.x/trunk/java/javax/el/ArrayELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/ArrayELResolver.java?view=diff&rev=442983&r1=442982&r2=442983
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/el/ArrayELResolver.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/ArrayELResolver.java Wed Sep 13 06:38:25
2006
@@ -145,6 +145,9 @@
if (property instanceof Boolean) {
return (((Boolean) property).booleanValue() ? 1 : 0);
}
+ if (property instanceof String) {
+ return Integer.parseInt((String) property);
+ }
throw new IllegalArgumentException(property != null ? property
.toString() : "null");
}
Modified: tomcat/tc6.0.x/trunk/java/javax/el/ListELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/ListELResolver.java?view=diff&rev=442983&r1=442982&r2=442983
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/el/ListELResolver.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/ListELResolver.java Wed Sep 13 06:38:25
2006
@@ -17,7 +17,6 @@
package javax.el;
import java.beans.FeatureDescriptor;
-import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Modified: tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java?view=diff&rev=442983&r1=442982&r2=442983
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java Wed Sep 13
06:38:25 2006
@@ -94,9 +94,9 @@
return true;
}
- public Iterator getFeatureDescriptors(ELContext context, Object base) {
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
if (base instanceof ResourceBundle) {
- List feats = new ArrayList();
+ List<FeatureDescriptor> feats = new
ArrayList<FeatureDescriptor>();
Enumeration e = ((ResourceBundle) base).getKeys();
FeatureDescriptor feat;
String key;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
