Made closeable

Author: krosenvold

Diff for: src/main/java/org/codehaus/plexus/components/io/resources/EncodingSupported.java

@@ -0,0 +1,31 @@
+package org.codehaus.plexus.components.io.resources;
+
+import java.nio.charset.Charset;
+
+/*
+ * Copyright 2014 The Codehaus 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.
+ */
+
+/**
+ * Implemented by plexus io resources that support some kind of encoding notion
+ */
+public interface EncodingSupported
+{
+    /**
+     * Supplies the encoding to be used for decoding filenames/paths
+     * @param charset The charset to use
+     */
+    public void setEncoding(Charset charset);
+}

Diff for: src/main/java/org/codehaus/plexus/components/io/resources/LinefeedMode.java

@@ -1,4 +1,19 @@
 package org.codehaus.plexus.components.io.resources;
+/*
+ * Copyright 2007 The Codehaus 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.
+ */
 
 /**
  * @author Kristian Rosenvold

Diff for: src/main/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollection.java

@@ -26,19 +26,21 @@
 import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResourceCollection;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResourceCollectionWithAttributes;
+import org.codehaus.plexus.components.io.resources.EncodingSupported;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
 import org.codehaus.plexus.components.io.resources.Stream;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Iterator;
 
 /**
  * Implementation of {@link PlexusIoResourceCollection} for an archives contents.
  */
 public class PlexusIoProxyResourceCollection
-    extends AbstractPlexusIoResourceCollectionWithAttributes
+    extends AbstractPlexusIoResourceCollectionWithAttributes implements EncodingSupported
 {
     private PlexusIoResourceCollection src;
 
@@ -203,4 +205,11 @@ public long getLastModified()
     {
         return src.getLastModified();
     }
+
+    public void setEncoding( Charset charset )
+    {
+        if (src instanceof  EncodingSupported){
+            ((EncodingSupported)src).setEncoding( charset );
+        }
+    }
 }

Diff for: src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java

@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -158,7 +159,8 @@ private void testPlexusIoResourceCollection( PlexusIoResourceCollection plexusIo
         boolean yPathSeen = false;
         boolean aFileSeen = false;
         boolean bFileSeen = false;
-        for ( Iterator iter = plexusIoResourceCollection.getResources();  iter.hasNext();  )
+        Iterator iter = plexusIoResourceCollection.getResources();
+        while (  iter.hasNext()  )
         {
             PlexusIoResource res = (PlexusIoResource) iter.next();
             final String resName = res.getName().replace( File.separatorChar, '/' );
@@ -208,6 +210,10 @@ else if ( B_PATH.equals( resName ) )
 
         assertTrue( aFileSeen );
         assertTrue( bFileSeen );
+        if (iter instanceof  Closeable)
+        {
+            ( (Closeable) iter ).close();
+        }
     }
 
     private void testFileResourceCollection( PlexusIoFileResourceCollection resourceCollection )