Author: fhanik
Date: Fri Jun 1 00:40:37 2007
New Revision: 543414
URL: http://svn.apache.org/viewvc?view=rev&rev=543414
Log:
Forward port of BZ 42509 and BZ 42515
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?view=diff&rev=543414&r1=543413&r2=543414
==============================================================================
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Fri Jun 1 00:40:37 2007
@@ -81,7 +81,7 @@
}
context.setPropertyResolved(true);
- return this.property(context, base, property).getType();
+ return this.property(context, base, property).getPropertyType();
}
public void setValue(ELContext context, Object base, Object property,
@@ -105,7 +105,7 @@
Method m = this.property(context, base,
property).write(context);
try {
- m.invoke(base, new Object[] { value });
+ m.invoke(base, value);
} catch (IllegalAccessException e) {
throw new ELException(e);
} catch (InvocationTargetException e) {
@@ -187,7 +187,7 @@
}
}
- public BeanProperty get(ELContext ctx, String name) {
+ private BeanProperty get(ELContext ctx, String name) {
BeanProperty property = this.properties.get(name);
if (property == null) {
throw new PropertyNotFoundException(message(ctx,
@@ -196,8 +196,12 @@
}
return property;
}
+
+ public BeanProperty getBeanProperty(String name) {
+ return get(null, name);
+ }
- public Class<?> getType() {
+ private Class<?> getType() {
return type;
}
}
@@ -213,13 +217,13 @@
private Method write;
- public BeanProperty(Class owner, PropertyDescriptor descriptor)
{
+ public BeanProperty(Class<?> owner, PropertyDescriptor
descriptor) {
this.owner = owner;
this.descriptor = descriptor;
this.type = descriptor.getPropertyType();
}
- public Class<?> getType() {
+ public Class getPropertyType() {
return this.type;
}
@@ -228,7 +232,15 @@
&& (null == (this.write = getMethod(this.owner,
descriptor.getWriteMethod())));
}
- public Method write(ELContext ctx) {
+ public Method getWriteMethod() {
+ return write(null);
+ }
+
+ public Method getReadMethod() {
+ return this.read(null);
+ }
+
+ private Method write(ELContext ctx) {
if (this.write == null) {
this.write = getMethod(this.owner,
descriptor.getWriteMethod());
if (this.write == null) {
@@ -240,7 +252,7 @@
return this.write;
}
- public Method read(ELContext ctx) {
+ private Method read(ELContext ctx) {
if (this.read == null) {
this.read = getMethod(this.owner,
descriptor.getReadMethod());
if (this.read == null) {
Modified: tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ResourceBundleELResolver.java?view=diff&rev=543414&r1=543413&r2=543414
==============================================================================
--- tomcat/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ResourceBundleELResolver.java Fri Jun 1
00:40:37 2007
@@ -95,7 +95,7 @@
return true;
}
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext
context, Object base) {
+ public Iterator getFeatureDescriptors(ELContext context, Object base) {
if (base instanceof ResourceBundle) {
List<FeatureDescriptor> feats = new
ArrayList<FeatureDescriptor>();
Enumeration e = ((ResourceBundle) base).getKeys();
Modified: tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java?view=diff&rev=543414&r1=543413&r2=543414
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
(original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java Fri
Jun 1 00:40:37 2007
@@ -57,7 +57,7 @@
return null;
}
- public Class getType(ELContext context, Object base, Object property)
+ public Class<Object> getType(ELContext context, Object base, Object
property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java?view=diff&rev=543414&r1=543413&r2=543414
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java Fri Jun 1 00:40:37
2007
@@ -38,21 +38,21 @@
* Static constant for getBodyContent() when it is Tag dependent.
*/
- public static final String BODY_CONTENT_TAG_DEPENDENT = "TAGDEPENDENT";
+ public static final String BODY_CONTENT_TAG_DEPENDENT = "tagdependent";
/**
* Static constant for getBodyContent() when it is empty.
*/
- public static final String BODY_CONTENT_EMPTY = "EMPTY";
+ public static final String BODY_CONTENT_EMPTY = "empty";
/**
* Static constant for getBodyContent() when it is scriptless.
*
* @since 2.0
*/
- public static final String BODY_CONTENT_SCRIPTLESS = "SCRIPTLESS";
+ public static final String BODY_CONTENT_SCRIPTLESS = "scriptless";
/**
* Constructor for TagInfo from data in the JSP 1.1 format for TLD.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
