From e0441a5bfb29083a532307ba2b1fd6d6d13944ba Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 28 Jun 2008 13:29:13 +0000 Subject: Import GNU Classpath (classpath-0_97_2-release). libjava/ 2008-06-28 Matthias Klose Import GNU Classpath (classpath-0_97_2-release). * Regenerate class and header files. * Regenerate auto* files. * gcj/javaprims.h: Define jobjectRefType. * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only). (_Jv_JNIFunctions): Initialize GetObjectRefType. * gnu/classpath/jdwp/VMVirtualMachine.java, java/security/VMSecureRandom.java: Merge from classpath. * HACKING: Fix typo. * ChangeLog-2007: New file. * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath. libjava/classpath/ 2008-06-28 Matthias Klose * m4/ac_prog_javac.m4: Disable check for JAVAC, when not configured with --enable-java-maintainer-mode. * aclocal.m4, configure: Regenerate. * native/jni/gstreamer-peer/Makefile.am: Do not link with libclasspathnative. * native/jni/gstreamer-peer/Makefile.in: Regenerate. * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting JCOMPILER, drop flags not understood by gcj. From-SVN: r137223 --- libjava/classpath/java/net/URI.java | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'libjava/classpath/java/net/URI.java') diff --git a/libjava/classpath/java/net/URI.java b/libjava/classpath/java/net/URI.java index 4bf4db9856c..85e0e04f236 100644 --- a/libjava/classpath/java/net/URI.java +++ b/libjava/classpath/java/net/URI.java @@ -483,7 +483,7 @@ public final class URI */ private static String quote(String str, String legalCharacters) { - StringBuffer sb = new StringBuffer(str.length()); + StringBuilder sb = new StringBuilder(str.length()); for (int i = 0; i < str.length(); i++) { char c = str.charAt(i); @@ -778,8 +778,8 @@ public final class URI This follows the algorithm in section 5.2.4. of RFC3986, but doesn't modify the input buffer. */ - StringBuffer input = new StringBuffer(relativePath); - StringBuffer output = new StringBuffer(); + StringBuilder input = new StringBuilder(relativePath); + StringBuilder output = new StringBuilder(); int start = 0; while (start < input.length()) { @@ -853,7 +853,7 @@ public final class URI * * @param buffer the buffer containing the path. */ - private void removeLastSegment(StringBuffer buffer) + private void removeLastSegment(StringBuilder buffer) { int lastSlash = buffer.lastIndexOf("/"); if (lastSlash == -1) @@ -899,7 +899,7 @@ public final class URI path = ""; if (! (path.startsWith("/"))) { - StringBuffer basepath = new StringBuffer(this.path); + StringBuilder basepath = new StringBuilder(this.path); int i = this.path.lastIndexOf('/'); if (i >= 0) @@ -1321,7 +1321,8 @@ public final class URI int hCompare = host.compareTo(uri.getHost()); if (hCompare != 0) return hCompare; - return new Integer(port).compareTo(new Integer(uri.getPort())); + int uriPort = uri.getPort(); + return (uriPort == port) ? 0 : (uriPort > port) ? -1 : 1; } } if (rawPath == null && uri.getRawPath() != null) @@ -1387,8 +1388,8 @@ public final class URI { String strRep = toString(); boolean inNonAsciiBlock = false; - StringBuffer buffer = new StringBuffer(); - StringBuffer encBuffer = null; + StringBuilder buffer = new StringBuilder(); + StringBuilder encBuffer = null; for (int i = 0; i < strRep.length(); i++) { char c = strRep.charAt(i); @@ -1405,7 +1406,7 @@ public final class URI { if (!inNonAsciiBlock) { - encBuffer = new StringBuffer(); + encBuffer = new StringBuilder(); inNonAsciiBlock = true; } encBuffer.append(c); @@ -1427,7 +1428,7 @@ public final class URI { try { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); // this is far from optimal, but it works byte[] utf8 = str.getBytes("utf-8"); for (int j = 0; j < utf8.length; j++) -- cgit v1.2.3