Author: markt
Date: Sat Oct 22 21:17:12 2011
New Revision: 1187802
URL: http://svn.apache.org/viewvc?rev=1187802&view=rev
Log:
Whitespace removal from remaining /java/org/apache/el
Modified:
tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java
tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java
tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java
tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java
tomcat/trunk/java/org/apache/el/parser/AstFunction.java
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/java/org/apache/el/parser/BooleanNode.java
tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/trunk/java/org/apache/el/parser/Node.java
tomcat/trunk/java/org/apache/el/parser/NodeVisitor.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/trunk/java/org/apache/el/util/MessageFactory.java
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
tomcat/trunk/java/org/apache/el/util/Validation.java
Modified: tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
@@ -29,14 +29,14 @@ import org.apache.el.util.MessageFactory
/**
* @see javax.el.ExpressionFactory
- *
+ *
* @author Jacob Hookom [ja...@hookom.net]
* @version $Id$
*/
public class ExpressionFactoryImpl extends ExpressionFactory {
/**
- *
+ *
*/
public ExpressionFactoryImpl() {
super();
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
@@ -39,38 +39,38 @@ import org.apache.el.util.ReflectionUtil
/**
* An <code>Expression</code> that refers to a method on an object.
- *
+ *
* <p>
* <code>The {@link javax.el.ExpressionFactory#createMethodExpression} method
* can be used to parse an expression string and return a concrete instance
* of <code>MethodExpression</code> that encapsulates the parsed expression.
- * The {@link FunctionMapper} is used at parse time, not evaluation time,
- * so one is not needed to evaluate an expression using this class.
+ * The {@link FunctionMapper} is used at parse time, not evaluation time,
+ * so one is not needed to evaluate an expression using this class.
* However, the {@link ELContext} is needed at evaluation time.</p>
*
- * <p>The {@link #getMethodInfo} and {@link #invoke} methods will evaluate the
- * expression each time they are called. The {@link javax.el.ELResolver} in
the
- * <code>ELContext</code> is used to resolve the top-level variables and to
- * determine the behavior of the <code>.</code> and <code>[]</code>
+ * <p>The {@link #getMethodInfo} and {@link #invoke} methods will evaluate the
+ * expression each time they are called. The {@link javax.el.ELResolver} in the
+ * <code>ELContext</code> is used to resolve the top-level variables and to
+ * determine the behavior of the <code>.</code> and <code>[]</code>
* operators. For any of the two methods, the
* {@link javax.el.ELResolver#getValue} method is used to resolve all
properties
* up to but excluding the last one. This provides the <code>base</code> object
- * on which the method appears. If the <code>base</code> object is null, a
- * <code>NullPointerException</code> must be thrown. At the last resolution,
+ * on which the method appears. If the <code>base</code> object is null, a
+ * <code>NullPointerException</code> must be thrown. At the last resolution,
* the final <code>property</code> is then coerced to a <code>String</code>,
- * which provides the name of the method to be found. A method matching the
- * name and expected parameters provided at parse time is found and it is
+ * which provides the name of the method to be found. A method matching the
+ * name and expected parameters provided at parse time is found and it is
* either queried or invoked (depending on the method called on this
* <code>MethodExpression</code>).</p>
*
- * <p>See the notes about comparison, serialization and immutability in
+ * <p>See the notes about comparison, serialization and immutability in
* the {@link javax.el.Expression} javadocs.
*
* @see javax.el.ELResolver
* @see javax.el.Expression
* @see javax.el.ExpressionFactory
* @see javax.el.MethodExpression
- *
+ *
* @author Jacob Hookom [ja...@hookom.net]
* @version $Id$
*/
@@ -90,7 +90,7 @@ public final class MethodExpressionImpl
private Class<?>[] paramTypes;
/**
- *
+ *
*/
public MethodExpressionImpl() {
super();
@@ -118,7 +118,7 @@ public final class MethodExpressionImpl
/**
* Determines whether the specified object is equal to this
* <code>Expression</code>.
- *
+ *
* <p>
* The result is <code>true</code> if and only if the argument is not
* <code>null</code>, is an <code>Expression</code> object that is the
@@ -126,7 +126,7 @@ public final class MethodExpressionImpl
* <code>MethodExpression</code>), and has an identical parsed
* representation.
* </p>
- *
+ *
* <p>
* Note that two expressions can be equal if their expression Strings are
* different. For example, <code>${fn1:foo()}</code> and
@@ -134,7 +134,7 @@ public final class MethodExpressionImpl
* <code>FunctionMapper</code>s mapped <code>fn1:foo</code> and
* <code>fn2:foo</code> to the same method.
* </p>
- *
+ *
* @param obj
* the <code>Object</code> to test for equality.
* @return <code>true</code> if <code>obj</code> equals this
@@ -151,22 +151,22 @@ public final class MethodExpressionImpl
/**
* Returns the original String used to create this <code>Expression</code>,
* unmodified.
- *
+ *
* <p>
* This is used for debugging purposes but also for the purposes of
* comparison (e.g. to ensure the expression in a configuration file has
not
* changed).
* </p>
- *
+ *
* <p>
* This method does not provide sufficient information to re-create an
* expression. Two different expressions can have exactly the same
* expression string but different function mappings. Serialization should
* be used to save and restore the state of an <code>Expression</code>.
* </p>
- *
+ *
* @return The original expression String.
- *
+ *
* @see javax.el.Expression#getExpressionString()
*/
@Override
@@ -177,7 +177,7 @@ public final class MethodExpressionImpl
/**
* Evaluates the expression relative to the provided context, and returns
* information about the actual referenced method.
- *
+ *
* @param context
* The context of this evaluation
* @return an instance of <code>MethodInfo</code> containing information
@@ -219,7 +219,7 @@ public final class MethodExpressionImpl
/**
* Returns the hash code for this <code>Expression</code>.
- *
+ *
* <p>
* See the note in the {@link #equals} method on how two expressions can be
* equal if their expression Strings are different. Recall that if two
@@ -228,7 +228,7 @@ public final class MethodExpressionImpl
* objects must produce the same integer result. Implementations must take
* special note and implement <code>hashCode</code> correctly.
* </p>
- *
+ *
* @return The hash code for this <code>Expression</code>.
* @see #equals
* @see java.util.Hashtable
@@ -243,7 +243,7 @@ public final class MethodExpressionImpl
* Evaluates the expression relative to the provided context, invokes the
* method that was found using the supplied parameters, and returns the
* result of the method invocation.
- *
+ *
* @param context
* The context of this evaluation.
* @param params
@@ -280,7 +280,7 @@ public final class MethodExpressionImpl
/*
* (non-Javadoc)
- *
+ *
* @see java.io.Externalizable#readExternal(java.io.ObjectInput)
*/
@Override
@@ -299,7 +299,7 @@ public final class MethodExpressionImpl
/*
* (non-Javadoc)
- *
+ *
* @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
*/
@Override
@@ -327,5 +327,5 @@ public final class MethodExpressionImpl
public boolean isParmetersProvided() {
return this.getNode().isParametersProvided();
}
-
+
}
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
@@ -41,7 +41,7 @@ import org.apache.el.util.ReflectionUtil
/**
* An <code>Expression</code> that can get or set a value.
- *
+ *
* <p>
* In previous incarnations of this API, expressions could only be read.
* <code>ValueExpression</code> objects can now be used both to retrieve a
@@ -53,13 +53,13 @@ import org.apache.el.util.ReflectionUtil
* details. Expressions that cannot be used as l-values must always return
* <code>true</code> from <code>isReadOnly()</code>.
* </p>
- *
+ *
* <p>
* <code>The {@link javax.el.ExpressionFactory#createValueExpression} method
* can be used to parse an expression string and return a concrete instance
* of <code>ValueExpression</code> that encapsulates the parsed expression.
- * The {@link FunctionMapper} is used at parse time, not evaluation time,
- * so one is not needed to evaluate an expression using this class.
+ * The {@link FunctionMapper} is used at parse time, not evaluation time,
+ * so one is not needed to evaluate an expression using this class.
* However, the {@link ELContext} is needed at evaluation time.</p>
*
* <p>The {@link #getValue}, {@link #setValue}, {@link #isReadOnly} and
@@ -76,14 +76,14 @@ import org.apache.el.util.ReflectionUtil
* method, depending on which was called on the <code>ValueExpression</code>.
* </p>
*
- * <p>See the notes about comparison, serialization and immutability in
+ * <p>See the notes about comparison, serialization and immutability in
* the {@link javax.el.Expression} javadocs.
*
* @see javax.el.ELResolver
* @see javax.el.Expression
* @see javax.el.ExpressionFactory
* @see javax.el.ValueExpression
- *
+ *
* @author Jacob Hookom [ja...@hookom.net]
* @version $Id$
*/
@@ -105,7 +105,7 @@ public final class ValueExpressionImpl e
}
/**
- *
+ *
*/
public ValueExpressionImpl(String expr, Node node, FunctionMapper fnMapper,
VariableMapper varMapper, Class<?> expectedType) {
@@ -118,7 +118,7 @@ public final class ValueExpressionImpl e
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -129,7 +129,7 @@ public final class ValueExpressionImpl e
/*
* (non-Javadoc)
- *
+ *
* @see javax.el.ValueExpression#getExpectedType()
*/
@Override
@@ -140,11 +140,11 @@ public final class ValueExpressionImpl e
/**
* Returns the type the result of the expression will be coerced to after
* evaluation.
- *
+ *
* @return the <code>expectedType</code> passed to the
* <code>ExpressionFactory.createValueExpression</code> method
* that created this <code>ValueExpression</code>.
- *
+ *
* @see javax.el.Expression#getExpressionString()
*/
@Override
@@ -165,7 +165,7 @@ public final class ValueExpressionImpl e
/*
* (non-Javadoc)
- *
+ *
* @see javax.el.ValueExpression#getType(javax.el.ELContext)
*/
@Override
@@ -178,7 +178,7 @@ public final class ValueExpressionImpl e
/*
* (non-Javadoc)
- *
+ *
* @see javax.el.ValueExpression#getValue(javax.el.ELContext)
*/
@Override
@@ -195,7 +195,7 @@ public final class ValueExpressionImpl e
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -205,7 +205,7 @@ public final class ValueExpressionImpl e
/*
* (non-Javadoc)
- *
+ *
* @see javax.el.ValueExpression#isLiteralText()
*/
@Override
@@ -219,7 +219,7 @@ public final class ValueExpressionImpl e
/*
* (non-Javadoc)
- *
+ *
* @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
*/
@Override
@@ -244,7 +244,7 @@ public final class ValueExpressionImpl e
/*
* (non-Javadoc)
- *
+ *
* @see javax.el.ValueExpression#setValue(javax.el.ELContext,
* java.lang.Object)
*/
@@ -280,5 +280,5 @@ public final class ValueExpressionImpl e
this.varMapper);
return this.getNode().getValueReference(ctx);
}
-
+
}
Modified: tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java (original)
+++ tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELSupport.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Sat Oct 22 21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
@@ -29,7 +29,7 @@ import org.apache.el.util.MessageFactory
/**
* A helper class that implements the EL Specification
- *
+ *
* @author Jacob Hookom [ja...@hookom.net]
* @version $Id$
*/
@@ -39,27 +39,27 @@ public class ELSupport {
/**
* Compare two objects, after coercing to the same type if appropriate.
- *
- * If the objects are identical, or they are equal according to
+ *
+ * If the objects are identical, or they are equal according to
* {@link #equals(Object, Object)} then return 0.
- *
+ *
* If either object is a BigDecimal, then coerce both to BigDecimal first.
* Similarly for Double(Float), BigInteger, and Long(Integer, Char, Short,
Byte).
- *
+ *
* Otherwise, check that the first object is an instance of Comparable,
and compare
* against the second object. If that is null, return 1, otherwise
* return the result of comparing against the second object.
- *
+ *
* Similarly, if the second object is Comparable, if the first is null,
return -1,
* else return the result of comparing against the first object.
- *
+ *
* A null object is considered as:
* <ul>
* <li>ZERO when compared with Numbers</li>
* <li>the empty string for String compares</li>
* <li>Otherwise null is considered to be lower than anything else.</li>
* </ul>
- *
+ *
* @param obj0 first object
* @param obj1 second object
* @return -1, 0, or 1 if this object is less than, equal to, or greater
than val.
@@ -109,13 +109,13 @@ public class ELSupport {
/**
* Compare two objects for equality, after coercing to the same type if
appropriate.
- *
+ *
* If the objects are identical (including both null) return true.
* If either object is null, return false.
* If either object is Boolean, coerce both to Boolean and check equality.
* Similarly for Enum, String, BigDecimal, Double(Float), Long(Integer,
Short, Byte, Character)
* Otherwise default to using Object.equals().
- *
+ *
* @param obj0 the first object
* @param obj1 the second object
* @return true if the objects are equal
@@ -173,7 +173,7 @@ public class ELSupport {
if (type.isAssignableFrom(obj.getClass())) {
return (Enum<?>) obj;
}
-
+
if (!(obj instanceof String)) {
throw new ELException(MessageFactory.get("error.convert",
obj, obj.getClass(), type));
@@ -473,7 +473,7 @@ public class ELSupport {
}
/**
- *
+ *
*/
public ELSupport() {
super();
Modified: tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
@@ -43,7 +43,7 @@ public class FunctionMapperImpl extends
/*
* (non-Javadoc)
- *
+ *
* @see javax.el.FunctionMapper#resolveFunction(java.lang.String,
* java.lang.String)
*/
@@ -68,7 +68,7 @@ public class FunctionMapperImpl extends
/*
* (non-Javadoc)
- *
+ *
* @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
*/
@Override
@@ -78,7 +78,7 @@ public class FunctionMapperImpl extends
/*
* (non-Javadoc)
- *
+ *
* @see java.io.Externalizable#readExternal(java.io.ObjectInput)
*/
@SuppressWarnings("unchecked")
@@ -98,7 +98,7 @@ public class FunctionMapperImpl extends
protected String localName;
/**
- *
+ *
*/
public Function(String prefix, String localName, Method m) {
if (localName == null) {
@@ -118,7 +118,7 @@ public class FunctionMapperImpl extends
/*
* (non-Javadoc)
- *
+ *
* @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
*/
@Override
@@ -141,7 +141,7 @@ public class FunctionMapperImpl extends
/*
* (non-Javadoc)
- *
+ *
* @see java.io.Externalizable#readExternal(java.io.ObjectInput)
*/
@Override
Modified: tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java Sat Oct 22
21:17:12 2011
@@ -39,7 +39,7 @@ public final class AstDotSuffix extends
throws ELException {
return this.image;
}
-
+
@Override
public void setImage(String image) {
if (!Validation.isIdentifier(image)) {
Modified: tomcat/trunk/java/org/apache/el/parser/AstFunction.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstFunction.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstFunction.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstFunction.java Sat Oct 22 21:17:12
2011
@@ -61,9 +61,9 @@ public final class AstFunction extends S
@Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
-
+
FunctionMapper fnMapper = ctx.getFunctionMapper();
-
+
// quickly validate again for this request
if (fnMapper == null) {
throw new ELException(MessageFactory.get("error.fnMapper.null"));
@@ -79,9 +79,9 @@ public final class AstFunction extends S
@Override
public Object getValue(EvaluationContext ctx)
throws ELException {
-
+
FunctionMapper fnMapper = ctx.getFunctionMapper();
-
+
// quickly validate again for this request
if (fnMapper == null) {
throw new ELException(MessageFactory.get("error.fnMapper.null"));
@@ -127,8 +127,8 @@ public final class AstFunction extends S
public void setPrefix(String prefix) {
this.prefix = prefix;
}
-
-
+
+
@Override
public String toString()
{
Modified: tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java Sat Oct 22
21:17:12 2011
@@ -118,7 +118,7 @@ public final class AstIdentifier extends
Object[] paramValues) throws ELException {
return this.getMethodExpression(ctx).invoke(ctx.getELContext(),
paramValues);
}
-
+
@Override
public MethodInfo getMethodInfo(EvaluationContext ctx,
Modified: tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java Sat Oct 22
21:17:12 2011
@@ -37,7 +37,7 @@ public final class AstMethodParameters e
}
return params.toArray(new Object[params.size()]);
}
-
+
public Class<?>[] getParameterTypes(EvaluationContext ctx) {
ArrayList<Class<?>> paramTypes = new ArrayList<Class<?>>();
for (int i = 0; i < this.jjtGetNumChildren(); i++) {
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Sat Oct 22 21:17:12
2011
@@ -46,7 +46,7 @@ public final class AstValue extends Simp
(System.getSecurityManager() != null);
protected static final boolean COERCE_TO_ZERO;
-
+
static {
if (IS_SECURITY_ENABLED) {
COERCE_TO_ZERO = AccessController.doPrivileged(
@@ -84,7 +84,7 @@ public final class AstValue extends Simp
Class<?> result = ctx.getELResolver().getType(ctx, t.base, t.property);
if (!ctx.isPropertyResolved()) {
throw new PropertyNotFoundException(MessageFactory.get(
- "error.resolver.unhandled", t.base, t.property));
+ "error.resolver.unhandled", t.base, t.property));
}
return result;
}
@@ -102,10 +102,10 @@ public final class AstValue extends Simp
// set up our start/end
Object property = null;
int propCount = this.jjtGetNumChildren();
-
+
if (propCount > 2 &&
this.jjtGetChild(propCount - 1) instanceof
AstMethodParameters) {
- // Method call with paramaters.
+ // Method call with paramaters.
propCount-=2;
} else {
propCount--;
@@ -164,7 +164,7 @@ public final class AstValue extends Simp
if (suffix == null) {
return null;
}
-
+
ctx.setPropertyResolved(false);
base = resolver.getValue(ctx, base, suffix);
i++;
@@ -172,7 +172,7 @@ public final class AstValue extends Simp
}
if (!ctx.isPropertyResolved()) {
throw new PropertyNotFoundException(MessageFactory.get(
- "error.resolver.unhandled", base, suffix));
+ "error.resolver.unhandled", base, suffix));
}
return base;
}
@@ -185,7 +185,7 @@ public final class AstValue extends Simp
ctx.getELResolver().isReadOnly(ctx, t.base, t.property);
if (!ctx.isPropertyResolved()) {
throw new PropertyNotFoundException(MessageFactory.get(
- "error.resolver.unhandled", t.base, t.property));
+ "error.resolver.unhandled", t.base, t.property));
}
return result;
}
@@ -208,7 +208,7 @@ public final class AstValue extends Simp
}
if (!ctx.isPropertyResolved()) {
throw new PropertyNotFoundException(MessageFactory.get(
- "error.resolver.unhandled", t.base, t.property));
+ "error.resolver.unhandled", t.base, t.property));
}
}
@@ -226,7 +226,7 @@ public final class AstValue extends Simp
@Override
// Interface el.parser.Node uses raw types (and is auto-generated)
- public MethodInfo getMethodInfo(EvaluationContext ctx,
+ public MethodInfo getMethodInfo(EvaluationContext ctx,
@SuppressWarnings("rawtypes") Class[] paramTypes)
throws ELException {
Target t = getTarget(ctx);
@@ -237,10 +237,10 @@ public final class AstValue extends Simp
@Override
// Interface el.parser.Node uses a raw type (and is auto-generated)
- public Object invoke(EvaluationContext ctx,
+ public Object invoke(EvaluationContext ctx,
@SuppressWarnings("rawtypes") Class[] paramTypes,
Object[] paramValues) throws ELException {
-
+
Target t = getTarget(ctx);
Method m = null;
Object[] values = null;
@@ -272,7 +272,7 @@ public final class AstValue extends Simp
private Object[] toVarArgs(Object[] src, Method m) {
int paramCount = m.getParameterTypes().length;
-
+
Object[] dest = new Object[paramCount];
Object[] varArgs = (Object[]) Array.newInstance(
m.getParameterTypes()[paramCount - 1].getComponentType(),
@@ -283,12 +283,12 @@ public final class AstValue extends Simp
dest[paramCount - 1] = varArgs;
return dest;
}
-
+
private Class<?>[] getTypesFromValues(Object[] values) {
if (values == null) {
return null;
}
-
+
Class<?> result[] = new Class<?>[values.length];
for (int i = 0; i < values.length; i++) {
if (values[i] == null) {
@@ -300,7 +300,7 @@ public final class AstValue extends Simp
return result;
}
-
+
/**
* @since EL 2.2
*/
@@ -316,7 +316,7 @@ public final class AstValue extends Simp
return new ValueReference(t.base, t.property);
}
-
+
/**
* @since EL 2.2
*/
Modified: tomcat/trunk/java/org/apache/el/parser/BooleanNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/BooleanNode.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/BooleanNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/BooleanNode.java Sat Oct 22 21:17:12
2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Sat Oct 22
21:17:12 2011
@@ -1035,9 +1035,9 @@ private int jjMoveNfa_1(int startState,
}
}
static final int[] jjnextStates = {
- 0, 1, 3, 4, 2, 0, 1, 4, 2, 0, 1, 4, 5, 2, 0, 1,
- 2, 6, 16, 17, 18, 23, 24, 11, 12, 14, 6, 7, 9, 3, 4, 21,
- 22, 25, 26,
+ 0, 1, 3, 4, 2, 0, 1, 4, 2, 0, 1, 4, 5, 2, 0, 1,
+ 2, 6, 16, 17, 18, 23, 24, 11, 12, 14, 6, 7, 9, 3, 4, 21,
+ 22, 25, 26,
};
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1,
long l2)
{
@@ -1074,12 +1074,12 @@ private static final boolean jjCanMove_1
/** Token literal values. */
public static final String[] jjstrLiteralImages = {
-"", null, "\44\173", "\43\173", null, null, null, null, null, null, null,
null,
-"\164\162\165\145", "\146\141\154\163\145", "\156\165\154\154", "\175", "\56",
"\50", "\51",
-"\133", "\135", "\72", "\54", "\76", "\147\164", "\74", "\154\164", "\76\75",
-"\147\145", "\74\75", "\154\145", "\75\75", "\145\161", "\41\75", "\156\145",
"\41",
-"\156\157\164", "\46\46", "\141\156\144", "\174\174", "\157\162",
"\145\155\160\164\171",
-"\151\156\163\164\141\156\143\145\157\146", "\52", "\53", "\55", "\77", "\57",
"\144\151\166", "\45", "\155\157\144", null,
+"", null, "\44\173", "\43\173", null, null, null, null, null, null, null, null,
+"\164\162\165\145", "\146\141\154\163\145", "\156\165\154\154", "\175", "\56",
"\50", "\51",
+"\133", "\135", "\72", "\54", "\76", "\147\164", "\74", "\154\164", "\76\75",
+"\147\145", "\74\75", "\154\145", "\75\75", "\145\161", "\41\75", "\156\145",
"\41",
+"\156\157\164", "\46\46", "\141\156\144", "\174\174", "\157\162",
"\145\155\160\164\171",
+"\151\156\163\164\141\156\143\145\157\146", "\52", "\53", "\55", "\77", "\57",
"\144\151\166", "\45", "\155\157\144", null,
null, null, null, null, null, };
/** Lexer state names. */
@@ -1090,15 +1090,15 @@ public static final String[] lexStateNam
/** Lex State array. */
public static final int[] jjnewLexState = {
- -1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1,
-1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1,
-1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1,
};
static final long[] jjtoToken = {
- 0x11ffffffffffb0fL,
+ 0x11ffffffffffb0fL,
};
static final long[] jjtoSkip = {
- 0xf0L,
+ 0xf0L,
};
protected SimpleCharStream input_stream;
private final int[] jjrounds = new int[30];
@@ -1181,7 +1181,7 @@ int jjmatchedPos;
int jjmatchedKind;
/** Get the next Token. */
-public Token getNextToken()
+public Token getNextToken()
{
Token matchedToken;
int curPos = 0;
Modified: tomcat/trunk/java/org/apache/el/parser/Node.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/Node.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/Node.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/Node.java Sat Oct 22 21:17:12 2011
@@ -7,9 +7,9 @@
* 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.
@@ -59,9 +59,9 @@ public interface Node {
/** Return the number of children the node has. */
public int jjtGetNumChildren();
-
+
public String getImage();
-
+
public Object getValue(EvaluationContext ctx) throws ELException;
public void setValue(EvaluationContext ctx, Object value) throws ELException;
public Class<?> getType(EvaluationContext ctx) throws ELException;
@@ -71,12 +71,12 @@ public interface Node {
throws ELException;
public Object invoke(EvaluationContext ctx, Class<?>[] paramTypes,
Object[] paramValues) throws ELException;
-
+
/**
* @since EL 2.2
*/
public ValueReference getValueReference(EvaluationContext ctx);
-
+
/**
* @since EL 2.2
*/
Modified: tomcat/trunk/java/org/apache/el/parser/NodeVisitor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/NodeVisitor.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/NodeVisitor.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/NodeVisitor.java Sat Oct 22 21:17:12
2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleNode.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/SimpleNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleNode.java Sat Oct 22 21:17:12
2011
@@ -163,8 +163,8 @@ public abstract class SimpleNode extends
Class<?>[] paramTypes) throws ELException {
throw new UnsupportedOperationException();
}
-
-
+
+
@Override
public int hashCode() {
final int prime = 31;
@@ -207,7 +207,7 @@ public abstract class SimpleNode extends
public ValueReference getValueReference(EvaluationContext ctx) {
return null;
}
-
+
/**
* @since EL 2.2
*/
Modified: tomcat/trunk/java/org/apache/el/util/MessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/MessageFactory.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/MessageFactory.java (original)
+++ tomcat/trunk/java/org/apache/el/util/MessageFactory.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Sat Oct 22
21:17:12 2011
@@ -5,9 +5,9 @@
* 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.
@@ -28,7 +28,7 @@ import javax.el.MethodNotFoundException;
/**
* Utilities for Managing Serialization and Reflection
- *
+ *
* @author Jacob Hookom [ja...@hookom.net]
* @version $Id$
*/
@@ -120,7 +120,7 @@ public class ReflectionUtil {
String methodName = (property instanceof String) ? (String) property
: property.toString();
-
+
int paramCount;
if (paramTypes == null) {
paramCount = 0;
@@ -130,13 +130,13 @@ public class ReflectionUtil {
Method[] methods = base.getClass().getMethods();
Map<Method,Integer> candidates = new HashMap<Method,Integer>();
-
+
for (Method m : methods) {
if (!m.getName().equals(methodName)) {
// Method name doesn't match
continue;
}
-
+
Class<?>[] mParamTypes = m.getParameterTypes();
int mParamCount;
if (mParamTypes == null) {
@@ -144,14 +144,14 @@ public class ReflectionUtil {
} else {
mParamCount = mParamTypes.length;
}
-
+
// Check the number of parameters
if (!(paramCount == mParamCount ||
(m.isVarArgs() && paramCount >= mParamCount))) {
// Method has wrong number of parameters
continue;
}
-
+
// Check the parameters match
int exactMatch = 0;
boolean noMatch = false;
@@ -177,13 +177,13 @@ public class ReflectionUtil {
if (noMatch) {
continue;
}
-
+
// If a method is found where every parameter matches exactly,
// return it
if (exactMatch == paramCount) {
return m;
}
-
+
candidates.put(m, Integer.valueOf(exactMatch));
}
@@ -210,7 +210,7 @@ public class ReflectionUtil {
} else {
match = null;
}
-
+
if (match == null) {
// If multiple methods have the same matching number of
parameters
// the match is ambiguous so throw an exception
@@ -219,14 +219,14 @@ public class ReflectionUtil {
paramString(paramTypes)));
}
}
-
+
// Handle case where no match at all was found
if (match == null) {
throw new MethodNotFoundException(MessageFactory.get(
"error.method.notfound", base, property,
paramString(paramTypes)));
}
-
+
return match;
}
@@ -235,10 +235,10 @@ public class ReflectionUtil {
Class<?>[] paramTypes) {
// Identify which parameter isn't an exact match
Method m = candidates.iterator().next();
-
+
int nonMatchIndex = 0;
Class<?> nonMatchClass = null;
-
+
for (int i = 0; i < paramTypes.length; i++) {
if (m.getParameterTypes()[i] != paramTypes[i]) {
nonMatchIndex = i;
@@ -246,7 +246,7 @@ public class ReflectionUtil {
break;
}
}
-
+
for (Method c : candidates) {
if (c.getParameterTypes()[nonMatchIndex] ==
paramTypes[nonMatchIndex]) {
@@ -255,7 +255,7 @@ public class ReflectionUtil {
return null;
}
}
-
+
// Can't be null
nonMatchClass = nonMatchClass.getSuperclass();
while (nonMatchClass != null) {
@@ -268,7 +268,7 @@ public class ReflectionUtil {
}
nonMatchClass = nonMatchClass.getSuperclass();
}
-
+
return null;
}
Modified: tomcat/trunk/java/org/apache/el/util/Validation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/Validation.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/Validation.java (original)
+++ tomcat/trunk/java/org/apache/el/util/Validation.java Sat Oct 22 21:17:12
2011
@@ -32,7 +32,7 @@ public class Validation {
"static", "strictfp", "super", "switch", "synchronized", "this",
"throw", "throws", "transient", "true", "try", "void", "volatile",
"while" };
-
+
private static final boolean IS_SECURITY_ENABLED =
(System.getSecurityManager() != null);
@@ -56,17 +56,17 @@ public class Validation {
"false")).booleanValue();
}
}
-
-
+
+
private Validation() {
// Utility class. Hide default constructor
}
-
+
/**
* Test whether the argument is a Java identifier.
*/
public static boolean isIdentifier(String key) {
-
+
if (SKIP_IDENTIFIER_CHECK) {
return true;
}
@@ -75,7 +75,7 @@ public class Validation {
if (key == null || key.length() == 0) {
return false;
}
-
+
// Check the list of known invalid values
int i = 0;
int j = invalidIdentifiers.length;
@@ -103,7 +103,7 @@ public class Validation {
return false;
}
}
-
+
return true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
