o Updated to organize imports.

Author: ChristianSchulte

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

@@ -17,6 +17,20 @@
  *  limitations under the License.
  */
 
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import javax.annotation.Nonnull;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -39,22 +53,6 @@
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.util.Os;
-
-import javax.annotation.Nonnull;
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
 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/AbstractUnArchiver.java

@@ -17,6 +17,15 @@
  *  limitations under the License.
  */
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
 import org.codehaus.plexus.components.io.attributes.SymlinkUtils;
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
@@ -26,11 +35,6 @@
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
  * @version $Revision$ $Date$

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

@@ -17,21 +17,17 @@
  *  limitations under the License.
  */
 
-import org.codehaus.plexus.archiver.resources.PlexusIoVirtualSymlinkResource;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-
 import javax.annotation.Nonnull;
-
+import org.codehaus.plexus.archiver.resources.PlexusIoVirtualSymlinkResource;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
 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 static org.codehaus.plexus.components.io.resources.ResourceFactory.createResource;
 
 /**

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

@@ -5,6 +5,7 @@
 /**
  * @deprecated Use {@link FileSelector}
  */
+@Deprecated
 public interface ArchiveFileFilter
 {
     boolean include( InputStream dataStream, String entryName );

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

@@ -1,7 +1,6 @@
 package org.codehaus.plexus.archiver;
 
 import java.io.File;
-
 import javax.annotation.CheckForNull;
 
 

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

@@ -17,17 +17,15 @@
  *  limitations under the License.
  */
 
-import org.codehaus.plexus.components.io.resources.PlexusIoResource;
-import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import javax.annotation.Nonnull;
+import org.codehaus.plexus.components.io.resources.PlexusIoResource;
+import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
 
 /**
  * @version $Revision$ $Date$

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

@@ -1,7 +1,6 @@
 package org.codehaus.plexus.archiver;
 
 import javax.annotation.CheckForNull;
-
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
 

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

@@ -1,15 +1,14 @@
 package org.codehaus.plexus.archiver;
 
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.io.File;
-import java.io.IOException;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileReader;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * An {@link ArchiveFinalizer} that process dot files with archiver directives

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

@@ -17,9 +17,8 @@
  *  limitations under the License.
  */
 
-import org.codehaus.plexus.components.io.fileselectors.FileSelector;
-
 import java.io.File;
+import org.codehaus.plexus.components.io.fileselectors.FileSelector;
 
 /**
  * @version $Revision$ $Date$

src/main/java/org/codehaus/plexus/archiver/bzip2/BZip2Archiver.java

@@ -18,7 +18,6 @@
  */
 
 import java.io.IOException;
-
 import org.codehaus.plexus.archiver.AbstractArchiver;
 import org.codehaus.plexus.archiver.ArchiveEntry;
 import org.codehaus.plexus.archiver.ArchiverException;