Author: markt
Date: Wed Jul 3 10:25:50 2013
New Revision: 1499310
URL: http://svn.apache.org/r1499310
Log:
Re-order to simplify checking against EL spec
Modified:
tomcat/trunk/java/javax/el/BeanNameELResolver.java
tomcat/trunk/java/javax/el/ELContext.java
Modified: tomcat/trunk/java/javax/el/BeanNameELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanNameELResolver.java?rev=1499310&r1=1499309&r2=1499310&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/BeanNameELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanNameELResolver.java Wed Jul 3 10:25:50 2013
@@ -98,7 +98,6 @@ public class BeanNameELResolver extends
public boolean isReadOnly(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
-
if (context == null) {
throw new NullPointerException();
}
Modified: tomcat/trunk/java/javax/el/ELContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELContext.java?rev=1499310&r1=1499309&r2=1499310&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ELContext.java (original)
+++ tomcat/trunk/java/javax/el/ELContext.java Wed Jul 3 10:25:50 2013
@@ -14,16 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package javax.el;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-/**
- *
- */
public abstract class ELContext {
private Locale locale;
@@ -32,19 +28,16 @@ public abstract class ELContext {
private boolean resolved;
- /**
- *
- */
public ELContext() {
this.resolved = false;
}
- // Can't use Class<?> because API needs to match specification
- public Object getContext(@SuppressWarnings("rawtypes") Class key) {
- if (this.map == null) {
- return null;
- }
- return this.map.get(key);
+ public void setPropertyResolved(boolean resolved) {
+ this.resolved = resolved;
+ }
+
+ public boolean isPropertyResolved() {
+ return this.resolved;
}
// Can't use Class<?> because API needs to match specification
@@ -61,20 +54,18 @@ public abstract class ELContext {
this.map.put(key, contextObject);
}
- public void setPropertyResolved(boolean resolved) {
- this.resolved = resolved;
- }
-
- public boolean isPropertyResolved() {
- return this.resolved;
+ // Can't use Class<?> because API needs to match specification
+ public Object getContext(@SuppressWarnings("rawtypes") Class key) {
+ if (this.map == null) {
+ return null;
+ }
+ return this.map.get(key);
}
public abstract ELResolver getELResolver();
public abstract FunctionMapper getFunctionMapper();
- public abstract VariableMapper getVariableMapper();
-
public Locale getLocale() {
return this.locale;
}
@@ -82,4 +73,6 @@ public abstract class ELContext {
public void setLocale(Locale locale) {
this.locale = locale;
}
+
+ public abstract VariableMapper getVariableMapper();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
