o Updated to reformat all files to a common code style and to remove obsolete

  Subversion/CVS keywords.

Author: ChristianSchulte

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

@@ -3,7 +3,7 @@
 public abstract class AbstractArchiveFinalizer
     implements ArchiveFinalizer
 {
-    
+
     protected AbstractArchiveFinalizer()
     {
     }

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

@@ -1,21 +1,20 @@
-package org.codehaus.plexus.archiver;
-
 /**
  *
  * Copyright 2004 The Apache Software Foundation
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+package org.codehaus.plexus.archiver;
 
 import java.io.Closeable;
 import java.io.File;
@@ -56,9 +55,6 @@
 import static org.codehaus.plexus.archiver.util.DefaultArchivedFileSet.archivedFileSet;
 import static org.codehaus.plexus.archiver.util.DefaultFileSet.fileSet;
 
-/**
- * @version $Id$
- */
 public abstract class AbstractArchiver
     extends AbstractLogEnabled
     implements Archiver, Contextualizable, FinalizerEnabled
@@ -114,6 +110,7 @@ public abstract class AbstractArchiver
 
     private static class AddedResourceCollection
     {
+
         private final PlexusIoResourceCollection resources;
 
         private final int forcedFileMode;
@@ -435,7 +432,6 @@ private ArchiveEntry asArchiveEntry( final AddedResourceCollection collection, f
                                collection.resources );
     }
 
-
     @Override
     public void addResource( final PlexusIoResource resource, final String destFileName, final int permissions )
         throws ArchiverException
@@ -465,8 +461,7 @@ public void addFile( @Nonnull final File inputFile, @Nonnull String destFileName
         try
         {
             // do a null check here, to avoid creating a file stream if there are no filters...
-                doAddResource(
-                    ArchiveEntry.createFileEntry( destFileName, inputFile, permissions, getDirectoryMode() ) );
+            doAddResource( ArchiveEntry.createFileEntry( destFileName, inputFile, permissions, getDirectoryMode() ) );
         }
         catch ( final IOException e )
         {
@@ -481,6 +476,7 @@ public ResourceIterator getResources()
     {
         return new ResourceIterator()
         {
+
             private final Iterator addedResourceIter = resources.iterator();
 
             private AddedResourceCollection currentResourceCollection;
@@ -555,7 +551,7 @@ else if ( o instanceof AddedResourceCollection )
                         final String path = nextEntry.getName();
 
                         if ( Archiver.DUPLICATES_PRESERVE.equals( duplicateBehavior )
-                            || Archiver.DUPLICATES_SKIP.equals( duplicateBehavior ) )
+                                 || Archiver.DUPLICATES_SKIP.equals( duplicateBehavior ) )
                         {
                             if ( nextEntry.getType() == ArchiveEntry.FILE )
                             {
@@ -645,7 +641,6 @@ private static void closeQuietlyIfCloseable( Object resource )
         }
     }
 
-
     @Override
     public Map<String, ArchiveEntry> getFiles()
     {
@@ -1087,7 +1082,6 @@ protected void cleanUp()
         resources.clear();
     }
 
-
     protected abstract void execute()
         throws ArchiverException, IOException;
 

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

@@ -1,21 +1,20 @@
-package org.codehaus.plexus.archiver;
-
 /**
  *
  * Copyright 2004 The Apache Software Foundation
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+package org.codehaus.plexus.archiver;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -37,13 +36,13 @@
 
 /**
  * @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
- * @version $Revision$ $Date$
  * @todo there should really be constructors which take the source file.
  */
 public abstract class AbstractUnArchiver
     extends AbstractLogEnabled
     implements UnArchiver, FinalizerEnabled
 {
+
     private File destDirectory;
 
     private File destFile;
@@ -58,6 +57,7 @@ public abstract class AbstractUnArchiver
 
     /**
      * since 2.3 is on by default
+     *
      * @since 1.1
      */
     private boolean useJvmChmod = true;
@@ -165,11 +165,12 @@ private void runArchiveFinalizers()
     {
         if ( finalizers != null )
         {
-			for (Object finalizer1 : finalizers) {
-				final ArchiveFinalizer finalizer = (ArchiveFinalizer) finalizer1;
+            for ( Object finalizer1 : finalizers )
+            {
+                final ArchiveFinalizer finalizer = (ArchiveFinalizer) finalizer1;
 
-				finalizer.finalizeArchiveExtraction(this);
-			}
+                finalizer.finalizeArchiveExtraction( this );
+            }
         }
     }
 
@@ -272,6 +273,7 @@ public boolean isUseJvmChmod()
 
     /**
      * <b>jvm chmod won't set group level permissions !</b>
+     *
      * @since 1.1
      */
     @Override
@@ -320,8 +322,9 @@ protected void extractFile( final File srcF, final File dir, final InputStream c
                 dirF.mkdirs();
             }
 
-            if ( !StringUtils.isEmpty( symlinkDestination )){
-                SymlinkUtils.createSymbolicLink( f, new File( symlinkDestination) );
+            if ( !StringUtils.isEmpty( symlinkDestination ) )
+            {
+                SymlinkUtils.createSymbolicLink( f, new File( symlinkDestination ) );
             }
             else if ( isDirectory )
             {
@@ -346,7 +349,7 @@ else if ( isDirectory )
 
             f.setLastModified( entryDate.getTime() );
 
-            if ( !isIgnorePermissions() && mode != null && !isDirectory)
+            if ( !isIgnorePermissions() && mode != null && !isDirectory )
             {
                 ArchiveEntryUtils.chmod( f, mode, getLogger(), isUseJvmChmod() );
             }