Author: markt
Date: Wed Jan 13 19:20:42 2010
New Revision: 898902
URL: http://svn.apache.org/viewvc?rev=898902&view=rev
Log:
Implement remainder of EL 2.2. API changes
Added:
tomcat/trunk/java/javax/el/ValueReference.java (with props)
Modified:
tomcat/trunk/java/javax/el/MethodExpression.java
tomcat/trunk/java/javax/el/ValueExpression.java
Modified: tomcat/trunk/java/javax/el/MethodExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/MethodExpression.java?rev=898902&r1=898901&r2=898902&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/MethodExpression.java (original)
+++ tomcat/trunk/java/javax/el/MethodExpression.java Wed Jan 13 19:20:42 2010
@@ -22,7 +22,17 @@
*/
public abstract class MethodExpression extends Expression {
+ private static final long serialVersionUID = 8163925562047324656L;
+
public abstract MethodInfo getMethodInfo(ELContext context) throws
NullPointerException, PropertyNotFoundException, MethodNotFoundException,
ELException;
public abstract Object invoke(ELContext context, Object[] params) throws
NullPointerException, PropertyNotFoundException, MethodNotFoundException,
ELException;
+
+ /**
+ * @since EL 2.2
+ */
+ public boolean isParametersProvided() {
+ // Expected to be over-ridden by implementation
+ return false;
+ }
}
Modified: tomcat/trunk/java/javax/el/ValueExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ValueExpression.java?rev=898902&r1=898901&r2=898902&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ValueExpression.java (original)
+++ tomcat/trunk/java/javax/el/ValueExpression.java Wed Jan 13 19:20:42 2010
@@ -22,6 +22,8 @@
*/
public abstract class ValueExpression extends Expression {
+ private static final long serialVersionUID = 8577809572381654673L;
+
public abstract Class<?> getExpectedType();
public abstract Class<?> getType(ELContext context) throws
NullPointerException, PropertyNotFoundException, ELException;
@@ -32,4 +34,11 @@
public abstract Object getValue(ELContext context) throws
NullPointerException, PropertyNotFoundException, ELException;
+ /**
+ * @since EL 2.2
+ */
+ public ValueReference getValueReference(@SuppressWarnings("unused")
ELContext context) {
+ // Expected to be over-ridden by implementation
+ return null;
+ }
}
Added: tomcat/trunk/java/javax/el/ValueReference.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ValueReference.java?rev=898902&view=auto
==============================================================================
--- tomcat/trunk/java/javax/el/ValueReference.java (added)
+++ tomcat/trunk/java/javax/el/ValueReference.java Wed Jan 13 19:20:42 2010
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.el;
+
+import java.io.Serializable;
+
+/**
+ * @since EL 2.2
+ */
+public class ValueReference implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Object base;
+ private Object property;
+
+ public ValueReference(Object base, Object property) {
+ this.base = base;
+ this.property = property;
+ }
+
+ public Object getBase() {
+ return base;
+ }
+
+ public Object getProperty() {
+ return property;
+ }
+}
Propchange: tomcat/trunk/java/javax/el/ValueReference.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/trunk/java/javax/el/ValueReference.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
