misc typos or little code improvements

Author: hboutemy

src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java

@@ -50,7 +50,6 @@
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-import org.codehaus.plexus.util.Os;
 import static org.codehaus.plexus.archiver.util.DefaultArchivedFileSet.archivedFileSet;
 import static org.codehaus.plexus.archiver.util.DefaultFileSet.fileSet;
 

src/main/java/org/codehaus/plexus/archiver/Archiver.java

@@ -95,7 +95,8 @@ void addDirectory( @Nonnull File directory, String prefix )
         throws ArchiverException;
 
     /**
-     * Obsolete, use {@link #addFileSet(FileSet)}.You can use "inline" of this method in your
+     * Obsolete, use {@link #addFileSet(FileSet)}.
+     * You can use "inline" of this method in your
      * IDE to get the proper implementation for this release.
      *
      * @deprecated Will go away in next major version
@@ -141,7 +142,8 @@ void addFile( @Nonnull File inputFile, @Nonnull String destFileName, int permiss
         throws ArchiverException;
 
     /**
-     * Obsolete, use {@link #addArchivedFileSet(ArchivedFileSet)}. You can use "inline" of this method in your
+     * Obsolete, use {@link #addArchivedFileSet(ArchivedFileSet)}.
+     * You can use "inline" of this method in your
      * IDE to get the proper implementation for this release.
      *
      * @deprecated Will go away in next major version
@@ -150,7 +152,8 @@ void addArchivedFileSet( @Nonnull File archiveFile )
         throws ArchiverException;
 
     /**
-     * Obsolete, use {@link #addArchivedFileSet(ArchivedFileSet)}. You can use "inline" of this method in your
+     * Obsolete, use {@link #addArchivedFileSet(ArchivedFileSet)}.
+     * You can use "inline" of this method in your
      * IDE to get the proper implementation for this release.
      *
      * @deprecated Will go away in next major version
@@ -160,7 +163,8 @@ void addArchivedFileSet( @Nonnull File archiveFile, String prefix )
         throws ArchiverException;
 
     /**
-     * Obsolete, use {@link #addArchivedFileSet(ArchivedFileSet)}. You can use "inline" of this method in your
+     * Obsolete, use {@link #addArchivedFileSet(ArchivedFileSet)}.
+     * You can use "inline" of this method in your
      * IDE to get the proper implementation for this release.
      *
      * @deprecated Will go away in next major version
@@ -170,7 +174,8 @@ void addArchivedFileSet( File archiveFile, String[] includes, String[] excludes
         throws ArchiverException;
 
     /**
-     * Obsolete, use {@link #addArchivedFileSet(ArchivedFileSet)}. You can use "inline" of this method in your
+     * Obsolete, use {@link #addArchivedFileSet(ArchivedFileSet)}.
+     * You can use "inline" of this method in your
      * IDE to get the proper implementation for this release.
      *
      * @deprecated Will go away in next major version
@@ -224,7 +229,7 @@ void addResource( PlexusIoResource resource, String destFileName, int permission
     /**
      * Adds the given resource collection to the archive.
      *
-     * Stream transformers are supported om this method
+     * Stream transformers are supported on this method
      *
      * @since 1.0-alpha-10
      */
@@ -298,7 +303,7 @@ ResourceIterator getResources()
      * archiver should compare the timestamps of included files with the timestamp of the target archive and rebuild the
      * archive only, if the latter timestamp precedes the former timestamps. Checking for timestamps will typically
      * offer a performance gain (in particular, if the following steps in a build can be suppressed, if an archive isn't
-     * recrated) on the cost that you get inaccurate results from time to time. In particular, removal of source files
+     * recreated) on the cost that you get inaccurate results from time to time. In particular, removal of source files
      * won't be detected.
      * </p>
      * <p>
@@ -320,7 +325,7 @@ ResourceIterator getResources()
      * should compare the timestamps of included files with the timestamp of the target archive and rebuild the archive
      * only, if the latter timestamp precedes the former timestamps. Checking for timestamps will typically offer a
      * performance gain (in particular, if the following steps in a build can be suppressed, if an archive isn't
-     * recrated) on the cost that you get inaccurate results from time to time. In particular, removal of source files
+     * recreated) on the cost that you get inaccurate results from time to time. In particular, removal of source files
      * won't be detected.
      * </p>
      * <p>

src/main/java/org/codehaus/plexus/archiver/DotDirectiveArchiveFinalizer.java

@@ -46,12 +46,10 @@ public void finalizeArchiveCreation( Archiver archiver )
         BufferedReader in = null;
         try
         {
-            List dotFiles = FileUtils.getFiles( dotFileDirectory, dotFilePrefix + "*", null );
+            List<File> dotFiles = FileUtils.getFiles( dotFileDirectory, dotFilePrefix + "*", null );
 
-            for ( Object dotFile1 : dotFiles )
+            for ( File dotFile : dotFiles )
             {
-                File dotFile = (File) dotFile1;
-
                 in = new BufferedReader( new FileReader( dotFile ) );
 
                 for ( String line = in.readLine(); line != null; line = in.readLine() )

src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java

@@ -278,7 +278,6 @@ ResourceIterator getResources()
         throw new RuntimeException( "Not implemented" );
     }
 
-    @SuppressWarnings( "rawtypes" )
     @Override
     public Map<String, ArchiveEntry> getFiles()
     {

src/main/java/org/codehaus/plexus/archiver/jar/JarArchiver.java

@@ -375,7 +375,7 @@ protected Manifest createManifest()
     private void writeManifest( ConcurrentJarCreator zOut, Manifest manifest )
         throws IOException, ArchiverException
     {
-        for ( Enumeration e = manifest.getWarnings(); e.hasMoreElements(); )
+        for ( Enumeration<String> e = manifest.getWarnings(); e.hasMoreElements(); )
         {
             getLogger().warn( "Manifest warning: " + e.nextElement() );
         }

src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java

@@ -20,6 +20,8 @@
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Iterator;
+
+import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoArchiveResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
@@ -69,7 +71,7 @@ protected Iterator<PlexusIoResource> getEntries()
         {
             tarFile = newTarFile( f );
         }
-        final Enumeration en = tarFile.getEntries();
+        final Enumeration<ArchiveEntry> en = tarFile.getEntries();
         return new Iterator<PlexusIoResource>()
         {
 

src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java

@@ -22,7 +22,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.SequenceInputStream;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Hashtable;

src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java

@@ -166,10 +166,10 @@ protected void execute()
         try
         {
             zf = new org.apache.commons.compress.archivers.zip.ZipFile( getSourceFile(), encoding, true );
-            final Enumeration e = zf.getEntriesInPhysicalOrder();
+            final Enumeration<ZipArchiveEntry> e = zf.getEntriesInPhysicalOrder();
             while ( e.hasMoreElements() )
             {
-                final ZipArchiveEntry ze = (ZipArchiveEntry) e.nextElement();
+                final ZipArchiveEntry ze = e.nextElement();
                 final ZipEntryFileInfo fileInfo = new ZipEntryFileInfo( zf, ze );
                 if ( isSelected( fileInfo.getName(), fileInfo ) )
                 {
@@ -232,11 +232,11 @@ protected void execute( final String path, final File outputDirectory )
         {
             zipFile = new org.apache.commons.compress.archivers.zip.ZipFile( getSourceFile(), encoding, true );
 
-            final Enumeration e = zipFile.getEntriesInPhysicalOrder();
+            final Enumeration<ZipArchiveEntry> e = zipFile.getEntriesInPhysicalOrder();
 
             while ( e.hasMoreElements() )
             {
-                final ZipArchiveEntry ze = (ZipArchiveEntry) e.nextElement();
+                final ZipArchiveEntry ze = e.nextElement();
                 final ZipEntryFileInfo fileInfo = new ZipEntryFileInfo( zipFile, ze );
                 if ( !isSelected( ze.getName(), fileInfo ) )
                 {

src/main/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollection.java

@@ -47,7 +47,7 @@ class CloseableIterator
         implements Iterator<PlexusIoResource>, Closeable
     {
 
-        final Enumeration en;
+        final Enumeration<ZipArchiveEntry> en;
 
         private final ZipFile zipFile;
 
@@ -66,7 +66,7 @@ public boolean hasNext()
         @Override
         public PlexusIoResource next()
         {
-            final ZipArchiveEntry entry = (ZipArchiveEntry) en.nextElement();
+            final ZipArchiveEntry entry = en.nextElement();
             return entry.isUnixSymlink()
                        ? new ZipSymlinkResource( zipFile, entry, getStreamTransformer() )
                        : new ZipResource( zipFile, entry, getStreamTransformer() );

src/test/java/org/codehaus/plexus/archiver/BasePlexusArchiverTest.java

@@ -33,7 +33,7 @@
 
 /**
  * Base abstract class that all the test-cases for different archivers
- * extend so that they can use its helpful methids.
+ * extend so that they can use its helpful methods.
  */
 public abstract class BasePlexusArchiverTest extends PlexusTestCase
 {