svn commit: r765139 - in /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip: AsiExtraField.java FallbackZipEncoding.java

[sebb]

Author: sebb
Date: Wed Apr 15 11:23:48 2009
New Revision: 765139

URL: http://svn.apache.org/viewvc?rev=765139&view=rev
Log:
Document why default charset usage is OK

Modified:
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java?rev=765139&r1=765138&r2=765139&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AsiExtraField.java
 Wed Apr 15 11:23:48 2009
@@ -106,6 +106,7 @@
                           + 2         // UID
                           + 2         // GID
                           + getLinkedFile().getBytes().length);
+                          // Uses default charset - see class Javadoc
     }
 
     /**
@@ -126,7 +127,7 @@
         byte[] data = new byte[getLocalFileDataLength().getValue() - WORD];
         System.arraycopy(ZipShort.getBytes(getMode()), 0, data, 0, 2);
 
-        byte[] linkArray = getLinkedFile().getBytes();
+        byte[] linkArray = getLinkedFile().getBytes(); // Uses default charset 
- see class Javadoc
         // CheckStyle:MagicNumber OFF
         System.arraycopy(ZipLong.getBytes(linkArray.length),
                          0, data, 2, WORD);
@@ -284,7 +285,7 @@
             link = "";
         } else {
             System.arraycopy(tmp, 10, linkArray, 0, linkArray.length);
-            link = new String(linkArray);
+            link = new String(linkArray); // Uses default charset - see class 
Javadoc
         }
         // CheckStyle:MagicNumber ON
         setDirectory((newMode & DIR_FLAG) != 0);

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java?rev=765139&r1=765138&r2=765139&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java
 Wed Apr 15 11:23:48 2009
@@ -25,12 +25,12 @@
 /**
  * A fallback ZipEncoding, which uses a java.io means to encode names.
  *
- * <p>This implementation is not favorable for encodings other than
+ * <p>This implementation is not suitable for encodings other than
  * utf-8, because java.io encodes unmappable character as question
  * marks leading to unreadable ZIP entries on some operating
  * systems.</p>
  * 
- * <p>Furthermore this implementation is unable to tell, whether a
+ * <p>Furthermore this implementation is unable to tell whether a
  * given name can be safely encoded or not.</p>
  * 
  * <p>This implementation acts as a last resort implementation, when
@@ -74,8 +74,8 @@
      * 
org.apache.commons.compress.archivers.zip.ZipEncoding#encode(java.lang.String)
      */
     public ByteBuffer encode(String name) throws IOException {
-        if (this.charset == null) {
-            return ByteBuffer.wrap(name.getBytes()); // TODO is it correct to 
use the default charset here?
+        if (this.charset == null) { // i.e. use default charset, see no-args 
constructor
+            return ByteBuffer.wrap(name.getBytes());
         } else {
             return ByteBuffer.wrap(name.getBytes(this.charset));
         }
@@ -86,7 +86,7 @@
      * org.apache.commons.compress.archivers.zip.ZipEncoding#decode(byte[])
      */
     public String decode(byte[] data) throws IOException {
-        if (this.charset == null) {
+        if (this.charset == null) { // i.e. use default charset, see no-args 
constructor
             return new String(data);
         } else {
             return new String(data,this.charset);