Added a separate class and extracted some logic

Author: krosenvold

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

@@ -391,7 +391,7 @@ private void createIndexList( ParallelScatterZipCreator zOut )
 
         // filter out META-INF if it doesn't contain anything other than the index and manifest.
         // this is what sun.misc.JarIndex does, guess we ought to be consistent.
-        Set<String> filteredDirs = new HashSet<String>( addedDirs.keySet() );
+        Set<String> filteredDirs = addedDirs.allAddedDirs();
         // our added dirs always have a trailing slash
         if ( filteredDirs.contains( META_INF_NAME + '/' ) )
         {

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

@@ -79,16 +79,11 @@ public abstract class AbstractZipArchiver
 
     protected String archiveType = "zip";
 
-    /*
-     * Whether the original compression of entries coming from a ZIP
-     * archive should be kept (for example when updating an archive).
-     */
-    //not used: private boolean keepCompression = false;
     private boolean doFilesonly = false;
 
     protected final Hashtable<String, String> entries = new Hashtable<String, String>();
 
-    protected final Hashtable<String, String> addedDirs = new Hashtable<String, String>();
+	protected final AddedDirs addedDirs = new AddedDirs();
 
     private static final long EMPTY_CRC = new CRC32().getValue();
 
@@ -363,7 +358,7 @@ protected final void addResources( ResourceIterator resources, ParallelScatterZi
                 name = name + "/";
             }
 
-            addParentDirs( entry, null, name, zOut, "" );
+            addParentDirs( entry, null, name, zOut);
 
             if ( entry.getResource().isFile() )
             {
@@ -384,29 +379,12 @@ protected final void addResources( ResourceIterator resources, ParallelScatterZi
      * be impossible and is not really supported.
      */
     @SuppressWarnings( { "JavaDoc" } )
-    private void addParentDirs( ArchiveEntry archiveEntry, File baseDir, String entry, ParallelScatterZipCreator zOut,
-                                String prefix )
+    private void addParentDirs(ArchiveEntry archiveEntry, File baseDir, String entry, ParallelScatterZipCreator zOut)
         throws IOException
     {
         if ( !doFilesonly && getIncludeEmptyDirs() )
         {
-            Stack<String> directories = new Stack<String>();
-
-            // Don't include the last entry itself if it's
-            // a dir; it will be added on its own.
-            int slashPos = entry.length() - ( entry.endsWith( "/" ) ? 1 : 0 );
-
-            while ( ( slashPos = entry.lastIndexOf( '/', slashPos - 1 ) ) != -1 )
-            {
-                String dir = entry.substring( 0, slashPos + 1 );
-
-                if ( addedDirs.contains( prefix + dir ) )
-                {
-                    break;
-                }
-
-                directories.push( dir );
-            }
+			Stack<String> directories = addedDirs.asStringStack(entry);
 
             while ( !directories.isEmpty() )
             {
@@ -423,12 +401,12 @@ private void addParentDirs( ArchiveEntry archiveEntry, File baseDir, String entr
                 // the
                 // At this point we could do something like read the atr
                 final PlexusIoResource res = new AnonymousResource( f );
-                zipDir( res, zOut, prefix + dir, archiveEntry.getDefaultDirMode(), encoding );
+                zipDir( res, zOut, dir, archiveEntry.getDefaultDirMode(), encoding );
             }
         }
     }
 
-    /**
+	/**
      * Adds a new entry to the archive, takes care of duplicates as well.
      *
      * @param in                 the stream to read data for the entry from.
@@ -544,15 +522,12 @@ protected void zipDir( PlexusIoResource dir, ParallelScatterZipCreator zOut, Str
                            String encodingToUse )
         throws IOException
     {
-        if ( addedDirs.get( vPath ) != null )
+        if ( addedDirs.update(vPath)  )
         {
-            // don't add directories we've already added.
-            // no warning if we try, it is harmless in and of itself
             return;
         }
 
-        getLogger().debug( "adding directory " + vPath );
-        addedDirs.put( vPath, vPath );
+        getLogger().debug("adding directory " + vPath);
 
         if ( !skipWriting )
         {

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

@@ -0,0 +1,78 @@
+package org.codehaus.plexus.archiver.zip;
+
+/**
+ *
+ * Copyright 2015 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
+ *
+ *     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.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
+import java.util.Stack;
+
+/**
+ * A list of directories that have been added to an archive.
+ */
+public class AddedDirs {
+
+	private final Hashtable<String, String> addedDirs = new Hashtable<String, String>();
+
+	public Stack<String> asStringStack(String entry) {
+		Stack<String> directories = new Stack<String>();
+
+		// Don't include the last entry itself if it's
+		// a dir; it will be added on its own.
+		int slashPos = entry.length() - ( entry.endsWith( "/" ) ? 1 : 0 );
+
+		while ( ( slashPos = entry.lastIndexOf( '/', slashPos - 1 ) ) != -1 )
+		{
+			String dir = entry.substring( 0, slashPos + 1 );
+
+			if ( addedDirs.contains( dir ) )
+			{
+				break;
+			}
+
+			directories.push( dir );
+		}
+		return directories;
+	}
+
+	public void clear() {
+		addedDirs.clear();
+	}
+
+
+	/**
+	 * Adds the path to this list.
+	 * @param vPath The path to add.
+	 * @return true if the path was not present, false if it already existed.
+	 */
+	public boolean update(String vPath){
+		if ( addedDirs.get( vPath ) != null )
+		{
+			// don't add directories we've already added.
+			// no warning if we try, it is harmless in and of itself
+			return true;
+		}
+		addedDirs.put( vPath, vPath );
+		return false;
+	}
+
+	public Set<String> allAddedDirs(){
+		return new HashSet<String>( addedDirs.keySet() );
+	}
+}