Minor adjustments to pull #11

Author: krosenvold

Diff for: src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java

@@ -1,4 +1,19 @@
 package org.codehaus.plexus.archiver.tar;
+/*
+ * Copyright 2010-2015 The plexus developers.
+ *
+ * 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
+ *
+ * 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.
+ */
 
 import java.io.Closeable;
 import java.io.File;
@@ -54,9 +69,9 @@ public boolean hasNext()
             public PlexusIoResource next()
             {
                 final TarArchiveEntry entry = (TarArchiveEntry) en.nextElement();
-                return !entry.isSymbolicLink()
-                    ? new TarResource( tarFile, entry )
-                    : new TarSymlinkResource( tarFile, entry );
+                return entry.isSymbolicLink()
+                    ? new TarSymlinkResource( tarFile, entry )
+                    : new TarResource( tarFile, entry );
             }
 
             public void remove()

Diff for: src/main/java/org/codehaus/plexus/archiver/tar/TarSymlinkResource.java

@@ -1,10 +1,25 @@
 package org.codehaus.plexus.archiver.tar;
-
-import java.io.IOException;
+/*
+ * Copyright 2010-2015 The plexus developers.
+ *
+ * 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
+ *
+ * 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.
+ */
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.codehaus.plexus.components.io.functions.SymlinkDestinationSupplier;
 
+import java.io.IOException;
+
 /**
  * A {@link TarResource} that represents symbolic link.
  */
@@ -14,18 +29,22 @@ public class TarSymlinkResource
 {
     private final String symlinkDestination;
 
-    public TarSymlinkResource(TarFile tarFile, TarArchiveEntry entry) {
-        super(tarFile, entry);
+    public TarSymlinkResource( TarFile tarFile, TarArchiveEntry entry )
+    {
+        super( tarFile, entry );
         symlinkDestination = entry.getLinkName();
     }
 
     @Override
-    public String getSymlinkDestination() throws IOException {
+    public String getSymlinkDestination()
+        throws IOException
+    {
         return symlinkDestination;
     }
 
     @Override
-    public boolean isSymbolicLink() {
+    public boolean isSymbolicLink()
+    {
         return true;
     }
 

Diff for: src/main/java/org/codehaus/plexus/archiver/zip/PlexusArchiverZipFileResourceCollection.java

@@ -57,9 +57,9 @@ public PlexusIoResource next()
         {
             final ZipArchiveEntry entry = (ZipArchiveEntry) en.nextElement();
 
-            return !entry.isUnixSymlink()
-                ? new ZipResource( zipFile, entry, getStreamTransformer() )
-                : new ZipSymlinkResource( zipFile, entry, getStreamTransformer() );
+            return entry.isUnixSymlink()
+                ? new ZipSymlinkResource( zipFile, entry, getStreamTransformer() )
+                : new ZipResource( zipFile, entry, getStreamTransformer() );
         }
 
         public void remove()

Diff for: src/main/java/org/codehaus/plexus/archiver/zip/ZipSymlinkResource.java

@@ -1,12 +1,27 @@
 package org.codehaus.plexus.archiver.zip;
-
-import java.io.IOException;
+/*
+ * Copyright 2010-2015 The plexus developers.
+ *
+ * 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
+ *
+ * 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.
+ */
 
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
 import org.codehaus.plexus.components.io.functions.SymlinkDestinationSupplier;
 
+import java.io.IOException;
+
 /**
  * A {@link ZipResource} that represents symbolic link.
  */
@@ -16,18 +31,22 @@ public class ZipSymlinkResource
 {
     private final String symlinkDestination;
 
-    public ZipSymlinkResource(ZipFile zipFile, ZipArchiveEntry entry, InputStreamTransformer streamTransformer)
+    public ZipSymlinkResource( ZipFile zipFile, ZipArchiveEntry entry, InputStreamTransformer streamTransformer )
     {
-        super(zipFile, entry, streamTransformer);
-        try {
-            symlinkDestination = zipFile.getUnixSymlink(entry);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+        super( zipFile, entry, streamTransformer );
+        try
+        {
+            symlinkDestination = zipFile.getUnixSymlink( entry );
+        }
+        catch ( IOException e )
+        {
+            throw new RuntimeException( e );
         }
     }
 
     @Override
-    public String getSymlinkDestination() throws IOException
+    public String getSymlinkDestination()
+        throws IOException
     {
         return symlinkDestination;
     }