Author: markt
Date: Tue Aug 14 19:47:38 2012
New Revision: 1373051
URL: http://svn.apache.org/viewvc?rev=1373051&view=rev
Log:
Javadoc fixes provided by Sebb.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspException.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/ErrorHandler.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1373003
Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspException.java?rev=1373051&r1=1373050&r2=1373051&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspException.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspException.java Tue Aug 14
19:47:38 2012
@@ -53,7 +53,7 @@ public class JspException extends Except
* <code>java.lang.Throwable.getCause()</code> and {@link #getRootCause()}
* methods.
*
- * @see <code>java.lang.Exception.Exception(String, Throwable)</code>
+ * @see java.lang.Exception#Exception(String, Throwable)
*
* @param message a <code>String</code> containing the text of the
* exception message
@@ -74,7 +74,7 @@ public class JspException extends Except
* <code>java.lang.Throwable.getCause()</code> and {@link #getRootCause()}
* methods.
*
- * @see <code>java.lang.Exception.Exception(Throwable)</code>
+ * @see java.lang.Exception#Exception(Throwable)
*
* @param cause the <code>Throwable</code> exception that
* interfered with the JSP's normal operation, making
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java?rev=1373051&r1=1373050&r2=1373051&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java Tue Aug 14
19:47:38 2012
@@ -31,7 +31,7 @@ public interface Executor extends java.u
* time until it throws a RejectedExecutionException
*
* @param command the runnable task
- * @throws org.apache.catalina.util.RejectedExecutionException if this task
+ * @throws java.util.concurrent.RejectedExecutionException if this task
* cannot be accepted for execution - the queue is full
* @throws NullPointerException if command or unit is null
*/
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/ErrorHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/ErrorHandler.java?rev=1373051&r1=1373050&r2=1373051&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/ErrorHandler.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/ErrorHandler.java Tue
Aug 14 19:47:38 2012
@@ -32,14 +32,14 @@ public interface ErrorHandler {
* Invoked if the message is dispatched asynch, and an error occurs
* @param x ChannelException - the error that happened
* @param id - the unique id for the message
- * @see Channel#send(Member[], Serializable, int, ErrorHandler)
+ * @see Channel#send(Member[], java.io.Serializable, int, ErrorHandler)
*/
public void handleError(ChannelException x, UniqueId id);
/**
* Invoked when the message has been sent successfully.
* @param id - the unique id for the message
- * @see Channel#send(Member[], Serializable, int, ErrorHandler)
+ * @see Channel#send(Member[], java.io.Serializable, int, ErrorHandler)
*/
public void handleCompletion(UniqueId id);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java?rev=1373051&r1=1373050&r2=1373051&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java Tue Aug 14
19:47:38 2012
@@ -168,7 +168,7 @@ public class SelectorContext implements
* @param obj the object to bind; possibly null
* @exception javax.naming.NameAlreadyBoundException if name is already
* bound
- * @exception javax.naming.InvalidAttributesException if object did not
+ * @exception javax.naming.directory.InvalidAttributesException if object
did not
* supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
@@ -186,7 +186,7 @@ public class SelectorContext implements
* @param obj the object to bind; possibly null
* @exception javax.naming.NameAlreadyBoundException if name is already
* bound
- * @exception javax.naming.InvalidAttributesException if object did not
+ * @exception javax.naming.directory.InvalidAttributesException if object
did not
* supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
@@ -208,7 +208,7 @@ public class SelectorContext implements
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception javax.naming.InvalidAttributesException if object did not
+ * @exception javax.naming.directory.InvalidAttributesException if object
did not
* supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
@@ -224,7 +224,7 @@ public class SelectorContext implements
*
* @param name the name to bind; may not be empty
* @param obj the object to bind; possibly null
- * @exception javax.naming.InvalidAttributesException if object did not
+ * @exception javax.naming.directory.InvalidAttributesException if object
did not
* supply all mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
@@ -461,7 +461,7 @@ public class SelectorContext implements
* @return the newly created context
* @exception javax.naming.NameAlreadyBoundException if name is already
* bound
- * @exception javax.naming.InvalidAttributesException if creation of the
+ * @exception javax.naming.directory.InvalidAttributesException if
creation of the
* sub-context requires specification of mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
@@ -479,7 +479,7 @@ public class SelectorContext implements
* @return the newly created context
* @exception javax.naming.NameAlreadyBoundException if name is already
* bound
- * @exception javax.naming.InvalidAttributesException if creation of the
+ * @exception javax.naming.directory.InvalidAttributesException if
creation of the
* sub-context requires specification of mandatory attributes
* @exception NamingException if a naming exception is encountered
*/
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java?rev=1373051&r1=1373050&r2=1373051&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
Tue Aug 14 19:47:38 2012
@@ -30,7 +30,7 @@ import java.io.UnsupportedEncodingExcept
* <p> After retrieving an instance of this class from a {@link
* org.apache.tomcat.util.http.fileupload.FileUpload FileUpload} instance (see
* {@link org.apache.tomcat.util.http.fileupload.FileUpload
- * #parseRequest(javax.servlet.http.HttpServletRequest)}), you may
+ * #parseRequest(RequestContext)}), you may
* either request all contents of the file at once using {@link #get()} or
* request an {@link java.io.InputStream InputStream} with
* {@link #getInputStream()} and process the file without attempting to load
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1373051&r1=1373050&r2=1373051&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Aug 14 19:47:38 2012
@@ -204,6 +204,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ <bug>53701</bug>: Javadoc fixes. Patch provided by sebb. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.29 (markt)" rtext="released 2012-07-08">
<subsection name="Catalina">
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java?rev=1373051&r1=1373050&r2=1373051&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
Tue Aug 14 19:47:38 2012
@@ -36,9 +36,8 @@ public class CompressionResponseStream e
/**
* Construct a servlet output stream associated with the specified
Response.
*
- * @param response The associated response
- * @param response
- * @param originalOutput
+ * @param responseWrapper The associated response wrapper
+ * @param originalOutput the output stream
*/
public CompressionResponseStream(
CompressionServletResponseWrapper responseWrapper,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
