From 70c67a8e781ad050a36e41b923ebff0cc564d287 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Sat, 18 Nov 2006 17:57:58 +0000
Subject: [PATCH] checkstyle

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@476569 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/zip/JarMarker.java           | 10 ++++++----
 .../org/apache/tools/zip/UnrecognizedExtraField.java   |  3 +++
 src/main/org/apache/tools/zip/ZipFile.java             |  4 ++--
 src/main/org/apache/tools/zip/ZipOutputStream.java     |  7 ++++++-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/org/apache/tools/zip/JarMarker.java b/src/main/org/apache/tools/zip/JarMarker.java
index 30d584af6..c0633539f 100644
--- a/src/main/org/apache/tools/zip/JarMarker.java
+++ b/src/main/org/apache/tools/zip/JarMarker.java
@@ -28,17 +28,19 @@ import java.util.zip.ZipException;
  */
 public final class JarMarker implements ZipExtraField {
 
-    private static ZipShort ID = new ZipShort(0xCAFE);
-    private static ZipShort NULL = new ZipShort(0);
-    private static byte[] NO_BYTES = new byte[0];
-    private static JarMarker DEFAULT = new JarMarker();
+    private static final ZipShort ID = new ZipShort(0xCAFE);
+    private static final ZipShort NULL = new ZipShort(0);
+    private static final byte[] NO_BYTES = new byte[0];
+    private static final JarMarker DEFAULT = new JarMarker();
 
+    /** No-arg constructor */
     public JarMarker() {
         // empty
     }
 
     /**
      * Since JarMarker is stateless we can always use the same instance.
+     * @return the DEFAULT jarmaker.
      */
     public static JarMarker getInstance() {
         return DEFAULT;
diff --git a/src/main/org/apache/tools/zip/UnrecognizedExtraField.java b/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
index 8f314828f..79f2e6e1b 100644
--- a/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
+++ b/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
@@ -124,6 +124,9 @@ public class UnrecognizedExtraField implements ZipExtraField {
     }
 
     /**
+     * @param data the array of bytes.
+     * @param offset the source location in the data array.
+     * @param length the number of bytes to use in the data array.
      * @see ZipExtraField#parseFromLocalFileData(byte[], int, int)
      */
     public void parseFromLocalFileData(byte[] data, int offset, int length) {
diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java
index 27668a984..846c6f775 100644
--- a/src/main/org/apache/tools/zip/ZipFile.java
+++ b/src/main/org/apache/tools/zip/ZipFile.java
@@ -72,8 +72,8 @@ public class ZipFile {
     private Hashtable nameMap = new Hashtable(509);
 
     private static final class OffsetEntry {
-        long headerOffset = -1;
-        long dataOffset = -1;
+        private long headerOffset = -1;
+        private long dataOffset = -1;
     }
 
     /**
diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java
index 3dac8051b..2c4c4a979 100644
--- a/src/main/org/apache/tools/zip/ZipOutputStream.java
+++ b/src/main/org/apache/tools/zip/ZipOutputStream.java
@@ -193,6 +193,8 @@ public class ZipOutputStream extends FilterOutputStream {
      */
     private String encoding = null;
 
+    // CheckStyle:VisibilityModifier OFF - bc
+
     /**
      * This Deflater object is used for output.
      *
@@ -217,6 +219,8 @@ public class ZipOutputStream extends FilterOutputStream {
      */
     protected byte[] buf = new byte[512];
 
+    // CheckStyle:VisibilityModifier ON
+
     /**
      * Optional random access output.
      *
@@ -881,7 +885,8 @@ public class ZipOutputStream extends FilterOutputStream {
     /**
      * Assumes a negative integer really is a positive integer that
      * has wrapped around and re-creates the original value.
-     *
+     * @param i the value to treat as unsigned int.
+     * @return the unsigned int as a long.
      * @since 1.34
      */
     protected static long adjustToLong(int i) {