From d79bed61a5e743e0ac5c54081cbb8ec597eb35c0 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 17 Jul 2013 14:43:50 +0000
Subject: [PATCH] PR 55271: obey to section 1.4.2 in
 http://www.pkware.com/documents/casestudies/APPNOTE.TXT

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1504158 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tools/zip/UnicodeCommentExtraField.java   | 13 ++-----
 .../tools/zip/UnicodePathExtraField.java      | 12 ++----
 .../Zip64ExtendedInformationExtraField.java   | 39 ++-----------------
 3 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java b/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
index 25b42915f..205f52bbd 100644
--- a/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
+++ b/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
@@ -24,15 +24,10 @@ package org.apache.tools.zip;
  * <p>Stores the UTF-8 version of the file comment as stored in the
  * central directory header.</p>
  *
- * <pre>
- *         Value         Size        Description
- *         -----         ----        -----------
- *  (UCom) 0x6375        Short       tag for this extra block type ("uc")
- *         TSize         Short       total data size for this block
- *         Version       1 byte      version of this extra field, currently 1
- *         ComCRC32      4 bytes     Comment Field CRC32 Checksum
- *         UnicodeCom    Variable    UTF-8 version of the entry comment
- * </pre>
+ * <p>See {@link
+ * "http://www.pkware.com/documents/casestudies/APPNOTE.TXT PKWARE's
+ * APPNOTE.TXT, section 4.6.8"}.</p>
+ *
  */
 public class UnicodeCommentExtraField extends AbstractUnicodeExtraField {
 
diff --git a/src/main/org/apache/tools/zip/UnicodePathExtraField.java b/src/main/org/apache/tools/zip/UnicodePathExtraField.java
index 92ecf0088..4fb87723b 100644
--- a/src/main/org/apache/tools/zip/UnicodePathExtraField.java
+++ b/src/main/org/apache/tools/zip/UnicodePathExtraField.java
@@ -24,15 +24,9 @@ package org.apache.tools.zip;
  * <p>Stores the UTF-8 version of the file name field as stored in the 
  * local header and central directory header.</p>
  *
- * <pre>
- *         Value         Size        Description
- *         -----         ----        -----------
- * (UPath) 0x7075        Short       tag for this extra block type ("up")
- *         TSize         Short       total data size for this block
- *         Version       1 byte      version of this extra field, currently 1
- *         NameCRC32     4 bytes     File Name Field CRC32 Checksum
- *         UnicodeName   Variable    UTF-8 version of the entry File Name
- * </pre>
+ * <p>See {@link
+ * "http://www.pkware.com/documents/casestudies/APPNOTE.TXT PKWARE's
+ * APPNOTE.TXT, section 4.6.9"}.</p>
  */
 public class UnicodePathExtraField extends AbstractUnicodeExtraField {
 
diff --git a/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java b/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java
index ad410e093..96367fba1 100644
--- a/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java
+++ b/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java
@@ -27,42 +27,9 @@ import static org.apache.tools.zip.ZipConstants.WORD;
  * Holds size and other extended information for entries that use Zip64
  * features.
  *
- * <p>From {@link "http://www.pkware.com/documents/casestudies/APPNOTE.TXT PKWARE's APPNOTE.TXT"}
- * <pre>
- * Zip64 Extended Information Extra Field (0x0001):
- *
- *          The following is the layout of the zip64 extended 
- *          information "extra" block. If one of the size or
- *          offset fields in the Local or Central directory
- *          record is too small to hold the required data,
- *          a Zip64 extended information record is created.
- *          The order of the fields in the zip64 extended 
- *          information record is fixed, but the fields will
- *          only appear if the corresponding Local or Central
- *          directory record field is set to 0xFFFF or 0xFFFFFFFF.
- *
- *          Note: all fields stored in Intel low-byte/high-byte order.
- *
- *          Value      Size       Description
- *          -----      ----       -----------
- *  (ZIP64) 0x0001     2 bytes    Tag for this "extra" block type
- *          Size       2 bytes    Size of this "extra" block
- *          Original 
- *          Size       8 bytes    Original uncompressed file size
- *          Compressed
- *          Size       8 bytes    Size of compressed data
- *          Relative Header
- *          Offset     8 bytes    Offset of local header record
- *          Disk Start
- *          Number     4 bytes    Number of the disk on which
- *                                this file starts 
- *
- *          This entry in the Local header must include BOTH original
- *          and compressed file size fields. If encrypting the 
- *          central directory and bit 13 of the general purpose bit
- *          flag is set indicating masking, the value stored in the
- *          Local Header for the original file size will be zero.
- * </pre></p>
+ * <p>See {@link
+ * "http://www.pkware.com/documents/casestudies/APPNOTE.TXT PKWARE's
+ * APPNOTE.TXT, section 4.5.3"}.</p>
  *
  * <p>Currently Ant doesn't support encrypting the
  * central directory so the note about masking doesn't apply.</p>