From de36f65dd133d189aa889f70bf380499596a310c Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 3 Nov 2002 20:27:31 +0000 Subject: GNU Classpath merge. 2002-10-31 Stephen Crawley * java/lang/Double.java (valueOf): Return new Double(parseDouble(s)). 2002-10-31 Wu Gansha : * java/util/ArrayList.java (readObject, writeObject): Only read/write size items. 2002-10-31 Wu Gansha : * java/io/DataInputStream.java (convertFromUTF): Give StringBuffer an initial estimated size to avoid enlarge buffer frequently. 2002-10-31 Wu Gansha : * java/lang/reflect/Proxy.java (ProxyType): Set loader to System ClassLoader when null. (ProxyType.hashCode): Loader null check no longer needed. (ProxyType.sameTypes): New method. (ProxyType.equals): Use new method. 2002-10-31 Mark Wielaard * java/net/URLDecoder.java (decode): Initialize Stringbuffer size to length of String. * java/net/URLEncoder.java (encode): Likewise. 2002-10-31 Mark Wielaard * java/util/zip/ZipInputStream.java (getNextEntry): Throw IOException when stream is closed. (closeEntry): Likewise. (read): Likewise. * java/util/zip/ZipOutputStream.java (putNextEntry): Throw ZipException when no entry active. (closeEntry): Likewise. (write): Likewise. From-SVN: r58772 --- libjava/java/util/zip/ZipOutputStream.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libjava/java/util/zip/ZipOutputStream.java') diff --git a/libjava/java/util/zip/ZipOutputStream.java b/libjava/java/util/zip/ZipOutputStream.java index e4fb864a955..44c4a9cc9b1 100644 --- a/libjava/java/util/zip/ZipOutputStream.java +++ b/libjava/java/util/zip/ZipOutputStream.java @@ -158,12 +158,12 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant * is not set in the entry, the current time is used. * @param entry the entry. * @exception IOException if an I/O error occured. - * @exception IllegalStateException if stream was finished + * @exception ZipException if stream was finished. */ public void putNextEntry(ZipEntry entry) throws IOException { if (entries == null) - throw new IllegalStateException("ZipOutputStream was finished"); + throw new ZipException("ZipOutputStream was finished"); int method = entry.getMethod(); int flags = 0; @@ -249,12 +249,12 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant /** * Closes the current entry. * @exception IOException if an I/O error occured. - * @exception IllegalStateException if no entry is active. + * @exception ZipException if no entry is active. */ public void closeEntry() throws IOException { if (curEntry == null) - throw new IllegalStateException("No open entry"); + throw new ZipException("No open entry"); /* First finish the deflater, if appropriate */ if (curMethod == DEFLATED) @@ -300,12 +300,12 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant /** * Writes the given buffer to the current entry. * @exception IOException if an I/O error occured. - * @exception IllegalStateException if no entry is active. + * @exception ZipException if no entry is active. */ public void write(byte[] b, int off, int len) throws IOException { if (curEntry == null) - throw new IllegalStateException("No open entry."); + throw new ZipException("No open entry."); switch (curMethod) { -- cgit v1.2.3