You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2012/06/04 06:43:02 UTC
svn commit: r1345831 -
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/
Author: bodewig
Date: Mon Jun 4 04:43:01 2012
New Revision: 1345831
URL: http://svn.apache.org/viewvc?rev=1345831&view=rev
Log:
typos
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnixStat.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java?rev=1345831&r1=1345830&r2=1345831&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java Mon Jun 4 04:43:01 2012
@@ -38,7 +38,7 @@ public abstract class AbstractUnicodeExt
/**
* Assemble as unicode extension from the name/comment and
- * encoding of the orginal zip entry.
+ * encoding of the original zip entry.
*
* @param text The file name or comment.
* @param bytes The encoded of the filename or comment in the zip
@@ -62,7 +62,7 @@ public abstract class AbstractUnicodeExt
/**
* Assemble as unicode extension from the name/comment and
- * encoding of the orginal zip entry.
+ * encoding of the original zip entry.
*
* @param text The file name or comment.
* @param bytes The encoded of the filename or comment in the zip
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java?rev=1345831&r1=1345830&r2=1345831&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java Mon Jun 4 04:43:01 2012
@@ -67,12 +67,12 @@ public class ExtraFieldUtils {
}
/**
- * Create an instance of the approriate ExtraField, falls back to
+ * Create an instance of the appropriate ExtraField, falls back to
* {@link UnrecognizedExtraField UnrecognizedExtraField}.
* @param headerId the header identifier
- * @return an instance of the appropiate ExtraField
+ * @return an instance of the appropriate ExtraField
* @exception InstantiationException if unable to instantiate the class
- * @exception IllegalAccessException if not allowed to instatiate the class
+ * @exception IllegalAccessException if not allowed to instantiate the class
*/
public static ZipExtraField createExtraField(ZipShort headerId)
throws InstantiationException, IllegalAccessException {
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnixStat.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnixStat.java?rev=1345831&r1=1345830&r2=1345831&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnixStat.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnixStat.java Mon Jun 4 04:43:01 2012
@@ -21,8 +21,9 @@ package org.apache.commons.compress.arch
/**
* Constants from stat.h on Unix systems.
*/
-public interface UnixStat
-{
+// CheckStyle:InterfaceIsTypeCheck OFF - backward compatible
+public interface UnixStat {
+
/**
* Bits used for permissions (and sticky bit)
*/
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java?rev=1345831&r1=1345830&r2=1345831&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java Mon Jun 4 04:43:01 2012
@@ -65,7 +65,7 @@ import static org.apache.commons.compres
* </pre></p>
*
* <p>Currently Commons Compress doesn't support encrypting the
- * central directory so the not about masking doesn't apply.</p>
+ * central directory so the note about masking doesn't apply.</p>
*
* <p>The implementation relies on data being read from the local file
* header and assumes that both size values are always present.</p>
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java?rev=1345831&r1=1345830&r2=1345831&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java Mon Jun 4 04:43:01 2012
@@ -270,7 +270,7 @@ public class ZipArchiveEntry extends jav
* by" part of the central file header.
*
* @return PLATFORM_FAT unless {@link #setUnixMode setUnixMode}
- * has been called, in which case PLATORM_UNIX will be returned.
+ * has been called, in which case PLATFORM_UNIX will be returned.
*/
public int getPlatform() {
return platform;
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=1345831&r1=1345830&r2=1345831&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java Mon Jun 4 04:43:01 2012
@@ -62,7 +62,7 @@ import static org.apache.commons.compres
* uncompressed size information is required before {@link
* #putArchiveEntry(ArchiveEntry)} can be called.</p>
*
- * <p>As of Apache Commons Compress it transparently supports Zip64
+ * <p>As of Apache Commons Compress 1.3 it transparently supports Zip64
* extensions and thus individual entries and archives larger than 4
* GB or with more than 65536 entries in most cases but explicit
* control is provided via {@link #setUseZip64}. If the stream can not
@@ -208,7 +208,7 @@ public class ZipArchiveOutputStream exte
protected final Deflater def = new Deflater(level, true);
/**
- * This buffer servers as a Deflater.
+ * This buffer serves as a Deflater.
*
*/
private final byte[] buf = new byte[BUFFER_SIZE];
@@ -410,7 +410,7 @@ public class ZipArchiveOutputStream exte
}
if (entry != null) {
- throw new IOException("This archives contains unclosed entries.");
+ throw new IOException("This archive contains unclosed entries.");
}
cdOffset = written;
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java?rev=1345831&r1=1345830&r2=1345831&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java Mon Jun 4 04:43:01 2012
@@ -21,12 +21,14 @@ package org.apache.commons.compress.arch
import java.util.zip.ZipException;
/**
- * General format of extra field data. <p>
+ * General format of extra field data.
+ *
+ * <p>Extra fields usually appear twice per file, once in the local
+ * file data and once in the central directory. Usually they are the
+ * same, but they don't have to be. {@link
+ * java.util.zip.ZipOutputStream java.util.zip.ZipOutputStream} will
+ * only use the local file data in both places.</p>
*
- * Extra fields usually appear twice per file, once in the local file data and
- * once in the central directory. Usually they are the same, but they don't have
- * to be. {@link java.util.zip.ZipOutputStream java.util.zip.ZipOutputStream}
- * will only use the local file data in both places.</p>
*/
public interface ZipExtraField {
/**
@@ -37,34 +39,30 @@ public interface ZipExtraField {
ZipShort getHeaderId();
/**
- * Length of the extra field in the local file data - without Header-ID or
- * length specifier.
- *
- * @return The LocalFileDataLength value
+ * Length of the extra field in the local file data - without
+ * Header-ID or length specifier.
+ * @return the length of the field in the local file data
*/
ZipShort getLocalFileDataLength();
/**
- * Length of the extra field in the central directory - without Header-ID or
- * length specifier.
- *
- * @return The CentralDirectoryLength value
+ * Length of the extra field in the central directory - without
+ * Header-ID or length specifier.
+ * @return the length of the field in the central directory
*/
ZipShort getCentralDirectoryLength();
/**
- * The actual data to put into local file data - without Header-ID or length
- * specifier.
- *
- * @return The LocalFileDataData value
+ * The actual data to put into local file data - without Header-ID
+ * or length specifier.
+ * @return the data
*/
byte[] getLocalFileDataData();
/**
* The actual data to put into central directory - without Header-ID or
* length specifier.
- *
- * @return The CentralDirectoryData value
+ * @return the data
*/
byte[] getCentralDirectoryData();
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java?rev=1345831&r1=1345830&r2=1345831&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java Mon Jun 4 04:43:01 2012
@@ -54,7 +54,7 @@ import static org.apache.commons.compres
* have to reimplement all methods anyway. Like
* <code>java.util.ZipFile</code>, it uses RandomAccessFile under the
* covers and supports compressed and uncompressed entries. As of
- * Apache Commons Compress it also transparently supports Zip64
+ * Apache Commons Compress 1.3 it also transparently supports Zip64
* extensions and thus individual entries and archives larger than 4
* GB or with more than 65536 entries.</p>
*
@@ -312,7 +312,7 @@ public class ZipFile {
*
* @param ze the entry to get the stream for.
* @return a stream to read the entry from.
- * @throws IOException if unable to create an input stream from the zipenty
+ * @throws IOException if unable to create an input stream from the zipentry
* @throws ZipException if the zipentry uses an unsupported feature
*/
public InputStream getInputStream(ZipArchiveEntry ze)