From 5f69d8ab05ddfa87426e7eca10f68bbb7d907641 Mon Sep 17 00:00:00 2001 From: mark 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58772 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/net/URLDecoder.java | 5 ++--- libjava/java/net/URLEncoder.java | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'libjava/java/net') diff --git a/libjava/java/net/URLDecoder.java b/libjava/java/net/URLDecoder.java index 8cdcf943825..36747409983 100644 --- a/libjava/java/net/URLDecoder.java +++ b/libjava/java/net/URLDecoder.java @@ -63,7 +63,7 @@ import java.io.UnsupportedEncodingException; public class URLDecoder { /** - * Constructor for compatibility with Sun's JDK. + * Public contructor. Note that this class has only static methods. */ public URLDecoder () { @@ -116,8 +116,6 @@ public class URLDecoder public static String decode(String s, String encoding) throws UnsupportedEncodingException { - StringBuffer result = new StringBuffer(); - // First convert all '+' characters to spaces. String str = s.replace('+', ' '); @@ -126,6 +124,7 @@ public class URLDecoder int start = 0; byte[] bytes = null; int length = str.length(); + StringBuffer result = new StringBuffer(length); while ((i = str.indexOf('%', start)) >= 0) { // Add all non-encoded characters to the result buffer diff --git a/libjava/java/net/URLEncoder.java b/libjava/java/net/URLEncoder.java index 345ef2404d5..0f106e820de 100644 --- a/libjava/java/net/URLEncoder.java +++ b/libjava/java/net/URLEncoder.java @@ -1,5 +1,5 @@ /* URLEncoder.java -- Class to convert strings to a properly encoded URL - Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,7 +39,7 @@ package java.net; import java.io.UnsupportedEncodingException; -/** +/* * Written using on-line Java Platform 1.2/1.4 API Specification, as well * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). * Status: Believed complete and correct. @@ -102,11 +102,11 @@ public class URLEncoder public static String encode(String s, String encoding) throws UnsupportedEncodingException { - StringBuffer result = new StringBuffer(); int length = s.length(); int start = 0; int i = 0; + StringBuffer result = new StringBuffer(length); while (true) { while ( i < length && isSafe(s.charAt(i)) ) -- cgit v1.2.3