Author: bodewig
Date: Tue Mar 3 04:29:36 2009
New Revision: 749527
URL: http://svn.apache.org/viewvc?rev=749527&view=rev
Log:
typos and unused imports
Modified:
ant/core/trunk/src/main/org/apache/tools/zip/ (props changed)
ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
(props changed)
ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java (props
changed)
ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java
(props changed)
ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java
(contents, props changed)
ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
(contents, props changed)
ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
(props changed)
ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java
(props changed)
ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java (contents,
props changed)
ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
(props changed)
ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java (props changed)
ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java (props changed)
Propchange: ant/core/trunk/src/main/org/apache/tools/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1 +1 @@
-/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:746933,748133
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:746933,748133,749524
Propchange:
ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089
-/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java:746933,748063,748133,748288,749342
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java:746933,748063,748133,748288,749342,749524
Propchange: ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1 +1 @@
-/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java:745528,746933,748133
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java:745528,746933,748133,749524
Propchange:
ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java:749524
Modified: ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java?rev=749527&r1=749526&r2=749527&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java Tue Mar 3
04:29:36 2009
@@ -32,7 +32,7 @@
* java.nio.charset.Charset Charset} to encode names.
*
* <p>This implementation works for all cases under java-1.5 or
- * later. However, in java-1.4, some charsets don't have a java-nio
+ * later. However, in java-1.4, some charsets don't have a java.nio
* implementation, most notably the default ZIP encoding Cp437.</p>
*
* <p>The methods of this class are reentrant.</p>
Propchange: ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java:749524
Modified:
ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java?rev=749527&r1=749526&r2=749527&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java Tue
Mar 3 04:29:36 2009
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Propchange:
ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -0,0 +1 @@
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:749524
Propchange:
ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089
-/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java:746933,748063,748133,749342
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java:746933,748063,748133,749342,749524
Propchange:
ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089
-/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java:746933,748063,748133,749342
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java:746933,748063,748133,749342,749524
Modified: ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java?rev=749527&r1=749526&r2=749527&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java Tue Mar 3
04:29:36 2009
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
/**
* An interface for encoders that do a pretty encoding of ZIP
@@ -35,12 +34,12 @@
* <p>The main reason for defining an own encoding layer comes from
* the problems with {...@link java.lang.String#getBytes(String)
* String.getBytes}, which encodes unknown characters as ASCII
- * quotation marks ('?'), which is per definition an invalid filename
- * character under some operating systems (Windows, e.g.) leading to
- * ignored ZIP entries.</p>
+ * quotation marks ('?'). Quotation marks are per definition an
+ * invalid filename on some operating systems like Windows, which
+ * leads to ignored ZIP entries.</p>
*
* <p>All implementations should implement this interface in a
- * reentrant way.<(p>
+ * reentrant way.</p>
*/
interface ZipEncoding {
/**
Propchange: ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncoding.java:749524
Propchange: ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089
-/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:746933,747841,748133,749342-749344
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:746933,747841,748133,749342-749344,749524
Propchange: ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1,2 +1,2 @@
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:747850
-/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java:746933,748133
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java:746933,748133,749524
Propchange: ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 04:29:36 2009
@@ -1 +1 @@
-/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:745920,746933,748133,748556,749342-749344
+/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:745920,746933,748133,748556,749342-749344,749524
