Style cleanup

krosenvold · krosenvold · commit 5d599b1c1f9c · 2015-05-29T19:16:47.000+02:00
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
@@ -77,7 +77,8 @@ public abstract class AbstractArchiver
     /**
      * A list of the following objects:
      * <ul>
-     * <li>Instances of {@link ArchiveEntry}, which are passed back by {@link #getResources()} without modifications.</li>
+     * <li>Instances of {@link ArchiveEntry}, which are passed back by {@link #getResources()} without modifications
+     * .</li>
      * <li>Instances of {@link PlexusIoResourceCollection}, which are converted into an {@link Iterator} over instances
      * of {@link ArchiveEntry} by {@link #getResources()}.
      * </ul>
@@ -107,7 +108,8 @@ public abstract class AbstractArchiver
     // On lunix-like systems, we replace windows backslashes with forward slashes
     private final boolean replacePathSlashesToJavaPaths = File.separatorChar == '/';
 
-    private final List<Closeable> closeables = new ArrayList<Closeable>(  );
+    private final List<Closeable> closeables = new ArrayList<Closeable>();
+
     /**
      * since 2.2 is on by default
      *
@@ -118,30 +120,36 @@ public abstract class AbstractArchiver
     // contextualized.
     private ArchiverManager archiverManager;
 
-    private static class ResourceCollectionWithModes
+    private static class AddedResourceCollection
     {
         private final PlexusIoResourceCollection resources;
+
         private final int forcedFileMode;
+
         private final int forcedDirectoryMode;
 
-        public ResourceCollectionWithModes( PlexusIoResourceCollection resources, int forcedFileMode,
-                                            int forcedDirMode )
+        public AddedResourceCollection( PlexusIoResourceCollection resources, int forcedFileMode, int forcedDirMode )
         {
             this.resources = resources;
             this.forcedFileMode = forcedFileMode;
             this.forcedDirectoryMode = forcedDirMode;
         }
 
-        private int maybeOverridden(int suggestedMode, boolean isDir){
-            if (isDir){
+        private int maybeOverridden( int suggestedMode, boolean isDir )
+        {
+            if ( isDir )
+            {
                 return forcedDirectoryMode >= 0 ? forcedDirectoryMode : suggestedMode;
-            } else {
+            }
+            else
+            {
                 return forcedFileMode >= 0 ? forcedFileMode : suggestedMode;
 
             }
         }
 
     }
+
     /**
      * @since 1.1
      */
@@ -376,8 +384,8 @@ public void addSymlink( String symlinkName, String symlinkDestination )
     public void addSymlink( String symlinkName, int permissions, String symlinkDestination )
         throws ArchiverException
     {
-        doAddResource( ArchiveEntry.createSymlinkEntry( symlinkName, permissions, symlinkDestination,
-                                                        getDirectoryMode() ) );
+        doAddResource(
+            ArchiveEntry.createSymlinkEntry( symlinkName, permissions, symlinkDestination, getDirectoryMode() ) );
     }
 
     protected ArchiveEntry asArchiveEntry( @Nonnull final PlexusIoResource resource, final String destFileName,
@@ -391,52 +399,34 @@ protected ArchiveEntry asArchiveEntry( @Nonnull final PlexusIoResource resource,
 
         if ( resource.isFile() )
         {
-            return ArchiveEntry.createFileEntry( destFileName, resource, permissions, collection,
-                                                 getDirectoryMode() );
+            return ArchiveEntry.createFileEntry( destFileName, resource, permissions, collection, getDirectoryMode() );
         }
         else
         {
             return ArchiveEntry.createDirectoryEntry( destFileName, resource, permissions, getDirectoryMode() );
         }
     }
 
-    private int maybeOverridden(int suggestedMode, boolean isDir){
-        if (isDir){
+    private int maybeOverridden( int suggestedMode, boolean isDir )
+    {
+        if ( isDir )
+        {
             return forcedDirectoryMode >= 0 ? forcedDirectoryMode : suggestedMode;
-        } else {
-            return forcedFileMode >= 0 ? forcedFileMode : suggestedMode;
-
         }
-    }
-
-    protected ArchiveEntry asArchiveEntry( final PlexusIoResourceCollection collection,
-                                           final PlexusIoResource resource )
-        throws ArchiverException
-    {
-        final String destFileName = collection.getName( resource );
-
-        int fromResource = -1;
-        if ( resource instanceof ResourceAttributeSupplier)
+        else
         {
-            final PlexusIoResourceAttributes attrs = ( (ResourceAttributeSupplier) resource ).getAttributes();
+            return forcedFileMode >= 0 ? forcedFileMode : suggestedMode;
 
-            if ( attrs != null )
-            {
-                fromResource = attrs.getOctalMode();
-            }
         }
-
-        return asArchiveEntry( resource, destFileName, maybeOverridden(fromResource, resource.isDirectory()), collection );
     }
 
-    protected ArchiveEntry asArchiveEntry( final ResourceCollectionWithModes collection,
-                                           final PlexusIoResource resource )
+    private ArchiveEntry asArchiveEntry( final AddedResourceCollection collection, final PlexusIoResource resource )
         throws ArchiverException
     {
         final String destFileName = collection.resources.getName( resource );
 
         int fromResource = -1;
-        if ( resource instanceof ResourceAttributeSupplier)
+        if ( resource instanceof ResourceAttributeSupplier )
         {
             final PlexusIoResourceAttributes attrs = ( (ResourceAttributeSupplier) resource ).getAttributes();
 
@@ -446,8 +436,9 @@ protected ArchiveEntry asArchiveEntry( final ResourceCollectionWithModes collect
             }
         }
 
-        return asArchiveEntry( resource, destFileName, collection.maybeOverridden( fromResource,
-                                                                                   resource.isDirectory() ), collection.resources );
+        return asArchiveEntry( resource, destFileName,
+                               collection.maybeOverridden( fromResource, resource.isDirectory() ),
+                               collection.resources );
     }
 
 
@@ -518,7 +509,7 @@ public ResourceIterator getResources()
         {
             private final Iterator addedResourceIter = resources.iterator();
 
-            private ResourceCollectionWithModes currentResourceCollection;
+            private AddedResourceCollection currentResourceCollection;
 
             private Iterator ioResourceIter;
 
@@ -541,9 +532,9 @@ public boolean hasNext()
                                 {
                                     nextEntry = (ArchiveEntry) o;
                                 }
-                                else if ( o instanceof ResourceCollectionWithModes )
+                                else if ( o instanceof AddedResourceCollection )
                                 {
-                                    currentResourceCollection = (ResourceCollectionWithModes) o;
+                                    currentResourceCollection = (AddedResourceCollection) o;
 
                                     try
                                     {
@@ -584,7 +575,7 @@ else if ( o instanceof ResourceCollectionWithModes )
                         }
                     }
 
-                    if ( nextEntry != null && seenEntries.contains( normalizedForDuplicateCheck(nextEntry) ))
+                    if ( nextEntry != null && seenEntries.contains( normalizedForDuplicateCheck( nextEntry ) ) )
                     {
                         final String path = nextEntry.getName();
 
@@ -632,7 +623,7 @@ public ArchiveEntry next()
                 final ArchiveEntry next = nextEntry;
                 nextEntry = null;
 
-                seenEntries.add( normalizedForDuplicateCheck(next) );
+                seenEntries.add( normalizedForDuplicateCheck( next ) );
 
                 return next;
             }
@@ -642,8 +633,9 @@ public void remove()
                 throw new UnsupportedOperationException( "Does not support iterator" );
             }
 
-            private String normalizedForDuplicateCheck(ArchiveEntry entry){
-                return entry.getName().replace( '\\', '/'  );
+            private String normalizedForDuplicateCheck( ArchiveEntry entry )
+            {
+                return entry.getName().replace( '\\', '/' );
             }
 
         };
@@ -767,8 +759,9 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet
                 "Error adding archived file-set. PlexusIoResourceCollection not found for: " + archiveFile, e );
         }
 
-        if (resources instanceof EncodingSupported ) {
-            ((EncodingSupported)resources).setEncoding( charset );
+        if ( resources instanceof EncodingSupported )
+        {
+            ( (EncodingSupported) resources ).setEncoding( charset );
         }
 
         if ( resources instanceof PlexusIoArchivedResourceCollection )
@@ -815,10 +808,11 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet
     public void addResources( final PlexusIoResourceCollection collection )
         throws ArchiverException
     {
-        doAddResource( new ResourceCollectionWithModes( collection, forcedFileMode, forcedDirectoryMode ));
+        doAddResource( new AddedResourceCollection( collection, forcedFileMode, forcedDirectoryMode ) );
     }
 
-    private void doAddResource(Object item){
+    private void doAddResource( Object item )
+    {
         resources.add( item );
     }
 
@@ -956,11 +950,11 @@ protected boolean isUptodate()
             {
                 l = ( (ArchiveEntry) o ).getResource().getLastModified();
             }
-            else if ( o instanceof ResourceCollectionWithModes )
+            else if ( o instanceof AddedResourceCollection )
             {
                 try
                 {
-                    l = ( (ResourceCollectionWithModes) o ).resources.getLastModified();
+                    l = ( (AddedResourceCollection) o ).resources.getLastModified();
                 }
                 catch ( final IOException e )
                 {
@@ -1096,11 +1090,15 @@ protected void validate()
 
     protected abstract String getArchiveType();
 
-    private void addCloseable(Object maybeCloseable){
-        if (maybeCloseable instanceof  Closeable)
+    private void addCloseable( Object maybeCloseable )
+    {
+        if ( maybeCloseable instanceof Closeable )
+        {
             closeables.add( (Closeable) maybeCloseable );
+        }
 
     }
+
     private void closeIterators()
     {
         for ( Closeable closeable : closeables )
@@ -1109,6 +1107,7 @@ private void closeIterators()
         }
 
     }
+
     protected abstract void close()
         throws IOException;
 
diff --git a/src/main/java/org/codehaus/plexus/archiver/ear/EarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/ear/EarArchiver.java
@@ -17,7 +17,6 @@
  *
  */
 
-import org.apache.commons.compress.archivers.zip.ParallelScatterZipCreator;
 import org.codehaus.plexus.archiver.ArchiveEntry;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java
@@ -17,7 +17,6 @@
  *  limitations under the License.
  */
 
-import org.apache.commons.compress.archivers.zip.ParallelScatterZipCreator;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.apache.commons.compress.archivers.zip.ZipEncoding;
diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java
@@ -42,12 +42,9 @@
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.components.io.attributes.SimpleResourceAttributes;
-import org.codehaus.plexus.components.io.functions.ContentSupplier;
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
-import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
 import org.codehaus.plexus.components.io.resources.ResourceFactory;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,8 @@ public abstract class AbstractArchiver`
`77`	`77`	`/**`
`78`	`78`	`* A list of the following objects:`
`79`	`79`	`* <ul>`
`80`		`- * <li>Instances of {@link ArchiveEntry}, which are passed back by {@link #getResources()} without modifications.</li>`
	`80`	`+ * <li>Instances of {@link ArchiveEntry}, which are passed back by {@link #getResources()} without modifications`
	`81`	`+ * .</li>`
`81`	`82`	`* <li>Instances of {@link PlexusIoResourceCollection}, which are converted into an {@link Iterator} over instances`
`82`	`83`	`* of {@link ArchiveEntry} by {@link #getResources()}.`
`83`	`84`	`* </ul>`
`@@ -107,7 +108,8 @@ public abstract class AbstractArchiver`
`107`	`108`	`// On lunix-like systems, we replace windows backslashes with forward slashes`
`108`	`109`	`private final boolean replacePathSlashesToJavaPaths = File.separatorChar == '/';`
`109`	`110`
`110`		`- private final List<Closeable> closeables = new ArrayList<Closeable>( );`
	`111`	`+ private final List<Closeable> closeables = new ArrayList<Closeable>();`
	`112`	`+`
`111`	`113`	`/**`
`112`	`114`	`* since 2.2 is on by default`
`113`	`115`	`*`
`@@ -118,30 +120,36 @@ public abstract class AbstractArchiver`
`118`	`120`	`// contextualized.`
`119`	`121`	`private ArchiverManager archiverManager;`
`120`	`122`
`121`		`- private static class ResourceCollectionWithModes`
	`123`	`+ private static class AddedResourceCollection`
`122`	`124`	`{`
`123`	`125`	`private final PlexusIoResourceCollection resources;`
	`126`	`+`
`124`	`127`	`private final int forcedFileMode;`
	`128`	`+`
`125`	`129`	`private final int forcedDirectoryMode;`
`126`	`130`
`127`		`- public ResourceCollectionWithModes( PlexusIoResourceCollection resources, int forcedFileMode,`
`128`		`- int forcedDirMode )`
	`131`	`+ public AddedResourceCollection( PlexusIoResourceCollection resources, int forcedFileMode, int forcedDirMode )`
`129`	`132`	`{`
`130`	`133`	`this.resources = resources;`
`131`	`134`	`this.forcedFileMode = forcedFileMode;`
`132`	`135`	`this.forcedDirectoryMode = forcedDirMode;`
`133`	`136`	`}`
`134`	`137`
`135`		`- private int maybeOverridden(int suggestedMode, boolean isDir){`
`136`		`- if (isDir){`
	`138`	`+ private int maybeOverridden( int suggestedMode, boolean isDir )`
	`139`	`+ {`
	`140`	`+ if ( isDir )`
	`141`	`+ {`
`137`	`142`	`return forcedDirectoryMode >= 0 ? forcedDirectoryMode : suggestedMode;`
`138`		`- } else {`
	`143`	`+ }`
	`144`	`+ else`
	`145`	`+ {`
`139`	`146`	`return forcedFileMode >= 0 ? forcedFileMode : suggestedMode;`
`140`	`147`
`141`	`148`	`}`
`142`	`149`	`}`
`143`	`150`
`144`	`151`	`}`
	`152`	`+`
`145`	`153`	`/**`
`146`	`154`	`* @since 1.1`
`147`	`155`	`*/`
`@@ -376,8 +384,8 @@ public void addSymlink( String symlinkName, String symlinkDestination )`
`376`	`384`	`public void addSymlink( String symlinkName, int permissions, String symlinkDestination )`
`377`	`385`	`throws ArchiverException`
`378`	`386`	`{`
`379`		`- doAddResource( ArchiveEntry.createSymlinkEntry( symlinkName, permissions, symlinkDestination,`
`380`		`- getDirectoryMode() ) );`
	`387`	`+ doAddResource(`
	`388`	`+ ArchiveEntry.createSymlinkEntry( symlinkName, permissions, symlinkDestination, getDirectoryMode() ) );`
`381`	`389`	`}`
`382`	`390`
`383`	`391`	`protected ArchiveEntry asArchiveEntry( @Nonnull final PlexusIoResource resource, final String destFileName,`
`@@ -391,52 +399,34 @@ protected ArchiveEntry asArchiveEntry( @Nonnull final PlexusIoResource resource,`
`391`	`399`
`392`	`400`	`if ( resource.isFile() )`
`393`	`401`	`{`
`394`		`- return ArchiveEntry.createFileEntry( destFileName, resource, permissions, collection,`
`395`		`- getDirectoryMode() );`
	`402`	`+ return ArchiveEntry.createFileEntry( destFileName, resource, permissions, collection, getDirectoryMode() );`
`396`	`403`	`}`
`397`	`404`	`else`
`398`	`405`	`{`
`399`	`406`	`return ArchiveEntry.createDirectoryEntry( destFileName, resource, permissions, getDirectoryMode() );`
`400`	`407`	`}`
`401`	`408`	`}`
`402`	`409`
`403`		`- private int maybeOverridden(int suggestedMode, boolean isDir){`
`404`		`- if (isDir){`
	`410`	`+ private int maybeOverridden( int suggestedMode, boolean isDir )`
	`411`	`+ {`
	`412`	`+ if ( isDir )`
	`413`	`+ {`
`405`	`414`	`return forcedDirectoryMode >= 0 ? forcedDirectoryMode : suggestedMode;`
`406`		`- } else {`
`407`		`- return forcedFileMode >= 0 ? forcedFileMode : suggestedMode;`
`408`		`-`
`409`	`415`	`}`
`410`		`- }`
`411`		`-`
`412`		`- protected ArchiveEntry asArchiveEntry( final PlexusIoResourceCollection collection,`
`413`		`- final PlexusIoResource resource )`
`414`		`- throws ArchiverException`
`415`		`- {`
`416`		`- final String destFileName = collection.getName( resource );`
`417`		`-`
`418`		`- int fromResource = -1;`
`419`		`- if ( resource instanceof ResourceAttributeSupplier)`
	`416`	`+ else`
`420`	`417`	`{`
`421`		`- final PlexusIoResourceAttributes attrs = ( (ResourceAttributeSupplier) resource ).getAttributes();`
	`418`	`+ return forcedFileMode >= 0 ? forcedFileMode : suggestedMode;`
`422`	`419`
`423`		`- if ( attrs != null )`
`424`		`- {`
`425`		`- fromResource = attrs.getOctalMode();`
`426`		`- }`
`427`	`420`	`}`
`428`		`-`
`429`		`- return asArchiveEntry( resource, destFileName, maybeOverridden(fromResource, resource.isDirectory()), collection );`
`430`	`421`	`}`
`431`	`422`
`432`		`- protected ArchiveEntry asArchiveEntry( final ResourceCollectionWithModes collection,`
`433`		`- final PlexusIoResource resource )`
	`423`	`+ private ArchiveEntry asArchiveEntry( final AddedResourceCollection collection, final PlexusIoResource resource )`
`434`	`424`	`throws ArchiverException`
`435`	`425`	`{`
`436`	`426`	`final String destFileName = collection.resources.getName( resource );`
`437`	`427`
`438`	`428`	`int fromResource = -1;`
`439`		`- if ( resource instanceof ResourceAttributeSupplier)`
	`429`	`+ if ( resource instanceof ResourceAttributeSupplier )`
`440`	`430`	`{`
`441`	`431`	`final PlexusIoResourceAttributes attrs = ( (ResourceAttributeSupplier) resource ).getAttributes();`
`442`	`432`
`@@ -446,8 +436,9 @@ protected ArchiveEntry asArchiveEntry( final ResourceCollectionWithModes collect`
`446`	`436`	`}`
`447`	`437`	`}`
`448`	`438`
`449`		`- return asArchiveEntry( resource, destFileName, collection.maybeOverridden( fromResource,`
`450`		`- resource.isDirectory() ), collection.resources );`
	`439`	`+ return asArchiveEntry( resource, destFileName,`
	`440`	`+ collection.maybeOverridden( fromResource, resource.isDirectory() ),`
	`441`	`+ collection.resources );`
`451`	`442`	`}`
`452`	`443`
`453`	`444`
`@@ -518,7 +509,7 @@ public ResourceIterator getResources()`
`518`	`509`	`{`
`519`	`510`	`private final Iterator addedResourceIter = resources.iterator();`
`520`	`511`
`521`		`- private ResourceCollectionWithModes currentResourceCollection;`
	`512`	`+ private AddedResourceCollection currentResourceCollection;`
`522`	`513`
`523`	`514`	`private Iterator ioResourceIter;`
`524`	`515`
`@@ -541,9 +532,9 @@ public boolean hasNext()`
`541`	`532`	`{`
`542`	`533`	`nextEntry = (ArchiveEntry) o;`
`543`	`534`	`}`
`544`		`- else if ( o instanceof ResourceCollectionWithModes )`
	`535`	`+ else if ( o instanceof AddedResourceCollection )`
`545`	`536`	`{`
`546`		`- currentResourceCollection = (ResourceCollectionWithModes) o;`
	`537`	`+ currentResourceCollection = (AddedResourceCollection) o;`
`547`	`538`
`548`	`539`	`try`
`549`	`540`	`{`
`@@ -584,7 +575,7 @@ else if ( o instanceof ResourceCollectionWithModes )`
`584`	`575`	`}`
`585`	`576`	`}`
`586`	`577`
`587`		`- if ( nextEntry != null && seenEntries.contains( normalizedForDuplicateCheck(nextEntry) ))`
	`578`	`+ if ( nextEntry != null && seenEntries.contains( normalizedForDuplicateCheck( nextEntry ) ) )`
`588`	`579`	`{`
`589`	`580`	`final String path = nextEntry.getName();`
`590`	`581`
`@@ -632,7 +623,7 @@ public ArchiveEntry next()`
`632`	`623`	`final ArchiveEntry next = nextEntry;`
`633`	`624`	`nextEntry = null;`
`634`	`625`
`635`		`- seenEntries.add( normalizedForDuplicateCheck(next) );`
	`626`	`+ seenEntries.add( normalizedForDuplicateCheck( next ) );`
`636`	`627`
`637`	`628`	`return next;`
`638`	`629`	`}`
`@@ -642,8 +633,9 @@ public void remove()`
`642`	`633`	`throw new UnsupportedOperationException( "Does not support iterator" );`
`643`	`634`	`}`
`644`	`635`
`645`		`- private String normalizedForDuplicateCheck(ArchiveEntry entry){`
`646`		`- return entry.getName().replace( '\\', '/' );`
	`636`	`+ private String normalizedForDuplicateCheck( ArchiveEntry entry )`
	`637`	`+ {`
	`638`	`+ return entry.getName().replace( '\\', '/' );`
`647`	`639`	`}`
`648`	`640`
`649`	`641`	`};`
`@@ -767,8 +759,9 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet`
`767`	`759`	`"Error adding archived file-set. PlexusIoResourceCollection not found for: " + archiveFile, e );`
`768`	`760`	`}`
`769`	`761`
`770`		`- if (resources instanceof EncodingSupported ) {`
`771`		`- ((EncodingSupported)resources).setEncoding( charset );`
	`762`	`+ if ( resources instanceof EncodingSupported )`
	`763`	`+ {`
	`764`	`+ ( (EncodingSupported) resources ).setEncoding( charset );`
`772`	`765`	`}`
`773`	`766`
`774`	`767`	`if ( resources instanceof PlexusIoArchivedResourceCollection )`
`@@ -815,10 +808,11 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet`
`815`	`808`	`public void addResources( final PlexusIoResourceCollection collection )`
`816`	`809`	`throws ArchiverException`
`817`	`810`	`{`
`818`		`- doAddResource( new ResourceCollectionWithModes( collection, forcedFileMode, forcedDirectoryMode ));`
	`811`	`+ doAddResource( new AddedResourceCollection( collection, forcedFileMode, forcedDirectoryMode ) );`
`819`	`812`	`}`
`820`	`813`
`821`		`- private void doAddResource(Object item){`
	`814`	`+ private void doAddResource( Object item )`
	`815`	`+ {`
`822`	`816`	`resources.add( item );`
`823`	`817`	`}`
`824`	`818`
`@@ -956,11 +950,11 @@ protected boolean isUptodate()`
`956`	`950`	`{`
`957`	`951`	`l = ( (ArchiveEntry) o ).getResource().getLastModified();`
`958`	`952`	`}`
`959`		`- else if ( o instanceof ResourceCollectionWithModes )`
	`953`	`+ else if ( o instanceof AddedResourceCollection )`
`960`	`954`	`{`
`961`	`955`	`try`
`962`	`956`	`{`
`963`		`- l = ( (ResourceCollectionWithModes) o ).resources.getLastModified();`
	`957`	`+ l = ( (AddedResourceCollection) o ).resources.getLastModified();`
`964`	`958`	`}`
`965`	`959`	`catch ( final IOException e )`
`966`	`960`	`{`
`@@ -1096,11 +1090,15 @@ protected void validate()`
`1096`	`1090`
`1097`	`1091`	`protected abstract String getArchiveType();`
`1098`	`1092`
`1099`		`- private void addCloseable(Object maybeCloseable){`
`1100`		`- if (maybeCloseable instanceof Closeable)`
	`1093`	`+ private void addCloseable( Object maybeCloseable )`
	`1094`	`+ {`
	`1095`	`+ if ( maybeCloseable instanceof Closeable )`
	`1096`	`+ {`
`1101`	`1097`	`closeables.add( (Closeable) maybeCloseable );`
	`1098`	`+ }`
`1102`	`1099`
`1103`	`1100`	`}`
	`1101`	`+`
`1104`	`1102`	`private void closeIterators()`
`1105`	`1103`	`{`
`1106`	`1104`	`for ( Closeable closeable : closeables )`
`@@ -1109,6 +1107,7 @@ private void closeIterators()`
`1109`	`1107`	`}`
`1110`	`1108`
`1111`	`1109`	`}`
	`1110`	`+`
`1112`	`1111`	`protected abstract void close()`
`1113`	`1112`	`throws IOException;`
`1114`	`1113`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`*`
`18`	`18`	`*/`
`19`	`19`
`20`		`-import org.apache.commons.compress.archivers.zip.ParallelScatterZipCreator;`
`21`	`20`	`import org.codehaus.plexus.archiver.ArchiveEntry;`
`22`	`21`	`import org.codehaus.plexus.archiver.ArchiverException;`
`23`	`22`	`import org.codehaus.plexus.archiver.jar.JarArchiver;`