Author: markt
Date: Thu Oct 23 11:18:20 2014
New Revision: 1633791
URL: http://svn.apache.org/r1633791
Log:
Fix a few Java8 Javadoc warnings
Modified:
tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java
tomcat/trunk/java/org/apache/el/parser/BooleanNode.java
tomcat/trunk/java/org/apache/el/util/Validation.java
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=1633791&r1=1633790&r2=1633791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java Thu Oct 23
11:18:20 2014
@@ -88,20 +88,10 @@ public final class MethodExpressionImpl
private Class<?>[] paramTypes;
- /**
- *
- */
public MethodExpressionImpl() {
super();
}
- /**
- * @param expr
- * @param node
- * @param fnMapper
- * @param expectedType
- * @param paramTypes
- */
public MethodExpressionImpl(String expr, Node node,
FunctionMapper fnMapper, VariableMapper varMapper,
Class<?> expectedType, Class<?>[] paramTypes) {
Modified: tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java?rev=1633791&r1=1633790&r2=1633791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java Thu Oct 23
11:18:20 2014
@@ -102,9 +102,6 @@ public final class ValueExpressionImpl e
super();
}
- /**
- *
- */
public ValueExpressionImpl(String expr, Node node, FunctionMapper fnMapper,
VariableMapper varMapper, Class<?> expectedType) {
this.expr = expr;
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=1633791&r1=1633790&r2=1633791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Thu Oct 23 11:18:20 2014
@@ -150,7 +150,7 @@ public class ELSupport {
* @param obj0 the first object
* @param obj1 the second object
* @return true if the objects are equal
- * @throws ELException
+ * @throws ELException if one of the coercion fails
*/
public static final boolean equals(final Object obj0, final Object obj1)
throws ELException {
@@ -220,6 +220,8 @@ public class ELSupport {
* Convert an object to Boolean.
* Null and empty string are false.
* @param obj the object to convert
+ * @param primitive is the target a primitive in which case coercion to
null
+ * is not permitted
* @return the Boolean value of the object
* @throws ELException if object is not Boolean or String
*/
@@ -412,8 +414,8 @@ public class ELSupport {
}
/**
- * Coerce an object to a string
- * @param obj
+ * Coerce an object to a string.
+ * @param obj the object to convert
* @return the String value of the object
*/
public static final String coerceToString(final Object obj) {
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=1633791&r1=1633790&r2=1633791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Thu Oct 23
11:18:20 2014
@@ -96,9 +96,6 @@ public class FunctionMapperImpl extends
protected String prefix;
protected String localName;
- /**
- *
- */
public Function(String prefix, String localName, Method m) {
if (localName == null) {
throw new NullPointerException("LocalName cannot be null");
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=1633791&r1=1633790&r2=1633791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java Thu Oct 23
11:18:20 2014
@@ -14,22 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.el.parser;
import javax.el.ELException;
import org.apache.el.lang.EvaluationContext;
-
/**
* @author Jacob Hookom [[email protected]]
*/
public abstract class ArithmeticNode extends SimpleNode {
- /**
- * @param i
- */
public ArithmeticNode(int i) {
super(i);
}
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=1633791&r1=1633790&r2=1633791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/BooleanNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/BooleanNode.java Thu Oct 23 11:18:20
2014
@@ -20,17 +20,15 @@ import javax.el.ELException;
import org.apache.el.lang.EvaluationContext;
-
/**
* @author Jacob Hookom [[email protected]]
*/
public abstract class BooleanNode extends SimpleNode {
- /**
- * @param i
- */
+
public BooleanNode(int i) {
super(i);
}
+
@Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
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=1633791&r1=1633790&r2=1633791&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/Validation.java (original)
+++ tomcat/trunk/java/org/apache/el/util/Validation.java Thu Oct 23 11:18:20
2014
@@ -63,7 +63,14 @@ public class Validation {
}
/**
- * Test whether the argument is a Java identifier.
+ * Test whether a string is a Java identifier. Note that the behaviour of
+ * this method depend on the system property
+ * {@code org.apache.el.parser.SKIP_IDENTIFIER_CHECK}
+ *
+ * @param key The string to test
+ *
+ * @return {@code true} if the provided String should be treated as a Java
+ * identifier, otherwise false
*/
public static boolean isIdentifier(String key) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
