svn commit: r1561264 - in /commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers: ArchiveFormat.java spi/AbstractArchiveFormat.java

[bo...@apache.org]

Author: bodewig
Date: Sat Jan 25 06:22:39 2014
New Revision: 1561264

URL: http://svn.apache.org/r1561264
Log:
the list of formats to consult first may be too much - let's keep the implementations independent of each other

Modified:
    commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers/ArchiveFormat.java
    commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers/spi/AbstractArchiveFormat.java

Modified: commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers/ArchiveFormat.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers/ArchiveFormat.java?rev=1561264&r1=1561263&r2=1561264&view=diff
==============================================================================
--- commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers/ArchiveFormat.java (original)
+++ commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers/ArchiveFormat.java Sat Jan 25 06:22:39 2014
@@ -70,14 +70,6 @@ public interface ArchiveFormat<A extends
      */
     int getNumberOfBytesRequiredForAutodetection() throws UnsupportedOperationException;
     /**
-     * Lists formats that must not be consulted before this format during content-based detection.
-     *
-     * <p>For example JAR would return ZIP here so it first has a chance to claim the archive for itself.</p>
-     *
-     * @return the names of the formats (as returned by {@link #getName}) that must not be consulted before this format during content-based detection.
-     */
-    Iterable<String> formatsToConsultLater();
-    /**
      * Verifies the given input is readable by this format.
      * @param probe a buffer holding at least {@link #getNumberOfBytesRequiredForAutodetection} bytes
      * @return whether the input is readable by this format

Modified: commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers/spi/AbstractArchiveFormat.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers/spi/AbstractArchiveFormat.java?rev=1561264&r1=1561263&r2=1561264&view=diff
==============================================================================
--- commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers/spi/AbstractArchiveFormat.java (original)
+++ commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/archivers/spi/AbstractArchiveFormat.java Sat Jan 25 06:22:39 2014
@@ -27,7 +27,6 @@ import java.nio.channels.ReadableByteCha
 import java.nio.channels.WritableByteChannel;
 //import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
-import java.util.Collections;
 import org.apache.commons.compress2.archivers.ArchiveEntry;
 import org.apache.commons.compress2.archivers.ArchiveFormat;
 import org.apache.commons.compress2.archivers.ArchiveInput;
@@ -81,14 +80,6 @@ public abstract class AbstractArchiveFor
     }
     /**
      * {@inheritDoc}
-     * <p>This implementation always returns an empty collection.</p>
-     */
-    @Override
-    public Iterable<String> formatsToConsultLater() {
-        return Collections.emptyList();
-    }
-    /**
-     * {@inheritDoc}
      * <p>This implementation always throws an UnsupportedOperationException.</p>
      */
     @Override