Author: markt
Date: Thu Apr 10 23:48:33 2014
New Revision: 1586509
URL: http://svn.apache.org/r1586509
Log:
CTR Javadoc Fix warning
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=1586509&r1=1586508&r2=1586509&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java Thu Apr
10 23:48:33 2014
@@ -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.
@@ -42,38 +42,38 @@ import org.apache.el.util.ReflectionUtil
/**
* An <code>Expression</code> that refers to a method on an object.
- *
+ *
* <p>
* <code>The {@link 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 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 ELResolver#getValue}
- * method is used to resolve all properties up to but excluding the last
+ * <p>The {@link #getMethodInfo} and {@link #invoke} methods will evaluate the
+ * expression each time they are called. The {@link 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 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,
+ * 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 Expression} javadocs.
*
* @see javax.el.ELResolver
* @see javax.el.Expression
* @see javax.el.ExpressionFactory
* @see javax.el.MethodExpression
- *
+ *
* @author Jacob Hookom [ja...@hookom.net]
*
*/
@@ -93,7 +93,7 @@ public final class MethodExpressionImpl
private Class[] paramTypes;
/**
- *
+ *
*/
public MethodExpressionImpl() {
super();
@@ -121,7 +121,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
@@ -129,7 +129,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
@@ -137,7 +137,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
@@ -153,22 +153,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()
*/
public String getExpressionString() {
@@ -178,7 +178,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
@@ -206,10 +206,6 @@ public final class MethodExpressionImpl
return n.getMethodInfo(ctx, this.paramTypes);
}
- /**
- * @return
- * @throws ELException
- */
private Node getNode() throws ELException {
if (this.node == null) {
this.node = ExpressionBuilder.createNode(this.expr);
@@ -219,7 +215,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 +224,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
@@ -242,7 +238,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
@@ -278,7 +274,7 @@ public final class MethodExpressionImpl
/*
* (non-Javadoc)
- *
+ *
* @see java.io.Externalizable#readExternal(java.io.ObjectInput)
*/
public void readExternal(ObjectInput in) throws IOException,
@@ -296,7 +292,7 @@ public final class MethodExpressionImpl
/*
* (non-Javadoc)
- *
+ *
* @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
*/
public void writeExternal(ObjectOutput out) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
