Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java?rev=1456935&r1=1456934&r2=1456935&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/package-info.java Fri Mar 15 12:47:29 2013 @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * <p> * An implementation of
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/Closeable.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/Closeable.java?rev=1456935&r1=1456934&r2=1456935&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/Closeable.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/Closeable.java Fri Mar 15 12:47:29 2013 @@ -18,21 +18,26 @@ package org.apache.tomcat.util.http.file import java.io.IOException; - /** * Interface of an object, which may be closed. + * + * @version $Id$ */ public interface Closeable { + /** * Closes the object. + * * @throws IOException An I/O error occurred. */ void close() throws IOException; /** * Returns, whether the object is already closed. + * * @return True, if the object is closed, otherwise false. * @throws IOException An I/O error occurred. */ boolean isClosed() throws IOException; + } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java?rev=1456935&r1=1456934&r2=1456935&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java Fri Mar 15 12:47:29 2013 @@ -31,10 +31,15 @@ import org.apache.tomcat.util.http.fileu /** * Default implementation of the {@link FileItemHeaders} interface. * - * @author Michael C. Macaluso - * @since 1.3 + * @since 1.2.1 + * + * @version $Id$ */ public class FileItemHeadersImpl implements FileItemHeaders, Serializable { + + /** + * Serial version UID, being used, if serialized. + */ private static final long serialVersionUID = -4455695752627032559L; /** @@ -44,6 +49,9 @@ public class FileItemHeadersImpl impleme private final Map<String,List<String>> headerNameToValueListMap = new LinkedHashMap<String,List<String>>(); + /** + * {@inheritDoc} + */ @Override public String getHeader(String name) { String nameLower = name.toLowerCase(Locale.ENGLISH); @@ -54,11 +62,17 @@ public class FileItemHeadersImpl impleme return headerValueList.get(0); } + /** + * {@inheritDoc} + */ @Override public Iterator<String> getHeaderNames() { return headerNameToValueListMap.keySet().iterator(); } + /** + * {@inheritDoc} + */ @Override public Iterator<String> getHeaders(String name) { String nameLower = name.toLowerCase(Locale.ENGLISH); @@ -84,4 +98,5 @@ public class FileItemHeadersImpl impleme } headerValueList.add(value); } + } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java?rev=1456935&r1=1456934&r2=1456935&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java Fri Mar 15 12:47:29 2013 @@ -20,21 +20,24 @@ import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; - /** * An input stream, which limits its data size. This stream is * used, if the content length is unknown. + * + * @version $Id$ */ -public abstract class LimitedInputStream - extends FilterInputStream implements Closeable { +public abstract class LimitedInputStream extends FilterInputStream implements Closeable { + /** * The maximum size of an item, in bytes. */ - private long sizeMax; + private final long sizeMax; + /** * The current number of bytes. */ private long count; + /** * Whether this stream is already closed. */ @@ -42,6 +45,7 @@ public abstract class LimitedInputStream /** * Creates a new instance. + * * @param pIn The input stream, which shall be limited. * @param pSizeMax The limit; no more than this number of bytes * shall be returned by the source stream. @@ -54,6 +58,7 @@ public abstract class LimitedInputStream /** * Called to indicate, that the input streams limit has * been exceeded. + * * @param pSizeMax The input streams limit, in bytes. * @param pCount The actual number of bytes. * @throws IOException The called method is expected @@ -62,8 +67,10 @@ public abstract class LimitedInputStream protected abstract void raiseError(long pSizeMax, long pCount) throws IOException; - /** Called to check, whether the input streams + /** + * Called to check, whether the input streams * limit is reached. + * * @throws IOException The given limit is exceeded. */ private void checkLimit() throws IOException { @@ -134,6 +141,7 @@ public abstract class LimitedInputStream /** * Returns, whether this stream is already closed. + * * @return True, if the stream is closed, otherwise false. * @throws IOException An I/O error occurred. */ @@ -156,4 +164,5 @@ public abstract class LimitedInputStream closed = true; super.close(); } + } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java?rev=1456935&r1=1456934&r2=1456935&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/Streams.java Fri Mar 15 12:47:29 2013 @@ -23,10 +23,13 @@ import java.io.OutputStream; import org.apache.tomcat.util.http.fileupload.InvalidFileNameException; - -/** Utility class for working with streams. +/** + * Utility class for working with streams. + * + * @version $Id$ */ public final class Streams { + /** * Private constructor, to prevent instantiation. * This class has only static methods. @@ -47,6 +50,7 @@ public final class Streams { * <pre> * copy(pInputStream, pOutputStream, new byte[8192]); * </pre> + * * @param pInputStream The input stream, which is being read. * It is guaranteed, that {@link InputStream#close()} is called * on the stream. @@ -70,6 +74,7 @@ public final class Streams { /** * Copies the contents of the given {@link InputStream} * to the given {@link OutputStream}. + * * @param pIn The input stream, which is being read. * It is guaranteed, that {@link InputStream#close()} is called * on the stream. @@ -138,6 +143,7 @@ public final class Streams { * {@link org.apache.tomcat.util.http.fileupload.FileItemStream}'s * content into a string. The platform's default character encoding * is used for converting bytes into characters. + * * @param pStream The input stream to read. * @see #asString(InputStream, String) * @return The streams contents, as a string. @@ -153,6 +159,7 @@ public final class Streams { * This convenience method allows to read a * {@link org.apache.tomcat.util.http.fileupload.FileItemStream}'s * content into a string, using the given character encoding. + * * @param pStream The input stream to read. * @param pEncoding The character encoding, typically "UTF-8". * @see #asString(InputStream) @@ -171,6 +178,7 @@ public final class Streams { * that it doesn't contain any NUL characters. If the file name * is valid, it will be returned without any modifications. Otherwise, * an {@link InvalidFileNameException} is raised. + * * @param pFileName The file name to check * @return Unmodified file name, if valid. * @throws InvalidFileNameException The file name was found to be invalid. @@ -195,4 +203,5 @@ public final class Streams { } return pFileName; } + } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/QuotedPrintableDecoder.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/QuotedPrintableDecoder.java?rev=1456935&r1=1456916&r2=1456935&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/QuotedPrintableDecoder.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/mime/QuotedPrintableDecoder.java Fri Mar 15 12:47:29 2013 @@ -38,7 +38,7 @@ final class QuotedPrintableDecoder { private static final int OUT_SHIFT = 4; /** - * The decoding table size. + * the decoding table size. */ private static final int DECODING_TABLE_SIZE = 128; Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/package-info.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/package-info.java?rev=1456935&r1=1456934&r2=1456935&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/package-info.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/util/package-info.java Fri Mar 15 12:47:29 2013 @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * This package contains various IO related utility classes * or methods, which are basically reusable and not necessarily 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=1456935&r1=1456934&r2=1456935&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Mar 15 12:47:29 2013 @@ -77,6 +77,10 @@ The change will take effect when the next entry is made to the access log. (markt) </add> + <update> + Update Tomcat's internal copy of Commons FileUpload to FileUpload trunk, + revision 1456918. (markt) + </update> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
