commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1453124 - in /commons/proper/fileupload/trunk/src: main/java/org/apache/commons/fileupload/ main/java/org/apache/commons/fileupload/disk/ main/java/org/apache/commons/fileupload/portlet/ main/java/org/apache/commons/fileupload/servlet/ mai...
Date Wed, 06 Mar 2013 01:46:51 GMT
Author: sebb
Date: Wed Mar  6 01:46:51 2013
New Revision: 1453124

URL: http://svn.apache.org/r1453124
Log:
Add missing @Override annotations

Modified:
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUpload.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadException.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java
    commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/LimitedInputStream.java
    commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
Wed Mar  6 01:46:51 2013
@@ -97,6 +97,7 @@ public class DefaultFileItemFactory exte
      *
      * @deprecated Use <code>DiskFileItemFactory</code> instead.
      */
+    @Override
     @Deprecated
     public FileItem createItem(
             String fieldName,

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/DiskFileUpload.java
Wed Mar  6 01:46:51 2013
@@ -103,6 +103,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>FileUpload</code> instead.
      */
+    @Override
     @Deprecated
     public FileItemFactory getFileItemFactory() {
         return fileItemFactory;
@@ -118,6 +119,7 @@ public class DiskFileUpload
      *
      * @deprecated Use <code>FileUpload</code> instead.
      */
+    @Override
     @Deprecated
     public void setFileItemFactory(FileItemFactory factory) {
         this.fileItemFactory = (DefaultFileItemFactory) factory;

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUpload.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUpload.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUpload.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUpload.java
Wed Mar  6 01:46:51 2013
@@ -88,6 +88,7 @@ public class FileUpload
      *
      * @return The factory class for new file items.
      */
+    @Override
     public FileItemFactory getFileItemFactory() {
         return fileItemFactory;
     }
@@ -98,6 +99,7 @@ public class FileUpload
      *
      * @param factory The factory class for new file items.
      */
+    @Override
     public void setFileItemFactory(FileItemFactory factory) {
         this.fileItemFactory = factory;
     }

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
Wed Mar  6 01:46:51 2013
@@ -764,6 +764,7 @@ public abstract class FileUploadBase {
                         throw new FileUploadIOException(e);
                     }
                     istream = new LimitedInputStream(istream, fileSizeMax) {
+                        @Override
                         protected void raiseError(long pSizeMax, long pCount)
                                 throws IOException {
                             itemStream.close(true);
@@ -927,6 +928,7 @@ public abstract class FileUploadBase {
                 int requestSize = ctx.getContentLength();
                 if (requestSize == -1) {
                     input = new LimitedInputStream(input, sizeMax) {
+                        @Override
                         protected void raiseError(long pSizeMax, long pCount)
                                 throws IOException {
                             FileUploadException ex =
@@ -1119,6 +1121,7 @@ public abstract class FileUploadBase {
          * Returns the exceptions cause.
          * @return The exceptions cause, if any, or null.
          */
+        @Override
         public Throwable getCause() {
             return cause;
         }
@@ -1179,6 +1182,7 @@ public abstract class FileUploadBase {
          * Returns the exceptions cause.
          * @return The exceptions cause, if any, or null.
          */
+        @Override
         public Throwable getCause() {
             return cause;
         }

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadException.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadException.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadException.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/FileUploadException.java
Wed Mar  6 01:46:51 2013
@@ -71,6 +71,7 @@ public class FileUploadException extends
      *
      * @param stream <code>PrintStream</code> to use for output
      */
+    @Override
     public void printStackTrace(PrintStream stream) {
         super.printStackTrace(stream);
         if (cause != null) {
@@ -85,6 +86,7 @@ public class FileUploadException extends
      *
      * @param writer <code>PrintWriter</code> to use for output
      */
+    @Override
     public void printStackTrace(PrintWriter writer) {
         super.printStackTrace(writer);
         if (cause != null) {
@@ -93,6 +95,7 @@ public class FileUploadException extends
         }
     }
 
+    @Override
     public Throwable getCause() {
         return cause;
     }

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
Wed Mar  6 01:46:51 2013
@@ -844,6 +844,7 @@ public class MultipartStream {
          * @throws IOException An I/O error occurs.
          * @return Number of bytes in the buffer.
          */
+        @Override
         public int available() throws IOException {
             if (pos == -1) {
                 return tail - head - pad;
@@ -861,6 +862,7 @@ public class MultipartStream {
          *   integer, or -1 for EOF.
          * @throws IOException An I/O error occurred.
          */
+        @Override
         public int read() throws IOException {
             if (closed) {
                 throw new FileItemStream.ItemSkippedException();
@@ -887,6 +889,7 @@ public class MultipartStream {
          *   or -1 for EOF.
          * @throws IOException An I/O error occurred.
          */
+        @Override
         public int read(byte[] b, int off, int len) throws IOException {
             if (closed) {
                 throw new FileItemStream.ItemSkippedException();
@@ -912,6 +915,7 @@ public class MultipartStream {
          * Closes the input stream.
          * @throws IOException An I/O error occurred.
          */
+        @Override
         public void close() throws IOException {
             close(false);
         }
@@ -951,6 +955,7 @@ public class MultipartStream {
          *   skipped.
          * @throws IOException An I/O error occurred.
          */
+        @Override
         public long skip(long bytes) throws IOException {
             if (closed) {
                 throw new FileItemStream.ItemSkippedException();

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
Wed Mar  6 01:46:51 2013
@@ -596,6 +596,7 @@ public class DiskFileItem
     /**
      * Removes the file contents from the temporary storage.
      */
+    @Override
     protected void finalize() {
         File outputFile = dfos.getFile();
 
@@ -662,6 +663,7 @@ public class DiskFileItem
      *
      * @return a string representation of this object.
      */
+    @Override
     public String toString() {
         return "name=" + this.getName()
             + ", StoreLocation="

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java
Wed Mar  6 01:46:51 2013
@@ -98,6 +98,7 @@ public class PortletRequestContext imple
      *
      * @return a string representation of this object.
      */
+    @Override
     public String toString() {
         return "ContentLength="
             + this.getContentLength()

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
Wed Mar  6 01:46:51 2013
@@ -122,6 +122,7 @@ public class ServletFileUpload extends F
      * @throws FileUploadException if there are problems reading/parsing
      *                             the request or storing files.
      */
+    @Override
     public List<FileItem> parseRequest(HttpServletRequest request)
     throws FileUploadException {
         return parseRequest(new ServletRequestContext(request));

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java
Wed Mar  6 01:46:51 2013
@@ -98,6 +98,7 @@ public class ServletRequestContext imple
      *
      * @return a string representation of this object.
      */
+    @Override
     public String toString() {
         return "ContentLength="
             + this.getContentLength()

Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/LimitedInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/LimitedInputStream.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/LimitedInputStream.java
(original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/LimitedInputStream.java
Wed Mar  6 01:46:51 2013
@@ -89,6 +89,7 @@ public abstract class LimitedInputStream
      * @exception  IOException  if an I/O error occurs.
      * @see        java.io.FilterInputStream#in
      */
+    @Override
     public int read() throws IOException {
         int res = super.read();
         if (res != -1) {
@@ -121,6 +122,7 @@ public abstract class LimitedInputStream
      * @exception  IOException  if an I/O error occurs.
      * @see        java.io.FilterInputStream#in
      */
+    @Override
     public int read(byte[] b, int off, int len) throws IOException {
         int res = super.read(b, off, len);
         if (res > 0) {
@@ -148,6 +150,7 @@ public abstract class LimitedInputStream
      * @exception  IOException  if an I/O error occurs.
      * @see        java.io.FilterInputStream#in
      */
+    @Override
     public void close() throws IOException {
         closed = true;
         super.close();

Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java?rev=1453124&r1=1453123&r2=1453124&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java
(original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java
Wed Mar  6 01:46:51 2013
@@ -79,6 +79,7 @@ public class ProgressListenerTest extend
         MockHttpServletRequest request = new MockHttpServletRequest(contents, "multipart/form-data;
boundary=---1234");
         runTest(NUM_ITEMS, contents.length, request);
         request = new MockHttpServletRequest(contents, "multipart/form-data; boundary=---1234"){
+            @Override
             public int getContentLength() {
                 return -1;
             }



Mime
View raw message