harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r487944 - /harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java
Date Sun, 17 Dec 2006 05:54:23 GMT
Author: ndbeyer
Date: Sat Dec 16 21:54:23 2006
New Revision: 487944

URL: http://svn.apache.org/viewvc?view=rev&rev=487944
Log:
Clean up and reorganize source; convert unnecessary inner class into static methods

Modified:
    harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java?view=diff&rev=487944&r1=487943&r2=487944
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java
Sat Dec 16 21:54:23 2006
@@ -17,7 +17,6 @@
 
 package java.util.jar;
 
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -31,309 +30,281 @@
 import org.apache.harmony.luni.util.PriviAction;
 
 /**
- * The Manifest class is used to obtain attribute information for a JarFile and
- * it's entries.
+ * The Manifest class is used to obtain attribute information for a JarFile and its entries.
  * 
  */
 public class Manifest implements Cloneable {
-	Attributes mainAttributes = new Attributes();
+    private static final int LINE_LENGTH_LIMIT = 70;
+
+    private static final byte[] LINE_SEPARATOR = new byte[] { '\r', '\n' };
+
+    private static final Attributes.Name NAME_ATTRIBUTE = new Attributes.Name("Name"); //$NON-NLS-1$
+
+    private Attributes mainAttributes = new Attributes();
 
-	HashMap<String, Attributes> entryAttributes = new HashMap<String, Attributes>();
+    private HashMap<String, Attributes> entryAttributes = new HashMap<String, Attributes>();
 
-	private HashMap<String, byte[]> chunks;
+    private HashMap<String, byte[]> chunks;
 
-	/*The data chunk of Main Attributes in the manifest is needed in verification.*/
-	private byte[] mainAttributesChunk;
-	
-	/**
-	 * Constructs a new Manifest instance.
-	 */
-	public Manifest() {
+    /**
+     * The data chunk of Main Attributes in the manifest is needed in verification.
+     */
+    private byte[] mainAttributesChunk;
+
+    /**
+     * Constructs a new Manifest instance.
+     */
+    public Manifest() {
         super();
-	}
+    }
 
-	/**
-	 * Constructs a new Manifest instance using the attributes obtained from is.
-	 * 
-	 * @param is
-	 *            InputStream to parse for attributes
-	 * 
-	 * @throws IOException
-	 *             if an IO error occurs while creating this Manifest
-	 * 
-	 */
-	public Manifest(InputStream is) throws IOException {
-		read(is);
-	}
-
-	Manifest(InputStream is, boolean readChunks) throws IOException {
-		if (readChunks) {
-			chunks = new HashMap<String, byte[]>();
-        }
-		read(is);
-	}
+    /**
+     * Constructs a new Manifest instance using the attributes obtained from is.
+     * 
+     * @param is InputStream to parse for attributes
+     * 
+     * @throws IOException if an IO error occurs while creating this Manifest
+     * 
+     */
+    public Manifest(InputStream is) throws IOException {
+        super();
+        read(is);
+    }
 
-	/**
-	 * Resets the both the mainAttributes as well as the entry Attributes
-	 * associated with this Manifest.
-	 */
-	public void clear() {
-		entryAttributes.clear();
-		mainAttributes.clear();
-	}
-
-	/**
-	 * Returns the Attributes associated with the parameter entry name
-	 * 
-	 * @param name
-	 *            The name of the entry to obtain Attributes for.
-	 * @return The Attributes for the entry or null if the entry does not exist.
-	 */
-	public Attributes getAttributes(String name) {
-		return getEntries().get(name);
-	}
-
-	/**
-	 * Returns a Map containing the Attributes for each entry in the Manifest.
-	 * 
-	 * @return A Map of entry attributes
-	 */
-	public Map<String, Attributes> getEntries() {
-		return entryAttributes;
-	}
-
-	/**
-	 * Returns the main Attributes of the JarFile.
-	 * 
-	 * @return Main Attributes associated with the source JarFile
-	 */
-	public Attributes getMainAttributes() {
-		return mainAttributes;
-	}
-
-	/**
-	 * Constructs a new Manifest instance. The new instance will have the same
-	 * attributes as those found in the parameter Manifest.
-	 * 
-	 * @param man
-	 *            Manifest instance to obtain attributes from
-	 */
-	@SuppressWarnings("unchecked")
+    /**
+     * Constructs a new Manifest instance. The new instance will have the same attributes
as
+     * those found in the parameter Manifest.
+     * 
+     * @param man Manifest instance to obtain attributes from
+     */
+    @SuppressWarnings("unchecked")
     public Manifest(Manifest man) {
-		mainAttributes = (Attributes) man.mainAttributes.clone();
-		entryAttributes = (HashMap<String, Attributes>) man.entryAttributes.clone();
-	}
-
-	/**
-	 * Creates a copy of this Manifest. The returned Manifest will equal the
-	 * Manifest from which it was cloned.
-	 * 
-	 * @return A copy of the receiver.
-	 */
-	@Override
-    public Object clone() {
-		return new Manifest(this);
-	}
-
-	static class WriteManifest {
-		private static final int LIMIT = 70;
+        mainAttributes = (Attributes) man.mainAttributes.clone();
+        entryAttributes = (HashMap<String, Attributes>) man.entryAttributes.clone();
+    }
+
+    Manifest(InputStream is, boolean readChunks) throws IOException {
+        if (readChunks) {
+            chunks = new HashMap<String, byte[]>();
+        }
+        read(is);
+    }
 
-		private static final byte[] sepBuf = new byte[] { '\r', '\n' };
+    /**
+     * Resets the both the mainAttributes as well as the entry Attributes associated with
this
+     * Manifest.
+     */
+    public void clear() {
+        entryAttributes.clear();
+        mainAttributes.clear();
+    }
+
+    /**
+     * Returns the Attributes associated with the parameter entry name
+     * 
+     * @param name The name of the entry to obtain Attributes for.
+     * @return The Attributes for the entry or null if the entry does not exist.
+     */
+    public Attributes getAttributes(String name) {
+        return getEntries().get(name);
+    }
+
+    /**
+     * Returns a Map containing the Attributes for each entry in the Manifest.
+     * 
+     * @return A Map of entry attributes
+     */
+    public Map<String, Attributes> getEntries() {
+        return entryAttributes;
+    }
+
+    /**
+     * Returns the main Attributes of the JarFile.
+     * 
+     * @return Main Attributes associated with the source JarFile
+     */
+    public Attributes getMainAttributes() {
+        return mainAttributes;
+    }
+
+    /**
+     * Creates a copy of this Manifest. The returned Manifest will equal the Manifest from
which
+     * it was cloned.
+     * 
+     * @return A copy of the receiver.
+     */
+    @Override
+    public Object clone() {
+        return new Manifest(this);
+    }
 
-		private static final Attributes.Name nameAttribute = new Attributes.Name(
-				"Name"); //$NON-NLS-1$
-
-		byte[] oneByte = new byte[1];
-
-		char[] oneChar = new char[1];
-
-		private Charset charset;
-
-		private final byte[] outBuf = new byte[LIMIT];
-
-		OutputStream os;
-
-		/**
-		 * Writes out a manifest entry.
-		 */
-		private void writeEntry(Attributes.Name name, String value)
-				throws IOException {
-			int offset = 0, limit = LIMIT;
-			byte[] out = (name.toString() + ": ").getBytes("ISO8859_1"); //$NON-NLS-1$ //$NON-NLS-2$
-			if (out.length > limit) {
-				while (out.length - offset >= limit) {
-					int len = out.length - offset;
-					if (len > limit) {
-                        len = limit;
-                    }
-					if (offset > 0) {
-                        os.write(' ');
-                    }
-					os.write(out, offset, len);
-					os.write(sepBuf);
-					offset += len;
-					limit = LIMIT - 1;
-				}
-			}
-			int size = out.length - offset;
-			System.arraycopy(out, offset, outBuf, 0, size);
-			for (int i = 0; i < value.length(); i++) {
-				oneChar[0] = value.charAt(i);
-				byte[] buf;
-				if (oneChar[0] < 128 || charset == null) {
-					oneByte[0] = (byte) oneChar[0];
-					buf = oneByte;
-				} else {
-                    buf = charset.encode(CharBuffer.wrap(oneChar, 0, 1)).array();
-                }
-				if (size + buf.length > limit) {
-					if (limit != LIMIT) {
-                        os.write(' ');
-                    }
-					os.write(outBuf, 0, size);
-					os.write(sepBuf);
-					limit = LIMIT - 1;
-					size = 0;
-				}
-				if (buf.length == 1) {
-                    outBuf[size] = buf[0];
-                } else {
-                    System.arraycopy(buf, 0, outBuf, size, buf.length);
-                }
-				size += buf.length;
-			}
-			if (size > 0) {
-				if (limit != LIMIT) {
-                    os.write(' ');
-                }
-				os.write(outBuf, 0, size);
-				os.write(sepBuf);
-			}
-		}
-
-		/**
-		 * Writes out the attribute information of the receiver to the specified
-		 * OutputStream
-		 * 
-		 * 
-		 * @param manifest
-		 *            the attribute information of the receiver
-		 * @param out
-		 *            The OutputStream to write to.
-		 * 
-		 * @throws IOException
-		 *             If an error occurs writing the Manifest
-		 */
-		void write(Manifest manifest, OutputStream out) throws IOException {
-			os = out;
-			String encoding = AccessController
-					.doPrivileged(new PriviAction<String>("manifest.write.encoding")); //$NON-NLS-1$
-			if (encoding != null) {
-				if ("".equals(encoding)) { //$NON-NLS-1$
-                    encoding = "UTF8"; //$NON-NLS-1$
-                }
-				charset = Charset.forName(encoding);				
-			}
-			String version = manifest.mainAttributes
-					.getValue(Attributes.Name.MANIFEST_VERSION);
-			if (version != null) {
-				writeEntry(Attributes.Name.MANIFEST_VERSION, version);
-				Iterator<?> entries = manifest.mainAttributes.keySet().iterator();
-				while (entries.hasNext()) {
-					Attributes.Name name = (Attributes.Name) entries.next();
-					if (!name.equals(Attributes.Name.MANIFEST_VERSION)) {
-                        writeEntry(name, manifest.mainAttributes.getValue(name));
-                    }
-				}
-			}
-			os.write(sepBuf);
-			Iterator<String> i = manifest.entryAttributes.keySet().iterator();
-			while (i.hasNext()) {
-				String key = i.next();
-				writeEntry(nameAttribute, key);
-				Attributes attrib = manifest.entryAttributes.get(key);
-				Iterator<?> entries = attrib.keySet().iterator();
-				while (entries.hasNext()) {
-					Attributes.Name name = (Attributes.Name) entries.next();
-					writeEntry(name, attrib.getValue(name));
-				}
-				os.write(sepBuf);
-			}
-		}
-	}
-
-	/**
-	 * Writes out the attribute information of the receiver to the specified
-	 * OutputStream
-	 * 
-	 * @param os
-	 *            The OutputStream to write to.
-	 * 
-	 * @throws IOException
-	 *             If an error occurs writing the Manifest
-	 */
-	public void write(OutputStream os) throws IOException {
-		new WriteManifest().write(this, os);
-	}
-
-	/**
-	 * Constructs a new Manifest instance obtaining Attribute information from
-	 * the parameter InputStream.
-	 * 
-	 * @param is
-	 *            The InputStream to read from
-	 * @throws IOException
-	 *             If an error occurs reading the Manifest.
-	 */
-	public void read(InputStream is) throws IOException {
-		InitManifest initManifest = new InitManifest(is, mainAttributes, entryAttributes, chunks,
null);
-		mainAttributesChunk = initManifest.getMainAttributesChunk();
-	}
-
-	/**
-	 * Returns the hashCode for this instance.
-	 * 
-	 * @return This Manifest's hashCode
-	 */
-	@Override
+    /**
+     * Writes out the attribute information of the receiver to the specified OutputStream
+     * 
+     * @param os The OutputStream to write to.
+     * 
+     * @throws IOException If an error occurs writing the Manifest
+     */
+    public void write(OutputStream os) throws IOException {
+        write(this, os);
+    }
+
+    /**
+     * Constructs a new Manifest instance obtaining Attribute information from the parameter
+     * InputStream.
+     * 
+     * @param is The InputStream to read from
+     * @throws IOException If an error occurs reading the Manifest.
+     */
+    public void read(InputStream is) throws IOException {
+        InitManifest initManifest = new InitManifest(is, mainAttributes, entryAttributes,
+                chunks, null);
+        mainAttributesChunk = initManifest.getMainAttributesChunk();
+    }
+
+    /**
+     * Returns the hashCode for this instance.
+     * 
+     * @return This Manifest's hashCode
+     */
+    @Override
     public int hashCode() {
-		return mainAttributes.hashCode() ^ entryAttributes.hashCode();
-	}
+        return mainAttributes.hashCode() ^ entryAttributes.hashCode();
+    }
 
-	/**
-	 * Determines if the receiver is equal to the parameter Object. Two
-	 * Manifests are equal if they have identical main Attributes as well as
-	 * identical entry Attributes.
-	 * 
-	 * @param o
-	 *            The Object to compare against.
-	 * @return <code>true</code> if the manifests are equal,
-	 *         <code>false</code> otherwise
-	 */
-	@Override
+    /**
+     * Determines if the receiver is equal to the parameter Object. Two Manifests are equal
if
+     * they have identical main Attributes as well as identical entry Attributes.
+     * 
+     * @param o The Object to compare against.
+     * @return <code>true</code> if the manifests are equal, <code>false</code>
otherwise
+     */
+    @Override
     public boolean equals(Object o) {
-		if (o == null) {
+        if (o == null) {
             return false;
         }
-		if (o.getClass() != this.getClass()) {
+        if (o.getClass() != this.getClass()) {
             return false;
         }
-		if (!mainAttributes.equals(((Manifest) o).mainAttributes)) {
+        if (!mainAttributes.equals(((Manifest) o).mainAttributes)) {
             return false;
         }
-		return entryAttributes.equals(((Manifest) o).entryAttributes);
-	}
+        return entryAttributes.equals(((Manifest) o).entryAttributes);
+    }
 
-	byte[] getChunk(String name) {
-		return chunks.get(name);
-	}
-
-	void removeChunks() {
-		chunks = null;
-	}
-	
-	byte[] getMainAttributesChunk()
-	{
-		return mainAttributesChunk;
-	}
+    byte[] getChunk(String name) {
+        return chunks.get(name);
+    }
+
+    void removeChunks() {
+        chunks = null;
+    }
+
+    byte[] getMainAttributesChunk() {
+        return mainAttributesChunk;
+    }
+
+    /**
+     * Writes out the attribute information of the receiver to the specified OutputStream
+     * 
+     * @param manifest the attribute information of the receiver
+     * @param out The OutputStream to write to.
+     * 
+     * @throws IOException If an error occurs writing the Manifest
+     */
+    static void write(Manifest manifest, OutputStream out) throws IOException {
+        Charset charset = null;
+        String encoding = AccessController.doPrivileged(new PriviAction<String>(
+                "manifest.write.encoding")); //$NON-NLS-1$
+        if (encoding != null) {
+            if (encoding.length() == 0) {
+                encoding = "UTF8"; //$NON-NLS-1$
+            }
+            charset = Charset.forName(encoding);
+        }
+        String version = manifest.mainAttributes.getValue(Attributes.Name.MANIFEST_VERSION);
+        if (version != null) {
+            writeEntry(out, charset, Attributes.Name.MANIFEST_VERSION, version);
+            Iterator<?> entries = manifest.mainAttributes.keySet().iterator();
+            while (entries.hasNext()) {
+                Attributes.Name name = (Attributes.Name) entries.next();
+                if (!name.equals(Attributes.Name.MANIFEST_VERSION)) {
+                    writeEntry(out, charset, name, manifest.mainAttributes.getValue(name));
+                }
+            }
+        }
+        out.write(LINE_SEPARATOR);
+        Iterator<String> i = manifest.entryAttributes.keySet().iterator();
+        while (i.hasNext()) {
+            String key = i.next();
+            writeEntry(out, charset, NAME_ATTRIBUTE, key);
+            Attributes attrib = manifest.entryAttributes.get(key);
+            Iterator<?> entries = attrib.keySet().iterator();
+            while (entries.hasNext()) {
+                Attributes.Name name = (Attributes.Name) entries.next();
+                writeEntry(out, charset, name, attrib.getValue(name));
+            }
+            out.write(LINE_SEPARATOR);
+        }
+    }
+
+    private static void writeEntry(OutputStream os, Charset charset, Attributes.Name name,
+            String value) throws IOException {
+        int offset = 0;
+        int limit = LINE_LENGTH_LIMIT;
+        byte[] out = (name.toString() + ": ").getBytes("ISO8859_1"); //$NON-NLS-1$ //$NON-NLS-2$
+        if (out.length > limit) {
+            while (out.length - offset >= limit) {
+                int len = out.length - offset;
+                if (len > limit) {
+                    len = limit;
+                }
+                if (offset > 0) {
+                    os.write(' ');
+                }
+                os.write(out, offset, len);
+                os.write(LINE_SEPARATOR);
+                offset += len;
+                limit = LINE_LENGTH_LIMIT - 1;
+            }
+        }
+        int size = out.length - offset;
+        final byte[] outBuf = new byte[LINE_LENGTH_LIMIT];
+        System.arraycopy(out, offset, outBuf, 0, size);
+        for (int i = 0; i < value.length(); i++) {
+            char[] oneChar = new char[1];
+            oneChar[0] = value.charAt(i);
+            byte[] buf;
+            if (oneChar[0] < 128 || charset == null) {
+                byte[] oneByte = new byte[1];
+                oneByte[0] = (byte) oneChar[0];
+                buf = oneByte;
+            } else {
+                buf = charset.encode(CharBuffer.wrap(oneChar, 0, 1)).array();
+            }
+            if (size + buf.length > limit) {
+                if (limit != LINE_LENGTH_LIMIT) {
+                    os.write(' ');
+                }
+                os.write(outBuf, 0, size);
+                os.write(LINE_SEPARATOR);
+                limit = LINE_LENGTH_LIMIT - 1;
+                size = 0;
+            }
+            if (buf.length == 1) {
+                outBuf[size] = buf[0];
+            } else {
+                System.arraycopy(buf, 0, outBuf, size, buf.length);
+            }
+            size += buf.length;
+        }
+        if (size > 0) {
+            if (limit != LINE_LENGTH_LIMIT) {
+                os.write(' ');
+            }
+            os.write(outBuf, 0, size);
+            os.write(LINE_SEPARATOR);
+        }
+    }
 }



Mime
View raw message