Author: markt
Date: Thu Aug 30 23:13:32 2012
New Revision: 1379214
URL: http://svn.apache.org/viewvc?rev=1379214&view=rev
Log:
Javadoc fixes
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/ConcurrentMessageDigest.java
tomcat/tc7.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/el/ValueExpressionImpl.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1379213
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1379214&r1=1379213&r2=1379214&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Thu Aug 30 23:13:32 2012
@@ -1197,7 +1197,7 @@ public class ManagerServlet extends Http
* @param cn Name of the application to list session information for
*
* @deprecated Use {@link #sessions(PrintWriter, ContextName, int,
- * StringManager)
+ * StringManager)}
*/
@Deprecated
protected void sessions(PrintWriter writer, ContextName cn,
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?rev=1379214&r1=1379213&r2=1379214&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
Thu Aug 30 23:13:32 2012
@@ -237,7 +237,7 @@ public class RpcChannel implements Chann
public long timeout;
/**
- * @deprecated Use {@link RpcCollector#RpcCollector(RpcCollectorKey,
+ * @deprecated Use {@link RpcCollector(RpcCollectorKey,
* int, int)}
*/
@Deprecated
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/ConcurrentMessageDigest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/ConcurrentMessageDigest.java?rev=1379214&r1=1379213&r2=1379214&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/ConcurrentMessageDigest.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/ConcurrentMessageDigest.java
Thu Aug 30 23:13:32 2012
@@ -80,11 +80,9 @@ public class ConcurrentMessageDigest {
/**
- * Ensures that {@link #digest(String, byte[])} and
- * {@link #digestAsHex(String, byte[])} will support the specified
+ * Ensures that {@link #digest(String, byte[])} will support the specified
* algorithm. This method <b>must</b> be called and return successfully
- * before using {@link #digest(String, byte[])} or
- * {@link #digestAsHex(String, byte[])}.
+ * before using {@link #digest(String, byte[])}.
*
* @param algorithm The message digest algorithm to be supported
*
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=1379214&r1=1379213&r2=1379214&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/MethodExpressionImpl.java Thu Aug
30 23:13:32 2012
@@ -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);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/ValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/ValueExpressionImpl.java?rev=1379214&r1=1379213&r2=1379214&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/el/ValueExpressionImpl.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/ValueExpressionImpl.java Thu Aug 30
23:13:32 2012
@@ -152,10 +152,6 @@ public final class ValueExpressionImpl e
return this.expr;
}
- /**
- * @return
- * @throws ELException
- */
private Node getNode() throws ELException {
if (this.node == null) {
this.node = ExpressionBuilder.createNode(this.expr);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
