--- a/jdk/make/CompileDemos.gmk Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/make/CompileDemos.gmk Mon Jun 16 13:48:58 2014 -0400
@@ -1,6 +1,5 @@
-
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -320,7 +319,6 @@
endif
$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \
- -I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
$(BUILD_LIBHPROF_AIX_EXTRA_CFLAGS), C, \
-ldl, ws2_32.lib winmm.lib, -lsocket -lnsl, -lpthread, $(BUILD_LIBHPROF_AIX_EXTRA_SRC)))
--- a/jdk/make/CreateJars.gmk Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/make/CreateJars.gmk Mon Jun 16 13:48:58 2014 -0400
@@ -676,15 +676,6 @@
##########################################################################################
-#
-# This is an empty jar (only contains manifest) and fits poorly into framework...
-# create simple rule instead
-#
-$(IMAGES_OUTPUTDIR)/lib/management-agent.jar: $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
- $(JAR) cfm $@ $<
-
-##########################################################################################
-
# This file is imported from hotspot in Import.gmk. Copying it into images/lib so that
# all jars can be found in one place when creating images in Images.gmk. It needs to be
# done here so that clean targets can be simple and accurate.
--- a/jdk/make/lib/CoreLibraries.gmk Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/make/lib/CoreLibraries.gmk Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -526,30 +526,3 @@
BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
endif
-
-##########################################################################################
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \
- LIBRARY := npt, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/npt $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/npt \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
- MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_macosx := -liconv, \
- LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=npt.dll" \
- -D "JDK_INTERNAL_NAME=npt" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnpt, \
- DEBUG_SYMBOLS := true))
-
-BUILD_LIBRARIES += $(BUILD_LIBNPT)
--- a/jdk/make/lib/ServiceabilityLibraries.gmk Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/make/lib/ServiceabilityLibraries.gmk Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -147,8 +147,6 @@
CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) -DJDWP_LOGGING \
-I$(JDK_TOPDIR)/src/share/transport/export \
-I$(JDK_TOPDIR)/src/share/back/export \
- -I$(JDK_TOPDIR)/src/share/npt \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
-I$(JDK_TOPDIR)/src/share/back \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back \
-I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers, \
@@ -158,6 +156,7 @@
LDFLAGS_SUFFIX_linux := $(LIBDL), \
LDFLAGS_SUFFIX_solaris := $(LIBDL) -lc, \
LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
+ LDFLAGS_SUFFIX_macosx := -liconv, \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS := $(RC_FLAGS) \
-D "JDK_FNAME=jdwp.dll" \
@@ -340,8 +339,6 @@
BUILD_LIBHPROF_SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/hprof $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/hprof
BUILD_LIBHPROF_CFLAGS := -I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \
- -I$(JDK_TOPDIR)/src/share/npt \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
-I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo
ifeq ($(OPENJDK_TARGET_OS), aix)
--- a/jdk/make/mapfiles/libnpt/mapfile-vers Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
- global:
- nptInitialize;
- nptTerminate;
- local:
- *;
-};
--- a/jdk/make/profile-includes.txt Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/make/profile-includes.txt Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -127,12 +127,9 @@
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)jsdt.diz \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)management$(SHARED_LIBRARY_SUFFIX) \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)management.diz \
- $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)npt$(SHARED_LIBRARY_SUFFIX) \
- $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)npt.diz \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)prefs$(SHARED_LIBRARY_SUFFIX) \
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)sctp$(SHARED_LIBRARY_SUFFIX) \
jvm.hprof.txt \
- management-agent.jar \
management/jmxremote.access \
management/jmxremote.password.template \
management/management.properties \
@@ -140,8 +137,7 @@
PROFILE_3_JRE_OTHER_FILES :=
-PROFILE_3_JRE_JAR_FILES := \
- management-agent.jar
+PROFILE_3_JRE_JAR_FILES :=
FULL_JRE_BIN_FILES := \
--- a/jdk/make/src/classes/build/tools/buildmetaindex/BuildMetaIndex.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/make/src/classes/build/tools/buildmetaindex/BuildMetaIndex.java Mon Jun 16 13:48:58 2014 -0400
@@ -53,7 +53,6 @@
com/sun/net/
javax/
com/sun/security/
-# management-agent.jar
! rt.jar
org/w3c/
com/sun/image/
--- a/jdk/src/share/back/debugInit.c Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/back/debugInit.c Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -202,8 +202,6 @@
jint jvmtiCompileTimeMajorVersion;
jint jvmtiCompileTimeMinorVersion;
jint jvmtiCompileTimeMicroVersion;
- char *boot_path = NULL;
- char npt_lib[MAXPATHLEN];
/* See if it's already loaded */
if ( gdata!=NULL && gdata->isLoaded==JNI_TRUE ) {
@@ -268,24 +266,6 @@
forceExit(1); /* Kill entire process, no core dump wanted */
}
- JVMTI_FUNC_PTR(gdata->jvmti, GetSystemProperty)
- (gdata->jvmti, (const char *)"sun.boot.library.path",
- &boot_path);
-
- dbgsysBuildLibName(npt_lib, sizeof(npt_lib), boot_path, NPT_LIBNAME);
- /* Npt and Utf function init */
- NPT_INITIALIZE(npt_lib, &(gdata->npt), NPT_VERSION, NULL);
- jvmtiDeallocate(boot_path);
- if (gdata->npt == NULL) {
- ERROR_MESSAGE(("JDWP: unable to initialize NPT library"));
- return JNI_ERR;
- }
- gdata->npt->utf = (gdata->npt->utfInitialize)(NULL);
- if (gdata->npt->utf == NULL) {
- ERROR_MESSAGE(("JDWP: UTF function initialization failed"));
- return JNI_ERR;
- }
-
/* Parse input options */
if (!parseOptions(options)) {
/* No message necessary, should have been printed out already */
--- a/jdk/src/share/back/error_messages.c Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/back/error_messages.c Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@
#include <errno.h>
#include "util.h"
+#include "utf_util.h"
#include "proc_md.h"
/* Maximim length of a message */
@@ -70,13 +71,8 @@
len = (int)strlen((char*)utf8buf);
/* Convert to platform encoding (ignore errors, dangerous area) */
- if (gdata->npt != NULL) {
- (void)(gdata->npt->utf8ToPlatform)(gdata->npt->utf,
- utf8buf, len, pbuf, MAX_MESSAGE_LEN);
- } else {
- /* May be called before NPT is initialized so don't fault */
- strncpy(pbuf, (char*)utf8buf, len);
- }
+ (void)utf8ToPlatform(utf8buf, len, pbuf, MAX_MESSAGE_LEN);
+
(void)fprintf(fp, "%s%s%s", prefix, pbuf, suffix);
}
--- a/jdk/src/share/back/inStream.c Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/back/inStream.c Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
*/
#include "util.h"
+#include "utf_util.h"
#include "stream.h"
#include "inStream.h"
#include "transport.h"
@@ -379,15 +380,12 @@
string[length] = '\0';
/* This is Standard UTF-8, convert to Modified UTF-8 if necessary */
- new_length = (gdata->npt->utf8sToUtf8mLength)
- (gdata->npt->utf, (jbyte*)string, length);
+ new_length = utf8sToUtf8mLength((jbyte*)string, length);
if ( new_length != length ) {
char *new_string;
new_string = jvmtiAllocate(new_length+1);
- (gdata->npt->utf8sToUtf8m)
- (gdata->npt->utf, (jbyte*)string, length,
- (jbyte*)new_string, new_length);
+ utf8sToUtf8m((jbyte*)string, length, (jbyte*)new_string, new_length);
jvmtiDeallocate(string);
return new_string;
}
--- a/jdk/src/share/back/outStream.c Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/back/outStream.c Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
*/
#include "util.h"
+#include "utf_util.h"
#include "stream.h"
#include "outStream.h"
#include "inStream.h"
@@ -307,8 +308,7 @@
} else {
jint new_length;
- new_length = (gdata->npt->utf8mToUtf8sLength)
- (gdata->npt->utf, (jbyte*)string, length);
+ new_length = utf8mToUtf8sLength((jbyte*)string, length);
if ( new_length == length ) {
(void)outStream_writeInt(stream, length);
error = writeBytes(stream, (jbyte *)string, length);
@@ -316,9 +316,7 @@
char *new_string;
new_string = jvmtiAllocate(new_length+1);
- (gdata->npt->utf8mToUtf8s)
- (gdata->npt->utf, (jbyte*)string, length,
- (jbyte*)new_string, new_length);
+ utf8mToUtf8s((jbyte*)string, length, (jbyte*)new_string, new_length);
(void)outStream_writeInt(stream, new_length);
error = writeBytes(stream, (jbyte *)new_string, new_length);
jvmtiDeallocate(new_string);
--- a/jdk/src/share/back/transport.c Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/back/transport.c Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
*/
#include "util.h"
+#include "utf_util.h"
#include "transport.h"
#include "debugLoop.h"
#include "sys.h"
@@ -65,8 +66,7 @@
len = (int)strlen(msg);
maxlen = len+len/2+2; /* Should allow for plenty of room */
utf8msg = (jbyte*)jvmtiAllocate(maxlen+1);
- (void)(gdata->npt->utf8FromPlatform)(gdata->npt->utf,
- msg, len, utf8msg, maxlen);
+ (void)utf8FromPlatform(msg, len, utf8msg, maxlen);
utf8msg[maxlen] = 0;
}
if (rv == JDWPTRANSPORT_ERROR_NONE) {
@@ -110,8 +110,7 @@
int len;
len = (int)strlen(libdir);
- (void)(gdata->npt->utf8ToPlatform)(gdata->npt->utf,
- (jbyte*)libdir, len, buf, (int)sizeof(buf));
+ (void)utf8ToPlatform((jbyte*)libdir, len, buf, (int)sizeof(buf));
plibdir = buf;
}
@@ -392,8 +391,7 @@
/* Convert commandLine from UTF-8 to platform encoding */
len = (int)strlen(commandLine);
buf = jvmtiAllocate(len*3+3);
- (void)(gdata->npt->utf8ToPlatform)(gdata->npt->utf,
- (jbyte*)commandLine, len, buf, len*3+3);
+ (void)utf8ToPlatform((jbyte*)commandLine, len, buf, len*3+3);
/* Exec commandLine */
rc = dbgsysExec(buf);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/back/utf_util.c Mon Jun 16 13:48:58 2014 -0400
@@ -0,0 +1,540 @@
+/*
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "jni.h"
+
+#include "utf_util.h"
+
+
+/* Error and assert macros */
+#define UTF_ERROR(m) utfError(__FILE__, __LINE__, m)
+#define UTF_ASSERT(x) ( (x)==0 ? UTF_ERROR("ASSERT ERROR " #x) : (void)0 )
+
+// Platform independed part
+
+static void utfError(char *file, int line, char *message) {
+ (void)fprintf(stderr, "UTF ERROR [\"%s\":%d]: %s\n", file, line, message);
+ abort();
+}
+
+/* Determine length of this Standard UTF-8 in Modified UTF-8.
+ * Validation is done of the basic UTF encoding rules, returns
+ * length (no change) when errors are detected in the UTF encoding.
+ *
+ * Note: Accepts Modified UTF-8 also, no verification on the
+ * correctness of Standard UTF-8 is done. e,g, 0xC080 input is ok.
+ */
+int JNICALL utf8sToUtf8mLength(jbyte *string, int length) {
+ int newLength;
+ int i;
+
+ newLength = 0;
+ for ( i = 0 ; i < length ; i++ ) {
+ unsigned byte;
+
+ byte = (unsigned char)string[i];
+ if ( (byte & 0x80) == 0 ) { /* 1byte encoding */
+ newLength++;
+ if ( byte == 0 ) {
+ newLength++; /* We gain one byte in length on NULL bytes */
+ }
+ } else if ( (byte & 0xE0) == 0xC0 ) { /* 2byte encoding */
+ /* Check encoding of following bytes */
+ if ( (i+1) >= length || (string[i+1] & 0xC0) != 0x80 ) {
+ break; /* Error condition */
+ }
+ i++; /* Skip next byte */
+ newLength += 2;
+ } else if ( (byte & 0xF0) == 0xE0 ) { /* 3byte encoding */
+ /* Check encoding of following bytes */
+ if ( (i+2) >= length || (string[i+1] & 0xC0) != 0x80
+ || (string[i+2] & 0xC0) != 0x80 ) {
+ break; /* Error condition */
+ }
+ i += 2; /* Skip next two bytes */
+ newLength += 3;
+ } else if ( (byte & 0xF8) == 0xF0 ) { /* 4byte encoding */
+ /* Check encoding of following bytes */
+ if ( (i+3) >= length || (string[i+1] & 0xC0) != 0x80
+ || (string[i+2] & 0xC0) != 0x80
+ || (string[i+3] & 0xC0) != 0x80 ) {
+ break; /* Error condition */
+ }
+ i += 3; /* Skip next 3 bytes */
+ newLength += 6; /* 4byte encoding turns into 2 3byte ones */
+ } else {
+ break; /* Error condition */
+ }
+ }
+ if ( i != length ) {
+ /* Error in finding new length, return old length so no conversion */
+ /* FIXUP: ERROR_MESSAGE? */
+ return length;
+ }
+ return newLength;
+}
+
+/* Convert Standard UTF-8 to Modified UTF-8.
+ * Assumes the UTF-8 encoding was validated by utf8mLength() above.
+ *
+ * Note: Accepts Modified UTF-8 also, no verification on the
+ * correctness of Standard UTF-8 is done. e,g, 0xC080 input is ok.
+ */
+void JNICALL utf8sToUtf8m(jbyte *string, int length, jbyte *newString, int newLength) {
+ int i;
+ int j;
+
+ j = 0;
+ for ( i = 0 ; i < length ; i++ ) {
+ unsigned byte1;
+
+ byte1 = (unsigned char)string[i];
+
+ /* NULL bytes and bytes starting with 11110xxx are special */
+ if ( (byte1 & 0x80) == 0 ) { /* 1byte encoding */
+ if ( byte1 == 0 ) {
+ /* Bits out: 11000000 10000000 */
+ newString[j++] = (jbyte)0xC0;
+ newString[j++] = (jbyte)0x80;
+ } else {
+ /* Single byte */
+ newString[j++] = byte1;
+ }
+ } else if ( (byte1 & 0xE0) == 0xC0 ) { /* 2byte encoding */
+ newString[j++] = byte1;
+ newString[j++] = string[++i];
+ } else if ( (byte1 & 0xF0) == 0xE0 ) { /* 3byte encoding */
+ newString[j++] = byte1;
+ newString[j++] = string[++i];
+ newString[j++] = string[++i];
+ } else if ( (byte1 & 0xF8) == 0xF0 ) { /* 4byte encoding */
+ /* Beginning of 4byte encoding, turn into 2 3byte encodings */
+ unsigned byte2, byte3, byte4, u21;
+
+ /* Bits in: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+ byte2 = (unsigned char)string[++i];
+ byte3 = (unsigned char)string[++i];
+ byte4 = (unsigned char)string[++i];
+ /* Reconstruct full 21bit value */
+ u21 = (byte1 & 0x07) << 18;
+ u21 += (byte2 & 0x3F) << 12;
+ u21 += (byte3 & 0x3F) << 6;
+ u21 += (byte4 & 0x3F);
+ /* Bits out: 11101101 1010xxxx 10xxxxxx */
+ newString[j++] = (jbyte)0xED;
+ newString[j++] = (jbyte)(0xA0 + (((u21 >> 16) - 1) & 0x0F));
+ newString[j++] = (jbyte)(0x80 + ((u21 >> 10) & 0x3F));
+ /* Bits out: 11101101 1011xxxx 10xxxxxx */
+ newString[j++] = (jbyte)0xED;
+ newString[j++] = (jbyte)(0xB0 + ((u21 >> 6) & 0x0F));
+ newString[j++] = byte4;
+ }
+ }
+ UTF_ASSERT(i==length);
+ UTF_ASSERT(j==newLength);
+ newString[j] = (jbyte)0;
+}
+
+/* Given a Modified UTF-8 string, calculate the Standard UTF-8 length.
+ * Basic validation of the UTF encoding rules is done, and length is
+ * returned (no change) when errors are detected.
+ *
+ * Note: No validation is made that this is indeed Modified UTF-8 coming in.
+ *
+ */
+int JNICALL utf8mToUtf8sLength(jbyte *string, int length) {
+ int newLength;
+ int i;
+
+ newLength = 0;
+ for ( i = 0 ; i < length ; i++ ) {
+ unsigned byte1, byte2, byte3, byte4, byte5, byte6;
+
+ byte1 = (unsigned char)string[i];
+ if ( (byte1 & 0x80) == 0 ) { /* 1byte encoding */
+ newLength++;
+ } else if ( (byte1 & 0xE0) == 0xC0 ) { /* 2byte encoding */
+ /* Check encoding of following bytes */
+ if ( (i+1) >= length || (string[i+1] & 0xC0) != 0x80 ) {
+ break; /* Error condition */
+ }
+ byte2 = (unsigned char)string[++i];
+ if ( byte1 != 0xC0 || byte2 != 0x80 ) {
+ newLength += 2; /* Normal 2byte encoding, not 0xC080 */
+ } else {
+ newLength++; /* We will turn 0xC080 into 0 */
+ }
+ } else if ( (byte1 & 0xF0) == 0xE0 ) { /* 3byte encoding */
+ /* Check encoding of following bytes */
+ if ( (i+2) >= length || (string[i+1] & 0xC0) != 0x80
+ || (string[i+2] & 0xC0) != 0x80 ) {
+ break; /* Error condition */
+ }
+ byte2 = (unsigned char)string[++i];
+ byte3 = (unsigned char)string[++i];
+ newLength += 3;
+ /* Possible process a second 3byte encoding */
+ if ( (i+3) < length && byte1 == 0xED && (byte2 & 0xF0) == 0xA0 ) {
+ /* See if this is a pair of 3byte encodings */
+ byte4 = (unsigned char)string[i+1];
+ byte5 = (unsigned char)string[i+2];
+ byte6 = (unsigned char)string[i+3];
+ if ( byte4 == 0xED && (byte5 & 0xF0) == 0xB0 ) {
+ /* Check encoding of 3rd byte */
+ if ( (byte6 & 0xC0) != 0x80 ) {
+ break; /* Error condition */
+ }
+ newLength++; /* New string will have 4byte encoding */
+ i += 3; /* Skip next 3 bytes */
+ }
+ }
+ } else {
+ break; /* Error condition */
+ }
+ }
+ if ( i != length ) {
+ /* Error in UTF encoding */
+ /* FIXUP: ERROR_MESSAGE()? */
+ return length;
+ }
+ return newLength;
+}
+
+/* Convert a Modified UTF-8 string into a Standard UTF-8 string
+ * It is assumed that this string has been validated in terms of the
+ * basic UTF encoding rules by utf8Length() above.
+ *
+ * Note: No validation is made that this is indeed Modified UTF-8 coming in.
+ *
+ */
+void JNICALL utf8mToUtf8s(jbyte *string, int length, jbyte *newString, int newLength) {
+ int i;
+ int j;
+
+ j = 0;
+ for ( i = 0 ; i < length ; i++ ) {
+ unsigned byte1, byte2, byte3, byte4, byte5, byte6;
+
+ byte1 = (unsigned char)string[i];
+ if ( (byte1 & 0x80) == 0 ) { /* 1byte encoding */
+ /* Single byte */
+ newString[j++] = byte1;
+ } else if ( (byte1 & 0xE0) == 0xC0 ) { /* 2byte encoding */
+ byte2 = (unsigned char)string[++i];
+ if ( byte1 != 0xC0 || byte2 != 0x80 ) {
+ newString[j++] = byte1;
+ newString[j++] = byte2;
+ } else {
+ newString[j++] = 0;
+ }
+ } else if ( (byte1 & 0xF0) == 0xE0 ) { /* 3byte encoding */
+ byte2 = (unsigned char)string[++i];
+ byte3 = (unsigned char)string[++i];
+ if ( i+3 < length && byte1 == 0xED && (byte2 & 0xF0) == 0xA0 ) {
+ /* See if this is a pair of 3byte encodings */
+ byte4 = (unsigned char)string[i+1];
+ byte5 = (unsigned char)string[i+2];
+ byte6 = (unsigned char)string[i+3];
+ if ( byte4 == 0xED && (byte5 & 0xF0) == 0xB0 ) {
+ unsigned u21;
+
+ /* Bits in: 11101101 1010xxxx 10xxxxxx */
+ /* Bits in: 11101101 1011xxxx 10xxxxxx */
+ i += 3;
+
+ /* Reconstruct 21 bit code */
+ u21 = ((byte2 & 0x0F) + 1) << 16;
+ u21 += (byte3 & 0x3F) << 10;
+ u21 += (byte5 & 0x0F) << 6;
+ u21 += (byte6 & 0x3F);
+
+ /* Bits out: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+
+ /* Convert to 4byte encoding */
+ newString[j++] = 0xF0 + ((u21 >> 18) & 0x07);
+ newString[j++] = 0x80 + ((u21 >> 12) & 0x3F);
+ newString[j++] = 0x80 + ((u21 >> 6) & 0x3F);
+ newString[j++] = 0x80 + (u21 & 0x3F);
+ continue;
+ }
+ }
+ /* Normal 3byte encoding */
+ newString[j++] = byte1;
+ newString[j++] = byte2;
+ newString[j++] = byte3;
+ }
+ }
+ UTF_ASSERT(i==length);
+ UTF_ASSERT(j==newLength);
+ newString[j] = 0;
+}
+
+#ifdef _WIN32
+// Microsoft Windows specific part
+
+#include <windows.h>
+
+static UINT getCodepage() {
+ LANGID langID;
+ LCID localeID;
+ TCHAR strCodePage[7]; // ANSI code page id
+
+ static UINT intCodePage = -1;
+
+ if (intCodePage == -1) {
+ // Firts call, get codepage from the os
+ langID = LANGIDFROMLCID(GetUserDefaultLCID());
+ localeID = MAKELCID(langID, SORT_DEFAULT);
+ if (GetLocaleInfo(localeID, LOCALE_IDEFAULTANSICODEPAGE,
+ strCodePage, sizeof(strCodePage)/sizeof(TCHAR)) > 0 ) {
+ intCodePage = atoi(strCodePage);
+ }
+ else {
+ intCodePage = GetACP();
+ }
+ }
+
+ return intCodePage;
+}
+
+/*
+ * Get wide string (assumes len>0)
+ */
+static WCHAR* getWideString(UINT codePage, char* str, int len, int *pwlen) {
+ int wlen;
+ WCHAR* wstr;
+
+ /* Convert the string to WIDE string */
+ wlen = MultiByteToWideChar(codePage, 0, str, len, NULL, 0);
+ *pwlen = wlen;
+ if (wlen <= 0) {
+ UTF_ERROR(("Can't get WIDE string length"));
+ return NULL;
+ }
+ wstr = (WCHAR*)malloc(wlen * sizeof(WCHAR));
+ if (wstr == NULL) {
+ UTF_ERROR(("Can't malloc() any space"));
+ return NULL;
+ }
+ if (MultiByteToWideChar(codePage, 0, str, len, wstr, wlen) == 0) {
+ UTF_ERROR(("Can't get WIDE string"));
+ return NULL;
+ }
+ return wstr;
+}
+
+/*
+ * Convert UTF-8 to a platform string
+ */
+int JNICALL utf8ToPlatform(jbyte *utf8, int len, char* output, int outputMaxLen) {
+ int wlen;
+ int plen;
+ WCHAR* wstr;
+ UINT codepage;
+
+ UTF_ASSERT(utf8);
+ UTF_ASSERT(output);
+ UTF_ASSERT(outputMaxLen > len);
+
+ /* Zero length is ok, but we don't need to do much */
+ if ( len == 0 ) {
+ output[0] = 0;
+ return 0;
+ }
+
+ /* Get WIDE string version (assumes len>0) */
+ wstr = getWideString(CP_UTF8, (char*)utf8, len, &wlen);
+ if ( wstr == NULL ) {
+ // Can't allocate WIDE string
+ goto just_copy_bytes;
+ }
+
+ /* Convert WIDE string to MultiByte string */
+ codepage = getCodepage();
+ plen = WideCharToMultiByte(codepage, 0, wstr, wlen,
+ output, outputMaxLen, NULL, NULL);
+ free(wstr);
+ if (plen <= 0) {
+ // Can't convert WIDE string to multi-byte
+ goto just_copy_bytes;
+ }
+ output[plen] = '\0';
+ return plen;
+
+just_copy_bytes:
+ (void)memcpy(output, utf8, len);
+ output[len] = 0;
+ return len;
+}
+
+/*
+ * Convert Platform Encoding to UTF-8.
+ */
+int JNICALL utf8FromPlatform(char *str, int len, jbyte *output, int outputMaxLen) {
+ int wlen;
+ int plen;
+ WCHAR* wstr;
+ UINT codepage;
+
+ UTF_ASSERT(str);
+ UTF_ASSERT(output);
+ UTF_ASSERT(outputMaxLen > len);
+
+ /* Zero length is ok, but we don't need to do much */
+ if ( len == 0 ) {
+ output[0] = 0;
+ return 0;
+ }
+
+ /* Get WIDE string version (assumes len>0) */
+ codepage = getCodepage();
+ wstr = getWideString(codepage, str, len, &wlen);
+ if ( wstr == NULL ) {
+ goto just_copy_bytes;
+ }
+
+ /* Convert WIDE string to UTF-8 string */
+ plen = WideCharToMultiByte(CP_UTF8, 0, wstr, wlen,
+ (char*)output, outputMaxLen, NULL, NULL);
+ free(wstr);
+ if (plen <= 0) {
+ UTF_ERROR(("Can't convert WIDE string to multi-byte"));
+ goto just_copy_bytes;
+ }
+ output[plen] = '\0';
+ return plen;
+
+just_copy_bytes:
+ (void)memcpy(output, str, len);
+ output[len] = 0;
+ return len;
+}
+
+
+#else
+// *NIX specific part
+
+#include <iconv.h>
+#include <locale.h>
+#include <langinfo.h>
+#include <string.h>
+
+typedef enum {TO_UTF8, FROM_UTF8} conv_direction;
+
+/*
+ * Do iconv() conversion.
+ * Returns length or -1 if output overflows.
+ */
+static int iconvConvert(conv_direction drn, char *bytes, size_t len, char *output, size_t outputMaxLen) {
+
+ static char *codeset = 0;
+ iconv_t func;
+ size_t bytes_converted;
+ size_t inLeft, outLeft;
+ char *inbuf, *outbuf;
+
+ UTF_ASSERT(bytes);
+ UTF_ASSERT(output);
+ UTF_ASSERT(outputMaxLen > len);
+
+ /* Zero length is ok, but we don't need to do much */
+ if ( len == 0 ) {
+ output[0] = 0;
+ return 0;
+ }
+
+ if (codeset == NULL && codeset != (char *) -1) {
+ // locale is not initialized, do it now
+ if (setlocale(LC_ALL, "") != NULL) {
+ // nl_langinfo returns ANSI_X3.4-1968 by default
+ codeset = (char*)nl_langinfo(CODESET);
+ }
+
+ if (codeset == NULL) {
+ // Not able to intialize process locale from platform one.
+ codeset = (char *) -1;
+ }
+ }
+
+ if (codeset == (char *) -1) {
+ // There was an error during initialization, so just bail out
+ goto just_copy_bytes;
+ }
+
+ func = (drn == TO_UTF8) ? iconv_open(codeset, "UTF-8") : iconv_open("UTF-8", codeset);
+ if (func == (iconv_t) -1) {
+ // Requested charset combination is not supported, conversion couldn't be done.
+ // make sure we will not try it again
+ codeset = (char *) -1;
+ goto just_copy_bytes;
+ }
+
+ // perform conversion
+ inbuf = bytes;
+ outbuf = output;
+ inLeft = len;
+ outLeft = outputMaxLen;
+
+ bytes_converted = iconv(func, (void*)&inbuf, &inLeft, &outbuf, &outLeft);
+ if (bytes_converted == (size_t) -1 || bytes_converted == 0 || inLeft != 0) {
+ // Input string is invalid, not able to convert entire string
+ // or some other iconv error happens.
+ iconv_close(func);
+ goto just_copy_bytes;
+ }
+
+ iconv_close(func);
+ // Overwrite bytes_converted with value of actually stored bytes
+ bytes_converted = outputMaxLen-outLeft;
+ output[bytes_converted] = 0;
+ return bytes_converted;
+
+
+just_copy_bytes:
+ (void)memcpy(output, bytes, len);
+ output[len] = 0;
+ return len;
+ }
+
+/*
+ * Convert UTF-8 to Platform Encoding.
+ * Returns length or -1 if output overflows.
+ */
+int JNICALL utf8ToPlatform(jbyte *utf8, int len, char *output, int outputMaxLen) {
+ return iconvConvert(FROM_UTF8, (char*)utf8, len, output, outputMaxLen);
+}
+
+/*
+ * Convert Platform Encoding to UTF-8.
+ * Returns length or -1 if output overflows.
+ */
+int JNICALL utf8FromPlatform(char *str, int len, jbyte *output, int outputMaxLen) {
+ return iconvConvert(TO_UTF8, str, len, (char*) output, outputMaxLen);
+}
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/back/utf_util.h Mon Jun 16 13:48:58 2014 -0400
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#ifndef _utf_util_h_
+#define _utf_util_h_
+
+#include "jni.h"
+
+
+int JNICALL utf8sToUtf8mLength(jbyte *string, int length);
+void JNICALL utf8sToUtf8m(jbyte *string, int length, jbyte *newString, int newLength);
+int JNICALL utf8mToUtf8sLength(jbyte *string, int length);
+void JNICALL utf8mToUtf8s(jbyte *string, int length, jbyte *newString, int newLength);
+
+int JNICALL utf8ToPlatform(jbyte *utf8, int len, char* output, int outputMaxLen);
+int JNICALL utf8FromPlatform(char *str, int len, jbyte *output, int outputMaxLen);
+
+#endif
--- a/jdk/src/share/back/util.h Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/back/util.h Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -53,9 +53,6 @@
#include "error_messages.h"
#include "debugInit.h"
-/* Get access to Native Platform Toolkit functions */
-#include "npt.h"
-
/* Definition of a CommonRef tracked by the backend for the frontend */
typedef struct RefNode {
jlong seqNum; /* ID of reference, also key for hash table */
@@ -123,9 +120,6 @@
unsigned log_flags;
- /* The Native Platform Toolkit access */
- NptEnv *npt;
-
/* Common References static data */
jrawMonitorID refLock;
jlong nextSeqNum;
--- a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java Mon Jun 16 13:48:58 2014 -0400
@@ -509,7 +509,7 @@
byte[] signature = new byte[6];
stream.readFully(signature);
- StringBuffer version = new StringBuffer(3);
+ StringBuilder version = new StringBuilder(3);
version.append((char)signature[3]);
version.append((char)signature[4]);
version.append((char)signature[5]);
--- a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Mon Jun 16 13:48:58 2014 -0400
@@ -900,7 +900,7 @@
if (times == 1) {
return s;
}
- StringBuffer sb = new StringBuffer((s.length() + 1)*times - 1);
+ StringBuilder sb = new StringBuilder((s.length() + 1)*times - 1);
sb.append(s);
for (int i = 1; i < times; i++) {
sb.append(" ");
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java Mon Jun 16 13:48:58 2014 -0400
@@ -169,23 +169,23 @@
result.add(typedInName);
}
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
len = result.size();
// construct the resulting string
for (int i=0; i<len; i++) {
if (i > 0) {
- buf.append(" ");
+ sb.append(" ");
}
if (len > 1) {
- buf.append("\"");
+ sb.append("\"");
}
- buf.append(result.get(i));
+ sb.append(result.get(i));
if (len > 1) {
- buf.append("\"");
+ sb.append("\"");
}
}
- return buf.toString();
+ return sb.toString();
}
public void setFileName(String fileName) {
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Mon Jun 16 13:48:58 2014 -0400
@@ -533,13 +533,13 @@
// Pending: verify character encoding spec for gconf
Reader reader = new InputStreamReader(url.openStream(), "ISO-8859-1");
char[] buf = new char[1024];
- StringBuffer strBuf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int n;
while ((n = reader.read(buf)) >= 0) {
- strBuf.append(buf, 0, n);
+ sb.append(buf, 0, n);
}
reader.close();
- String str = strBuf.toString();
+ String str = sb.toString();
if (str != null) {
String strLowerCase = str.toLowerCase();
int i = strLowerCase.indexOf("<entry name=\"theme\"");
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java Mon Jun 16 13:48:58 2014 -0400
@@ -121,20 +121,20 @@
}
private String fileNameString(File[] files) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; files != null && i < files.length; i++) {
if (i > 0) {
- buf.append(" ");
+ sb.append(" ");
}
if (files.length > 1) {
- buf.append("\"");
+ sb.append("\"");
}
- buf.append(fileNameString(files[i]));
+ sb.append(fileNameString(files[i]));
if (files.length > 1) {
- buf.append("\"");
+ sb.append("\"");
}
}
- return buf.toString();
+ return sb.toString();
}
public MotifFileChooserUI(JFileChooser filechooser) {
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java Mon Jun 16 13:48:58 2014 -0400
@@ -690,7 +690,7 @@
}
private String fileNameString(File[] files) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 0; files != null && i < files.length; i++) {
if (i > 0) {
buf.append(" ");
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java Mon Jun 16 13:48:58 2014 -0400
@@ -628,7 +628,7 @@
}
if (metaCoding.length > 0
&& (verbose > 2 || verbose > 1 && metaCoding.length > 1)) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < metaCoding.length; i++) {
if (i == 1) sb.append(" /");
sb.append(" ").append(metaCoding[i] & 0xFF);
@@ -756,7 +756,7 @@
" size="+outputSize()+
irr+" coding="+bandCoding);
if (metaCoding != noMetaCoding) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < metaCoding.length; i++) {
if (i == 1) sb.append(" /");
sb.append(" ").append(metaCoding[i] & 0xFF);
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Mon Jun 16 13:48:58 2014 -0400
@@ -1026,7 +1026,7 @@
}
static
String stringValueOf(MethodHandleEntry bsmRef, Entry[] argRefs) {
- StringBuffer sb = new StringBuffer(bsmRef.stringValue());
+ StringBuilder sb = new StringBuilder(bsmRef.stringValue());
// Arguments are formatted as "<foo;bar;baz>" instead of "[foo,bar,baz]".
// This ensures there will be no confusion if "[,]" appear inside of names.
char nextSep = '<';
--- a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -63,12 +63,12 @@
if (SNMP_LOGGER.isLoggable(Level.FINEST)) {
SNMP_LOGGER.logp(Level.FINEST, NetMaskImpl.class.getName(),
"extractSubNet", "BINARY ARRAY :");
- StringBuffer buff = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for(int i =0; i < addrLength; i++) {
- buff.append((b[i] &0xFF) +":");
+ sb.append((b[i] & 0xFF) + ":");
}
SNMP_LOGGER.logp(Level.FINEST, NetMaskImpl.class.getName(),
- "extractSubNet", buff.toString());
+ "extractSubNet", sb.toString());
}
// 8 is a byte size. Common to any InetAddress (V4 or V6).
--- a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java Mon Jun 16 13:48:58 2014 -0400
@@ -170,7 +170,7 @@
* string literal.
*/
protected String add_escapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
--- a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/SnmpAcl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/SnmpAcl.java Mon Jun 16 13:48:58 2014 -0400
@@ -186,8 +186,8 @@
public static String getDefaultAclFileName() {
final String fileSeparator =
System.getProperty("file.separator");
- final StringBuffer defaultAclName =
- new StringBuffer(System.getProperty("java.home")).
+ final StringBuilder defaultAclName =
+ new StringBuilder(System.getProperty("java.home")).
append(fileSeparator).append("lib").append(fileSeparator).
append("snmp.acl");
return defaultAclName.toString();
--- a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java Mon Jun 16 13:48:58 2014 -0400
@@ -65,7 +65,7 @@
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
--- a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpMessage.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/SnmpMessage.java Mon Jun 16 13:48:58 2014 -0400
@@ -347,7 +347,7 @@
* @return The string containing the dump.
*/
public String printMessage() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (community == null) {
sb.append("Community: null") ;
}
--- a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpMsg.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/SnmpMsg.java Mon Jun 16 13:48:58 2014 -0400
@@ -181,22 +181,22 @@
* @return The string containing the dump.
*/
public static String dumpHexBuffer(byte [] b, int offset, int len) {
- StringBuffer buf = new StringBuffer(len << 1) ;
+ StringBuilder sb = new StringBuilder(len << 1) ;
int k = 1 ;
int flen = offset + len ;
for (int i = offset; i < flen ; i++) {
int j = b[i] & 0xFF ;
- buf.append(Character.forDigit((j >>> 4) , 16)) ;
- buf.append(Character.forDigit((j & 0x0F), 16)) ;
+ sb.append(Character.forDigit((j >>> 4), 16)) ;
+ sb.append(Character.forDigit((j & 0x0F), 16)) ;
k++ ;
if (k%16 == 0) {
- buf.append('\n') ;
+ sb.append('\n') ;
k = 1 ;
} else
- buf.append(' ') ;
+ sb.append(' ') ;
}
- return buf.toString() ;
+ return sb.toString() ;
}
/**
@@ -205,7 +205,7 @@
* @return The string containing the dump.
*/
public String printMessage() {
- StringBuffer sb = new StringBuffer() ;
+ StringBuilder sb = new StringBuilder() ;
sb.append("Version: ") ;
sb.append(version) ;
sb.append("\n") ;
--- a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpOpaque.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/SnmpOpaque.java Mon Jun 16 13:48:58 2014 -0400
@@ -73,7 +73,7 @@
* @return The <CODE>String</CODE> representation of the value.
*/
public String toString() {
- StringBuffer result = new StringBuffer() ;
+ StringBuilder result = new StringBuilder() ;
for (int i = 0 ; i < value.length ; i++) {
byte b = value[i] ;
int n = (b >= 0) ? b : b + 256 ;
--- a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java Mon Jun 16 13:48:58 2014 -0400
@@ -478,7 +478,7 @@
* @return The string containing the dump.
*/
public String printMessage() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("msgId : " + msgId + "\n");
sb.append("msgMaxSize : " + msgMaxSize + "\n");
sb.append("msgFlags : " + msgFlags + "\n");
--- a/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java Mon Jun 16 13:48:58 2014 -0400
@@ -96,7 +96,7 @@
* Used by CNCtx.getNameInNamespace(), CNCompoundName.toString().
*/
static String cosNameToInsString(NameComponent[] cname) {
- StringBuffer str = new StringBuffer();
+ StringBuilder str = new StringBuilder();
for ( int i = 0; i < cname.length; i++) {
if ( i > 0) {
str.append(compSeparator);
@@ -254,7 +254,7 @@
}
private static String stringifyComponent(NameComponent comp) {
- StringBuffer one = new StringBuffer(escape(comp.id));
+ StringBuilder one = new StringBuilder(escape(comp.id));
if (comp.kind != null && !comp.kind.equals("")) {
one.append(kindSeparator + escape(comp.kind));
}
--- a/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java Mon Jun 16 13:48:58 2014 -0400
@@ -198,14 +198,14 @@
}
}
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < servers.length; i++) {
if (i > 0) {
- buf.append(' ');
+ sb.append(' ');
}
- buf.append("dns://").append(servers[i]).append(path);
+ sb.append("dns://").append(servers[i]).append(path);
}
- return buf.toString();
+ return sb.toString();
}
/*
--- a/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java Mon Jun 16 13:48:58 2014 -0400
@@ -415,7 +415,7 @@
*/
private void parse(String name) throws InvalidNameException {
- StringBuffer label = new StringBuffer(); // label being parsed
+ StringBuilder label = new StringBuilder(); // label being parsed
for (int i = 0; i < name.length(); i++) {
char c = name.charAt(i);
@@ -564,15 +564,15 @@
* into account. See compareLabels().
*/
private static String keyForLabel(String label) {
- StringBuffer buf = new StringBuffer(label.length());
+ StringBuilder sb = new StringBuilder(label.length());
for (int i = 0; i < label.length(); i++) {
char c = label.charAt(i);
if (c >= 'A' && c <= 'Z') {
c += 'a' - 'A'; // to lower case
}
- buf.append(c);
+ sb.append(c);
}
- return buf.toString();
+ return sb.toString();
}
--- a/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecord.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecord.java Mon Jun 16 13:48:58 2014 -0400
@@ -596,21 +596,21 @@
// If bestBase != -1, compress zeros in [bestBase, bestBase+bestLen)
boolean compress = (bestBase != -1);
- StringBuffer buf = new StringBuffer(40);
+ StringBuilder sb = new StringBuilder(40);
if (bestBase == 0) {
- buf.append(':');
+ sb.append(':');
}
for (int i = 0; i < 8; i++) {
if (!compress || (i < bestBase) || (i >= bestBase + bestLen)) {
- buf.append(Integer.toHexString(addr6[i]));
+ sb.append(Integer.toHexString(addr6[i]));
if (i < 7) {
- buf.append(':');
+ sb.append(':');
}
} else if (compress && (i == bestBase)) { // first compressed zero
- buf.append(':');
+ sb.append(':');
}
}
- return buf.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/com/sun/jndi/ldap/ClientId.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/ClientId.java Mon Jun 16 13:48:58 2014 -0400
@@ -210,7 +210,7 @@
if (ctls == null) {
return "";
}
- StringBuffer str = new StringBuffer();
+ StringBuilder str = new StringBuilder();
for (int i = 0; i < ctls.length; i++) {
str.append(ctls[i].getID());
str.append(' ');
--- a/jdk/src/share/classes/com/sun/jndi/ldap/DigestClientId.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/DigestClientId.java Mon Jun 16 13:48:58 2014 -0400
@@ -103,14 +103,14 @@
public String toString() {
if (propvals != null) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < propvals.length; i++) {
- buf.append(':');
+ sb.append(':');
if (propvals[i] != null) {
- buf.append(propvals[i]);
+ sb.append(propvals[i]);
}
}
- return super.toString() + buf.toString();
+ return super.toString() + sb.toString();
} else {
return super.toString();
}
--- a/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java Mon Jun 16 13:48:58 2014 -0400
@@ -767,7 +767,7 @@
final private String classDef2ObjectDesc(Attributes attrs)
throws NamingException {
- StringBuffer objectDesc = new StringBuffer("( ");
+ StringBuilder objectDesc = new StringBuilder("( ");
Attribute attr = null;
int count = 0;
@@ -879,7 +879,7 @@
final private String attrDef2AttrDesc(Attributes attrs)
throws NamingException {
- StringBuffer attrDesc = new StringBuffer("( "); // opening parens
+ StringBuilder attrDesc = new StringBuilder("( "); // opening parens
Attribute attr = null;
int count = 0;
@@ -1012,7 +1012,7 @@
final private String syntaxDef2SyntaxDesc(Attributes attrs)
throws NamingException {
- StringBuffer syntaxDesc = new StringBuffer("( "); // opening parens
+ StringBuilder syntaxDesc = new StringBuilder("( "); // opening parens
Attribute attr = null;
int count = 0;
@@ -1068,7 +1068,7 @@
final private String matchRuleDef2MatchRuleDesc(Attributes attrs)
throws NamingException {
- StringBuffer matchRuleDesc = new StringBuffer("( "); // opening parens
+ StringBuilder matchRuleDesc = new StringBuilder("( "); // opening parens
Attribute attr = null;
int count = 0;
@@ -1196,7 +1196,7 @@
// write QDList
- StringBuffer qdList = new StringBuffer(attr.getID());
+ StringBuilder qdList = new StringBuilder(attr.getID());
qdList.append(WHSP);
qdList.append(OID_LIST_BEGIN);
@@ -1233,7 +1233,7 @@
// write OID List
- StringBuffer oidList = new StringBuffer(oidsAttr.getID());
+ StringBuilder oidList = new StringBuilder(oidsAttr.getID());
oidList.append(WHSP);
oidList.append(OID_LIST_BEGIN);
--- a/jdk/src/share/classes/com/sun/jndi/ldap/ServiceLocator.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/ServiceLocator.java Mon Jun 16 13:48:58 2014 -0400
@@ -68,7 +68,7 @@
if (dn == null) {
return null;
}
- StringBuffer domain = new StringBuffer();
+ StringBuilder domain = new StringBuilder();
LdapName ldapName = new LdapName(dn);
// process RDNs left-to-right
--- a/jdk/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java Mon Jun 16 13:48:58 2014 -0400
@@ -88,7 +88,7 @@
}
}
if (selected == -1) {
- StringBuffer allChoices = new StringBuffer();
+ StringBuilder allChoices = new StringBuilder();
for (int j = 0; j < choices.length; j++) {
allChoices.append(choices[j] + ",");
}
--- a/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java Mon Jun 16 13:48:58 2014 -0400
@@ -520,30 +520,30 @@
str = (String)obj;
}
int len = str.length();
- StringBuffer buf = new StringBuffer(len);
+ StringBuilder sb = new StringBuilder(len);
char ch;
for (int i = 0; i < len; i++) {
switch (ch=str.charAt(i)) {
case '*':
- buf.append("\\2a");
+ sb.append("\\2a");
break;
case '(':
- buf.append("\\28");
+ sb.append("\\28");
break;
case ')':
- buf.append("\\29");
+ sb.append("\\29");
break;
case '\\':
- buf.append("\\5c");
+ sb.append("\\5c");
break;
case 0:
- buf.append("\\00");
+ sb.append("\\00");
break;
default:
- buf.append(ch);
+ sb.append(ch);
}
}
- return buf.toString();
+ return sb.toString();
}
@@ -585,7 +585,7 @@
int param;
int where = 0, start = 0;
- StringBuffer answer = new StringBuffer(expr.length());
+ StringBuilder answer = new StringBuilder(expr.length());
while ((where = findUnescaped('{', expr, start)) >= 0) {
int pstart = where + 1; // skip '{'
--- a/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java Mon Jun 16 13:48:58 2014 -0400
@@ -326,7 +326,7 @@
private static KeySortComparator keySortComparator = new KeySortComparator();
private String extractKeys(ModelConnectionBlock conn) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (conn.getSources() != null) {
sb.append("[");
ModelSource[] srcs = conn.getSources();
--- a/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java Mon Jun 16 13:48:58 2014 -0400
@@ -162,7 +162,7 @@
0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
private String decodeChannelMask(long channelmask) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
long m = 1;
for (int i = 0; i < allchannelnames.length; i++) {
if ((channelmask & m) != 0L) {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java Mon Jun 16 13:48:58 2014 -0400
@@ -257,7 +257,7 @@
public static final byte[] decode(Element element) throws Base64DecodingException {
Node sibling = element.getFirstChild();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while (sibling != null) {
if (sibling.getNodeType() == Node.TEXT_NODE) {
--- a/jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java Mon Jun 16 13:48:58 2014 -0400
@@ -195,7 +195,7 @@
digest = md5.digest();
// Get character representation of digest
- StringBuffer digestString = new StringBuffer();
+ StringBuilder digestString = new StringBuilder();
for (i = 0; i < digest.length; i++) {
if ((digest[i] & 0x000000ff) < 0x10) {
--- a/jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java Mon Jun 16 13:48:58 2014 -0400
@@ -117,15 +117,15 @@
long rand = random.nextLong();
long timestamp = System.currentTimeMillis();
- StringBuffer buf = new StringBuffer();
- buf.append('<');
- buf.append(rand);
- buf.append('.');
- buf.append(timestamp);
- buf.append('@');
- buf.append(fqdn);
- buf.append('>');
- String challengeStr = buf.toString();
+ StringBuilder sb = new StringBuilder();
+ sb.append('<');
+ sb.append(rand);
+ sb.append('.');
+ sb.append(timestamp);
+ sb.append('@');
+ sb.append(fqdn);
+ sb.append('>');
+ String challengeStr = sb.toString();
logger.log(Level.FINE,
"CRAMSRV01:Generated challenge: {0}", challengeStr);
--- a/jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java Mon Jun 16 13:48:58 2014 -0400
@@ -387,7 +387,7 @@
protected byte[] binaryToHex(byte[] digest) throws
UnsupportedEncodingException {
- StringBuffer digestString = new StringBuffer();
+ StringBuilder digestString = new StringBuilder();
for (int i = 0; i < digest.length; i ++) {
if ((digest[i] & 0x000000ff) < 0x10) {
@@ -598,7 +598,7 @@
protected static String nonceCountToHex(int count) {
String str = Integer.toHexString(count);
- StringBuffer pad = new StringBuffer();
+ StringBuilder pad = new StringBuilder();
if (str.length() < 8) {
for (int i = 0; i < 8-str.length(); i ++) {
--- a/jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java Mon Jun 16 13:48:58 2014 -0400
@@ -203,19 +203,19 @@
String supportedCiphers = null;
if ((allQop&PRIVACY_PROTECTION) != 0) {
myCiphers = getPlatformCiphers();
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
// myCipher[i] is a byte that indicates whether CIPHER_TOKENS[i]
// is supported
for (int i = 0; i < CIPHER_TOKENS.length; i++) {
if (myCiphers[i] != 0) {
- if (buf.length() > 0) {
- buf.append(',');
+ if (sb.length() > 0) {
+ sb.append(',');
}
- buf.append(CIPHER_TOKENS[i]);
+ sb.append(CIPHER_TOKENS[i]);
}
}
- supportedCiphers = buf.toString();
+ supportedCiphers = sb.toString();
}
try {
--- a/jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -80,13 +80,13 @@
"SASLIMPL02:Preferred qop mask: {0}", new Byte(allQop));
if (qop.length > 0) {
- StringBuffer qopbuf = new StringBuffer();
+ StringBuilder str = new StringBuilder();
for (int i = 0; i < qop.length; i++) {
- qopbuf.append(Byte.toString(qop[i]));
- qopbuf.append(' ');
+ str.append(Byte.toString(qop[i]));
+ str.append(' ');
}
logger.logp(Level.FINE, myClassName, "constructor",
- "SASLIMPL03:Preferred qops : {0}", qopbuf.toString());
+ "SASLIMPL03:Preferred qops : {0}", str.toString());
}
}
@@ -95,13 +95,13 @@
logger.logp(Level.FINE, myClassName, "constructor",
"SASLIMPL04:Preferred strength property: {0}", prop);
if (logger.isLoggable(Level.FINE) && strength.length > 0) {
- StringBuffer strbuf = new StringBuffer();
+ StringBuilder str = new StringBuilder();
for (int i = 0; i < strength.length; i++) {
- strbuf.append(Byte.toString(strength[i]));
- strbuf.append(' ');
+ str.append(Byte.toString(strength[i]));
+ str.append(' ');
}
logger.logp(Level.FINE, myClassName, "constructor",
- "SASLIMPL05:Cipher strengths: {0}", strbuf.toString());
+ "SASLIMPL05:Cipher strengths: {0}", str.toString());
}
// Max receive buffer size
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java Mon Jun 16 13:48:58 2014 -0400
@@ -102,8 +102,8 @@
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer("exception catch ");
- buffer.append(refSpec.toString());
- return buffer.toString();
+ StringBuilder sb = new StringBuilder("exception catch ");
+ sb.append(refSpec.toString());
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java Mon Jun 16 13:48:58 2014 -0400
@@ -118,13 +118,13 @@
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer("breakpoint ");
- buffer.append(refSpec.toString());
- buffer.append(':');
- buffer.append(lineNumber);
- buffer.append(" (");
- buffer.append(getStatusString());
- buffer.append(')');
- return buffer.toString();
+ StringBuilder sb = new StringBuilder("breakpoint ");
+ sb.append(refSpec.toString());
+ sb.append(':');
+ sb.append(lineNumber);
+ sb.append(" (");
+ sb.append(getStatusString());
+ sb.append(')');
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java Mon Jun 16 13:48:58 2014 -0400
@@ -126,26 +126,26 @@
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer("breakpoint ");
- buffer.append(refSpec.toString());
- buffer.append('.');
- buffer.append(methodId);
+ StringBuilder sb = new StringBuilder("breakpoint ");
+ sb.append(refSpec.toString());
+ sb.append('.');
+ sb.append(methodId);
if (methodArgs != null) {
boolean first = true;
- buffer.append('(');
+ sb.append('(');
for (String name : methodArgs) {
if (!first) {
- buffer.append(',');
+ sb.append(',');
}
- buffer.append(name);
+ sb.append(name);
first = false;
}
- buffer.append(")");
+ sb.append(")");
}
- buffer.append(" (");
- buffer.append(getStatusString());
- buffer.append(')');
- return buffer.toString();
+ sb.append(" (");
+ sb.append(getStatusString());
+ sb.append(')');
+ return sb.toString();
}
private boolean isValidMethodName(String s) {
@@ -225,8 +225,8 @@
* stripping whitespace after the name ends.
*/
int i = 0;
- StringBuffer typePart = new StringBuffer();
- StringBuffer arrayPart = new StringBuffer();
+ StringBuilder typePart = new StringBuilder();
+ StringBuilder arrayPart = new StringBuilder();
name = name.trim();
int nameLength = name.length();
/*
--- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java Mon Jun 16 13:48:58 2014 -0400
@@ -185,7 +185,7 @@
}
final public String Name() throws ParseException {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
jj_consume_token(IDENTIFIER);
sb.append(token);
label_2:
--- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java Mon Jun 16 13:48:58 2014 -0400
@@ -114,7 +114,7 @@
int[][] expectedTokenSequences,
String[] tokenImage) {
String eol = System.getProperty("line.separator", "\n");
- StringBuffer expected = new StringBuffer();
+ StringBuilder expected = new StringBuilder();
int maxSize = 0;
for (int i = 0; i < expectedTokenSequences.length; i++) {
if (maxSize < expectedTokenSequences[i].length) {
@@ -164,7 +164,7 @@
* string literal.
*/
static String add_escapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
--- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java Mon Jun 16 13:48:58 2014 -0400
@@ -73,7 +73,7 @@
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Mon Jun 16 13:48:58 2014 -0400
@@ -267,7 +267,7 @@
buf[j] = ' ';
}
buf[79] = '\0';
- StringBuffer sbOut = new StringBuffer();
+ StringBuilder sbOut = new StringBuilder();
sbOut.append(buf);
// Right-justify the thread number at start of output string
@@ -381,16 +381,16 @@
}
} else {
clname = t.nextToken();
- StringBuffer sbuf = new StringBuffer();
+ StringBuilder str = new StringBuilder();
// Allow VM arguments to be specified here?
while (t.hasMoreTokens()) {
String tok = t.nextToken();
- sbuf.append(tok);
+ str.append(tok);
if (t.hasMoreTokens()) {
- sbuf.append(' ');
+ str.append(' ');
}
}
- String args = sbuf.toString();
+ String args = str.toString();
try {
String vmArgs = context.getVmArguments();
runtime.run(suspended, vmArgs, clname, args);
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Mon Jun 16 13:48:58 2014 -0400
@@ -333,7 +333,7 @@
private String processClasspathDefaults(String javaArgs) {
if (javaArgs.indexOf("-classpath ") == -1) {
- StringBuffer munged = new StringBuffer(javaArgs);
+ StringBuilder munged = new StringBuilder(javaArgs);
SearchPath classpath = classManager.getClassPath();
if (classpath.isEmpty()) {
String envcp = System.getProperty("env.class.path");
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java Mon Jun 16 13:48:58 2014 -0400
@@ -236,7 +236,7 @@
private String expandTabs(String s) {
int col = 0;
int len = s.length();
- StringBuffer sb = new StringBuffer(132);
+ StringBuilder sb = new StringBuilder(132);
for (int i = 0; i < len; i++) {
char c = s.charAt(i);
sb.append(c);
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java Mon Jun 16 13:48:58 2014 -0400
@@ -154,27 +154,27 @@
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer(refSpec.toString());
+ StringBuilder sb = new StringBuilder(refSpec.toString());
if (isMethodBreakpoint()) {
- buffer.append('.');
- buffer.append(methodId);
+ sb.append('.');
+ sb.append(methodId);
if (methodArgs != null) {
boolean first = true;
- buffer.append('(');
+ sb.append('(');
for (String arg : methodArgs) {
if (!first) {
- buffer.append(',');
+ sb.append(',');
}
- buffer.append(arg);
+ sb.append(arg);
first = false;
}
- buffer.append(")");
+ sb.append(")");
}
} else {
- buffer.append(':');
- buffer.append(lineNumber);
+ sb.append(':');
+ sb.append(lineNumber);
}
- return MessageOutput.format("breakpoint", buffer.toString());
+ return MessageOutput.format("breakpoint", sb.toString());
}
private Location location(ReferenceType refType) throws
@@ -275,8 +275,8 @@
* stripping whitespace after the name ends
*/
int i = 0;
- StringBuffer typePart = new StringBuffer();
- StringBuffer arrayPart = new StringBuffer();
+ StringBuilder typePart = new StringBuilder();
+ StringBuilder arrayPart = new StringBuilder();
name = name.trim();
int nameLength = name.length();
/*
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Mon Jun 16 13:48:58 2014 -0400
@@ -164,30 +164,30 @@
}
String typedName(Method method) {
- StringBuffer buf = new StringBuffer();
- buf.append(method.name());
- buf.append("(");
+ StringBuilder sb = new StringBuilder();
+ sb.append(method.name());
+ sb.append("(");
List<String> args = method.argumentTypeNames();
int lastParam = args.size() - 1;
// output param types except for the last
for (int ii = 0; ii < lastParam; ii++) {
- buf.append(args.get(ii));
- buf.append(", ");
+ sb.append(args.get(ii));
+ sb.append(", ");
}
if (lastParam >= 0) {
// output the last param
String lastStr = args.get(lastParam);
if (method.isVarArgs()) {
// lastParam is an array. Replace the [] with ...
- buf.append(lastStr.substring(0, lastStr.length() - 2));
- buf.append("...");
+ sb.append(lastStr.substring(0, lastStr.length() - 2));
+ sb.append("...");
} else {
- buf.append(lastStr);
+ sb.append(lastStr);
}
}
- buf.append(")");
- return buf.toString();
+ sb.append(")");
+ return sb.toString();
}
void commandConnectors(VirtualMachineManager vmm) {
@@ -226,7 +226,7 @@
}
void commandClasses() {
- StringBuffer classList = new StringBuffer();
+ StringBuilder classList = new StringBuilder();
for (ReferenceType refType : Env.vm().allClasses()) {
classList.append(refType.name());
classList.append("\n");
@@ -309,7 +309,7 @@
String idClass = t.nextToken();
ReferenceType cls = Env.getReferenceTypeFromToken(idClass);
if (cls != null) {
- StringBuffer methodsList = new StringBuffer();
+ StringBuilder methodsList = new StringBuilder();
for (Method method : cls.allMethods()) {
methodsList.append(method.declaringType().name());
methodsList.append(" ");
@@ -333,7 +333,7 @@
if (cls != null) {
List<Field> fields = cls.allFields();
List<Field> visible = cls.visibleFields();
- StringBuffer fieldsList = new StringBuffer();
+ StringBuilder fieldsList = new StringBuilder();
for (Field field : fields) {
String s;
if (!visible.contains(field)) {
@@ -391,11 +391,11 @@
* very long thread names, at the possible cost of lines
* being wrapped by the display device.
*/
- StringBuffer idBuffer = new StringBuffer(Env.description(thr));
+ StringBuilder idBuffer = new StringBuilder(Env.description(thr));
for (int i = idBuffer.length(); i < maxIdLength; i++) {
idBuffer.append(" ");
}
- StringBuffer nameBuffer = new StringBuffer(thr.name());
+ StringBuilder nameBuffer = new StringBuilder(thr.name());
for (int i = nameBuffer.length(); i < maxNameLength; i++) {
nameBuffer.append(" ");
}
@@ -1606,16 +1606,16 @@
private void dump(ObjectReference obj, ReferenceType refType,
ReferenceType refTypeBase) {
for (Field field : refType.fields()) {
- StringBuffer o = new StringBuffer();
- o.append(" ");
+ StringBuilder sb = new StringBuilder();
+ sb.append(" ");
if (!refType.equals(refTypeBase)) {
- o.append(refType.name());
- o.append(".");
+ sb.append(refType.name());
+ sb.append(".");
}
- o.append(field.name());
- o.append(MessageOutput.format("colon space"));
- o.append(obj.getValue(field));
- MessageOutput.printDirectln(o.toString()); // Special case: use printDirectln()
+ sb.append(field.name());
+ sb.append(MessageOutput.format("colon space"));
+ sb.append(obj.getValue(field));
+ MessageOutput.printDirectln(sb.toString()); // Special case: use printDirectln()
}
if (refType instanceof ClassType) {
ClassType sup = ((ClassType)refType).superclass();
@@ -1954,7 +1954,7 @@
}
}
- StringBuffer line = new StringBuffer(80);
+ StringBuilder line = new StringBuilder(80);
line.append("0000: ");
for (int i = 0; i < bytecodes.length; i++) {
if ((i > 0) && (i % 16 == 0)) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java Mon Jun 16 13:48:58 2014 -0400
@@ -114,12 +114,12 @@
}
static String excludesString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (String pattern : excludes()) {
- buffer.append(pattern);
- buffer.append(",");
+ sb.append(pattern);
+ sb.append(",");
}
- return buffer.toString();
+ return sb.toString();
}
static void addExcludes(StepRequest request) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Mon Jun 16 13:48:58 2014 -0400
@@ -827,17 +827,17 @@
private static String addArgument(String string, String argument) {
if (hasWhitespace(argument) || argument.indexOf(',') != -1) {
// Quotes were stripped out for this argument, add 'em back.
- StringBuffer buffer = new StringBuffer(string);
- buffer.append('"');
+ StringBuilder sb = new StringBuilder(string);
+ sb.append('"');
for (int i = 0; i < argument.length(); i++) {
char c = argument.charAt(i);
if (c == '"') {
- buffer.append('\\');
+ sb.append('\\');
}
- buffer.append(c);
+ sb.append(c);
}
- buffer.append("\" ");
- return buffer.toString();
+ sb.append("\" ");
+ return sb.toString();
} else {
return string + argument + ' ';
}
--- a/jdk/src/share/classes/com/sun/tools/example/trace/Trace.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/example/trace/Trace.java Mon Jun 16 13:48:58 2014 -0400
@@ -121,7 +121,7 @@
usage();
System.exit(1);
}
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(args[inx]);
for (++inx; inx < args.length; ++inx) {
sb.append(' ');
--- a/jdk/src/share/classes/com/sun/tools/hat/internal/util/Misc.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/hat/internal/util/Misc.java Mon Jun 16 13:48:58 2014 -0400
@@ -83,30 +83,30 @@
public static String encodeHtml(String str) {
final int len = str.length();
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < len; i++) {
char ch = str.charAt(i);
if (ch == '<') {
- buf.append("<");
+ sb.append("<");
} else if (ch == '>') {
- buf.append(">");
+ sb.append(">");
} else if (ch == '"') {
- buf.append(""");
+ sb.append(""");
} else if (ch == '\'') {
- buf.append("'");
+ sb.append("'");
} else if (ch == '&') {
- buf.append("&");
+ sb.append("&");
} else if (ch < ' ') {
- buf.append("&#" + Integer.toString(ch) + ";");
+ sb.append("&#" + Integer.toString(ch) + ";");
} else {
int c = (ch & 0xFFFF);
if (c > 127) {
- buf.append("&#" + Integer.toString(c) + ";");
+ sb.append("&#" + Integer.toString(c) + ";");
} else {
- buf.append(ch);
+ sb.append(ch);
}
}
}
- return buf.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/com/sun/tools/jdi/FieldImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/jdi/FieldImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -95,12 +95,12 @@
}
public String toString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buf.append(declaringType().name());
- buf.append('.');
- buf.append(name());
+ sb.append(declaringType().name());
+ sb.append('.');
+ sb.append(name());
- return buf.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/com/sun/tools/jdi/JNITypeParser.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/jdi/JNITypeParser.java Mon Jun 16 13:48:58 2014 -0400
@@ -44,11 +44,11 @@
}
static String typeNameToSignature(String signature) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int firstIndex = signature.indexOf('[');
int index = firstIndex;
while (index != -1) {
- buffer.append('[');
+ sb.append('[');
index = signature.indexOf('[', index + 1);
}
@@ -57,28 +57,28 @@
}
if (signature.equals("boolean")) {
- buffer.append('Z');
+ sb.append('Z');
} else if (signature.equals("byte")) {
- buffer.append('B');
+ sb.append('B');
} else if (signature.equals("char")) {
- buffer.append('C');
+ sb.append('C');
} else if (signature.equals("short")) {
- buffer.append('S');
+ sb.append('S');
} else if (signature.equals("int")) {
- buffer.append('I');
+ sb.append('I');
} else if (signature.equals("long")) {
- buffer.append('J');
+ sb.append('J');
} else if (signature.equals("float")) {
- buffer.append('F');
+ sb.append('F');
} else if (signature.equals("double")) {
- buffer.append('D');
+ sb.append('D');
} else {
- buffer.append('L');
- buffer.append(signature.replace('.', '/'));
- buffer.append(';');
+ sb.append('L');
+ sb.append(signature.replace('.', '/'));
+ sb.append(';');
}
- return buffer.toString();
+ return sb.toString();
}
String typeName() {
--- a/jdk/src/share/classes/com/sun/tools/jdi/MethodImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/jdi/MethodImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -387,7 +387,7 @@
}
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(declaringType().name());
sb.append(".");
sb.append(name());
--- a/jdk/src/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -751,7 +751,7 @@
String baseSourceDir() {
if (baseSourceDir == null) {
String typeName = name();
- StringBuffer sb = new StringBuffer(typeName.length() + 10);
+ StringBuilder sb = new StringBuilder(typeName.length() + 10);
int index = 0;
int nextIndex;
--- a/jdk/src/share/classes/com/sun/tools/jdi/SDE.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/jdi/SDE.java Mon Jun 16 13:48:58 2014 -0400
@@ -56,16 +56,16 @@
if (sourcePath == null) {
sourcePath = refType.baseSourceDir() + sourceName;
} else {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < sourcePath.length(); ++i) {
char ch = sourcePath.charAt(i);
if (ch == '/') {
- buf.append(File.separatorChar);
+ sb.append(File.separatorChar);
} else {
- buf.append(ch);
+ sb.append(ch);
}
}
- sourcePath = buf.toString();
+ sourcePath = sb.toString();
}
isConverted = true;
}
@@ -327,7 +327,7 @@
}
String readLine() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
char ch;
ignoreWhite();
--- a/jdk/src/share/classes/com/sun/tools/jdi/TargetVM.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/jdi/TargetVM.java Mon Jun 16 13:48:58 2014 -0400
@@ -78,7 +78,7 @@
", errorCode=" + packet.errorCode +
", flags=" + packet.flags);
}
- StringBuffer line = new StringBuffer(80);
+ StringBuilder line = new StringBuilder(80);
line.append("0000: ");
for (int i = 0; i < packet.data.length; i++) {
if ((i > 0) && (i % 16 == 0)) {
--- a/jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -742,7 +742,7 @@
}
void printReceiveTrace(int depth, String string) {
- StringBuffer sb = new StringBuffer("Receiving:");
+ StringBuilder sb = new StringBuilder("Receiving:");
for (int i = depth; i > 0; --i) {
sb.append(" ");
}
@@ -872,7 +872,7 @@
ReferenceTypeImpl referenceType(long id, int tag,
String signature) {
if ((vm.traceFlags & VirtualMachine.TRACE_REFTYPES) != 0) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Looking up ");
if (tag == JDWP.TypeTag.CLASS) {
sb.append("Class");
--- a/jdk/src/share/classes/java/beans/Introspector.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/beans/Introspector.java Mon Jun 16 13:48:58 2014 -0400
@@ -1282,7 +1282,7 @@
* Creates a key for a method in a method cache.
*/
private static String makeQualifiedMethodName(String name, String[] params) {
- StringBuffer sb = new StringBuffer(name);
+ StringBuilder sb = new StringBuilder(name);
sb.append('=');
for (int i = 0; i < params.length; i++) {
sb.append(':');
--- a/jdk/src/share/classes/java/beans/Statement.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/beans/Statement.java Mon Jun 16 13:48:58 2014 -0400
@@ -340,7 +340,7 @@
if (arguments == null) {
arguments = emptyArray;
}
- StringBuffer result = new StringBuffer(instanceName(target) + "." + methodName + "(");
+ StringBuilder result = new StringBuilder(instanceName(target) + "." + methodName + "(");
int n = arguments.length;
for(int i = 0; i < n; i++) {
result.append(instanceName(arguments[i]));
--- a/jdk/src/share/classes/java/io/RandomAccessFile.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/io/RandomAccessFile.java Mon Jun 16 13:48:58 2014 -0400
@@ -890,7 +890,7 @@
*/
public final String readLine() throws IOException {
- StringBuffer input = new StringBuffer();
+ StringBuilder input = new StringBuilder();
int c = -1;
boolean eol = false;
--- a/jdk/src/share/classes/java/net/IDN.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/net/IDN.java Mon Jun 16 13:48:58 2014 -0400
@@ -111,7 +111,7 @@
public static String toASCII(String input, int flag)
{
int p = 0, q = 0;
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
if (isRootLabel(input)) {
return ".";
@@ -172,7 +172,7 @@
*/
public static String toUnicode(String input, int flag) {
int p = 0, q = 0;
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
if (isRootLabel(input)) {
return ".";
--- a/jdk/src/share/classes/java/net/SocketPermission.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/net/SocketPermission.java Mon Jun 16 13:48:58 2014 -0400
@@ -733,7 +733,7 @@
InetAddress auth;
try {
- StringBuffer sb = new StringBuffer(39);
+ StringBuilder sb = new StringBuilder(39);
for (int i = 15; i >= 0; i--) {
sb.append(Integer.toHexString(((addr[i]) & 0x0f)));
--- a/jdk/src/share/classes/java/net/URI.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/net/URI.java Mon Jun 16 13:48:58 2014 -0400
@@ -1957,7 +1957,7 @@
private void defineString() {
if (string != null) return;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (scheme != null) {
sb.append(scheme);
sb.append(':');
@@ -2015,7 +2015,7 @@
if (i >= 0)
path = base.substring(0, i + 1);
} else {
- StringBuffer sb = new StringBuffer(base.length() + cn);
+ StringBuilder sb = new StringBuilder(base.length() + cn);
// 5.2 (6a)
if (i >= 0)
sb.append(base.substring(0, i + 1));
@@ -2778,7 +2778,7 @@
if (s.indexOf('%') < 0)
return s;
- StringBuffer sb = new StringBuffer(n);
+ StringBuilder sb = new StringBuilder(n);
ByteBuffer bb = ByteBuffer.allocate(n);
CharBuffer cb = CharBuffer.allocate(n);
CharsetDecoder dec = ThreadLocalCoders.decoderFor("UTF-8")
--- a/jdk/src/share/classes/java/net/URISyntaxException.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/net/URISyntaxException.java Mon Jun 16 13:48:58 2014 -0400
@@ -121,7 +121,7 @@
* @return A string describing the parse error
*/
public String getMessage() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(getReason());
if (index > -1) {
sb.append(" at index ");
--- a/jdk/src/share/classes/java/net/URLDecoder.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/net/URLDecoder.java Mon Jun 16 13:48:58 2014 -0400
@@ -134,7 +134,7 @@
boolean needToChange = false;
int numChars = s.length();
- StringBuffer sb = new StringBuffer(numChars > 500 ? numChars / 2 : numChars);
+ StringBuilder sb = new StringBuilder(numChars > 500 ? numChars / 2 : numChars);
int i = 0;
if (enc.length() == 0) {
--- a/jdk/src/share/classes/java/net/URLEncoder.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/net/URLEncoder.java Mon Jun 16 13:48:58 2014 -0400
@@ -201,7 +201,7 @@
throws UnsupportedEncodingException {
boolean needToChange = false;
- StringBuffer out = new StringBuffer(s.length());
+ StringBuilder out = new StringBuilder(s.length());
Charset charset;
CharArrayWriter charArrayWriter = new CharArrayWriter();
--- a/jdk/src/share/classes/java/net/URLStreamHandler.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/net/URLStreamHandler.java Mon Jun 16 13:48:58 2014 -0400
@@ -486,7 +486,7 @@
if (u.getRef() != null)
len += 1 + u.getRef().length();
- StringBuffer result = new StringBuffer(len);
+ StringBuilder result = new StringBuilder(len);
result.append(u.getProtocol());
result.append(":");
if (u.getAuthority() != null && u.getAuthority().length() > 0) {
--- a/jdk/src/share/classes/java/nio/file/InvalidPathException.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/nio/file/InvalidPathException.java Mon Jun 16 13:48:58 2014 -0400
@@ -117,7 +117,7 @@
* @return a string describing the error
*/
public String getMessage() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(getReason());
if (index > -1) {
sb.append(" at index ");
--- a/jdk/src/share/classes/java/rmi/dgc/VMID.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/rmi/dgc/VMID.java Mon Jun 16 13:48:58 2014 -0400
@@ -120,15 +120,15 @@
* Return string representation of this VMID.
*/
public String toString() {
- StringBuffer result = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (addr != null)
for (int i = 0; i < addr.length; ++ i) {
int x = addr[i] & 0xFF;
- result.append((x < 0x10 ? "0" : "") +
- Integer.toString(x, 16));
+ sb.append((x < 0x10 ? "0" : "") +
+ Integer.toString(x, 16));
}
- result.append(':');
- result.append(uid.toString());
- return result.toString();
+ sb.append(':');
+ sb.append(uid.toString());
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/java/security/CodeSigner.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/CodeSigner.java Mon Jun 16 13:48:58 2014 -0400
@@ -154,7 +154,7 @@
* if present.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("(");
sb.append("Signer: " + signerCertPath.getCertificates().get(0));
if (timestamp != null) {
--- a/jdk/src/share/classes/java/security/Timestamp.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/Timestamp.java Mon Jun 16 13:48:58 2014 -0400
@@ -141,7 +141,7 @@
* its signer's certificate.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("(");
sb.append("timestamp: " + timestamp);
List<? extends Certificate> certs = signerCertPath.getCertificates();
--- a/jdk/src/share/classes/java/security/cert/CertPath.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/CertPath.java Mon Jun 16 13:48:58 2014 -0400
@@ -220,7 +220,7 @@
* @return a string representation of this certification path
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Iterator<? extends Certificate> stringIterator =
getCertificates().iterator();
--- a/jdk/src/share/classes/java/security/cert/CollectionCertStoreParameters.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/CollectionCertStoreParameters.java Mon Jun 16 13:48:58 2014 -0400
@@ -132,7 +132,7 @@
* @return a formatted string describing the parameters
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("CollectionCertStoreParameters: [\n");
sb.append(" collection: " + coll + "\n");
sb.append("]");
--- a/jdk/src/share/classes/java/security/cert/LDAPCertStoreParameters.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/LDAPCertStoreParameters.java Mon Jun 16 13:48:58 2014 -0400
@@ -138,7 +138,7 @@
* @return a formatted string describing the parameters
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("LDAPCertStoreParameters: [\n");
sb.append(" serverName: " + serverName + "\n");
--- a/jdk/src/share/classes/java/security/cert/PKIXBuilderParameters.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/PKIXBuilderParameters.java Mon Jun 16 13:48:58 2014 -0400
@@ -189,7 +189,7 @@
* @return a formatted string describing the parameters
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("[\n");
sb.append(super.toString());
sb.append(" Maximum Path Length: " + maxPathLength + "\n");
--- a/jdk/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java Mon Jun 16 13:48:58 2014 -0400
@@ -107,7 +107,7 @@
* {@code PKIXCertPathBuilderResult}
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("PKIXCertPathBuilderResult: [\n");
sb.append(" Certification Path: " + certPath + "\n");
sb.append(" Trust Anchor: " + getTrustAnchor().toString() + "\n");
--- a/jdk/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java Mon Jun 16 13:48:58 2014 -0400
@@ -148,7 +148,7 @@
* {@code PKIXCertPathValidatorResult}
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("PKIXCertPathValidatorResult: [\n");
sb.append(" Trust Anchor: " + trustAnchor.toString() + "\n");
sb.append(" Policy Tree: " + String.valueOf(policyTree) + "\n");
--- a/jdk/src/share/classes/java/security/cert/PKIXParameters.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/PKIXParameters.java Mon Jun 16 13:48:58 2014 -0400
@@ -693,7 +693,7 @@
* @return a formatted string describing the parameters.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("[\n");
/* start with trusted anchor info */
--- a/jdk/src/share/classes/java/security/cert/PolicyQualifierInfo.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/PolicyQualifierInfo.java Mon Jun 16 13:48:58 2014 -0400
@@ -161,7 +161,7 @@
if (pqiString != null)
return pqiString;
HexDumpEncoder enc = new HexDumpEncoder();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("PolicyQualifierInfo: [\n");
sb.append(" qualifierID: " + mId + "\n");
sb.append(" qualifier: " +
--- a/jdk/src/share/classes/java/security/cert/TrustAnchor.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/TrustAnchor.java Mon Jun 16 13:48:58 2014 -0400
@@ -317,7 +317,7 @@
* @return a formatted string describing the {@code TrustAnchor}
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("[\n");
if (pubKey != null) {
sb.append(" Trusted CA Public Key: " + pubKey.toString() + "\n");
--- a/jdk/src/share/classes/java/security/cert/X509CRLSelector.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/X509CRLSelector.java Mon Jun 16 13:48:58 2014 -0400
@@ -566,7 +566,7 @@
* {@code X509CRLSelector}.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("X509CRLSelector: [\n");
if (issuerNames != null) {
sb.append(" IssuerNames:\n");
--- a/jdk/src/share/classes/java/security/cert/X509CertSelector.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/security/cert/X509CertSelector.java Mon Jun 16 13:48:58 2014 -0400
@@ -1811,7 +1811,7 @@
* {@code CertSelector}
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("X509CertSelector: [\n");
if (x509Cert != null) {
sb.append(" Certificate: " + x509Cert.toString() + "\n");
--- a/jdk/src/share/classes/java/text/AttributedString.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/text/AttributedString.java Mon Jun 16 13:48:58 2014 -0400
@@ -243,11 +243,11 @@
throw new IllegalArgumentException("Invalid substring range");
// Copy the given string
- StringBuffer textBuffer = new StringBuffer();
+ StringBuilder textBuilder = new StringBuilder();
text.setIndex(beginIndex);
for (char c = text.current(); text.getIndex() < endIndex; c = text.next())
- textBuffer.append(c);
- this.text = textBuffer.toString();
+ textBuilder.append(c);
+ this.text = textBuilder.toString();
if (beginIndex == endIndex)
return;
--- a/jdk/src/share/classes/java/text/ChoiceFormat.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/text/ChoiceFormat.java Mon Jun 16 13:48:58 2014 -0400
@@ -259,7 +259,7 @@
* @return the pattern string
*/
public String toPattern() {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int i = 0; i < choiceLimits.length; ++i) {
if (i != 0) {
result.append('|');
--- a/jdk/src/share/classes/java/util/Properties.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/util/Properties.java Mon Jun 16 13:48:58 2014 -0400
@@ -602,7 +602,7 @@
if (bufLen < 0) {
bufLen = Integer.MAX_VALUE;
}
- StringBuffer outBuffer = new StringBuffer(bufLen);
+ StringBuilder outBuffer = new StringBuilder(bufLen);
for(int x=0; x<len; x++) {
char aChar = theString.charAt(x);
--- a/jdk/src/share/classes/java/util/prefs/Base64.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/util/prefs/Base64.java Mon Jun 16 13:48:58 2014 -0400
@@ -57,7 +57,7 @@
int numFullGroups = aLen/3;
int numBytesInPartialGroup = aLen - 3*numFullGroups;
int resultLen = 4*((aLen + 2)/3);
- StringBuffer result = new StringBuffer(resultLen);
+ StringBuilder result = new StringBuilder(resultLen);
char[] intToAlpha = (alternate ? intToAltBase64 : intToBase64);
// Translate all full groups from byte array elements to Base64
--- a/jdk/src/share/classes/java/util/regex/PatternSyntaxException.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/java/util/regex/PatternSyntaxException.java Mon Jun 16 13:48:58 2014 -0400
@@ -105,7 +105,7 @@
* @return The full detail message
*/
public String getMessage() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(desc);
if (index >= 0) {
sb.append(" near index ");
--- a/jdk/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -289,7 +289,7 @@
}
public String readLine() throws IOException {
- StringBuffer input = new StringBuffer();
+ StringBuilder input = new StringBuilder();
int c = -1;
boolean eol = false;
--- a/jdk/src/share/classes/javax/naming/BinaryRefAddr.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/naming/BinaryRefAddr.java Mon Jun 16 13:48:58 2014 -0400
@@ -165,7 +165,7 @@
* @return The non-null string representation of this address.
*/
public String toString(){
- StringBuffer str = new StringBuffer("Address Type: " + addrType + "\n");
+ StringBuilder str = new StringBuilder("Address Type: " + addrType + "\n");
str.append("AddressContents: ");
for (int i = 0; i<buf.length && i < 32; i++) {
--- a/jdk/src/share/classes/javax/naming/NameImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/naming/NameImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -104,7 +104,7 @@
String endQuote;
boolean start = true;
boolean one = false;
- StringBuffer answer = new StringBuffer(len);
+ StringBuilder answer = new StringBuilder(len);
while (i < len) {
// handle quoted strings
--- a/jdk/src/share/classes/javax/naming/RefAddr.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/naming/RefAddr.java Mon Jun 16 13:48:58 2014 -0400
@@ -139,7 +139,7 @@
* @return The non-null string representation of this address.
*/
public String toString(){
- StringBuffer str = new StringBuffer("Type: " + addrType + "\n");
+ StringBuilder str = new StringBuilder("Type: " + addrType + "\n");
str.append("Content: " + getContent() + "\n");
return (str.toString());
--- a/jdk/src/share/classes/javax/naming/Reference.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/naming/Reference.java Mon Jun 16 13:48:58 2014 -0400
@@ -364,13 +364,13 @@
* @return The non-null string representation of this reference.
*/
public String toString() {
- StringBuffer buf = new StringBuffer("Reference Class Name: " +
- className + "\n");
+ StringBuilder sb = new StringBuilder("Reference Class Name: " +
+ className + "\n");
int len = addrs.size();
for (int i = 0; i < len; i++)
- buf.append(get(i).toString());
+ sb.append(get(i).toString());
- return buf.toString();
+ return sb.toString();
}
/**
--- a/jdk/src/share/classes/javax/naming/directory/BasicAttribute.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/naming/directory/BasicAttribute.java Mon Jun 16 13:48:58 2014 -0400
@@ -211,7 +211,7 @@
* @return The non-null string representation of this attribute.
*/
public String toString() {
- StringBuffer answer = new StringBuffer(attrID + ": ");
+ StringBuilder answer = new StringBuilder(attrID + ": ");
if (values.size() == 0) {
answer.append("No values");
} else {
--- a/jdk/src/share/classes/javax/print/MimeType.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/print/MimeType.java Mon Jun 16 13:48:58 2014 -0400
@@ -285,7 +285,7 @@
*/
private String getStringValue() {
if (myStringValue == null) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append (myPieces[0]);
result.append ('/');
result.append (myPieces[1]);
@@ -510,7 +510,7 @@
int n = s.length();
int i;
char c;
- StringBuffer result = new StringBuffer (n+2);
+ StringBuilder result = new StringBuilder (n+2);
result.append ('\"');
for (i = 0; i < n; ++ i) {
c = s.charAt (i);
--- a/jdk/src/share/classes/javax/print/attribute/ResolutionSyntax.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/print/attribute/ResolutionSyntax.java Mon Jun 16 13:48:58 2014 -0400
@@ -241,7 +241,7 @@
* (unchecked exception) Thrown if {@code units < 1}.
*/
public String toString(int units, String unitsName) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append(getCrossFeedResolution (units));
result.append('x');
result.append(getFeedResolution (units));
@@ -326,7 +326,7 @@
* resolution. The values are reported in the internal units of dphi.
*/
public String toString() {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append(crossFeedResolution);
result.append('x');
result.append(feedResolution);
--- a/jdk/src/share/classes/javax/print/attribute/SetOfIntegerSyntax.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/print/attribute/SetOfIntegerSyntax.java Mon Jun 16 13:48:58 2014 -0400
@@ -540,7 +540,7 @@
* <CODE>"<I>i</I>-<I>j</I>"</CODE> otherwise.
*/
public String toString() {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
int n = members.length;
for (int i = 0; i < n; i++) {
if (i > 0) {
--- a/jdk/src/share/classes/javax/print/attribute/Size2DSyntax.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/print/attribute/Size2DSyntax.java Mon Jun 16 13:48:58 2014 -0400
@@ -257,7 +257,7 @@
* (unchecked exception) Thrown if {@code units < 1}.
*/
public String toString(int units, String unitsName) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append(getX (units));
result.append('x');
result.append(getY (units));
@@ -312,7 +312,7 @@
* The values are reported in the internal units of micrometers.
*/
public String toString() {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append(x);
result.append('x');
result.append(y);
--- a/jdk/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java Mon Jun 16 13:48:58 2014 -0400
@@ -636,11 +636,11 @@
public String toString() {
if (destroyed)
throw new IllegalStateException("This ticket is no longer valid");
- StringBuffer caddrBuf = new StringBuffer();
+ StringBuilder caddrString = new StringBuilder();
if (clientAddresses != null) {
for (int i = 0; i < clientAddresses.length; i++) {
- caddrBuf.append("clientAddresses[" + i + "] = " +
- clientAddresses[i].toString());
+ caddrString.append("clientAddresses[" + i + "] = " +
+ clientAddresses[i].toString());
}
}
return ("Ticket (hex) = " + "\n" +
@@ -660,7 +660,7 @@
"End Time = " + endTime.toString() + "\n" +
"Renew Till = " + String.valueOf(renewTill) + "\n" +
"Client Addresses " +
- (clientAddresses == null ? " Null " : caddrBuf.toString() +
+ (clientAddresses == null ? " Null " : caddrString.toString() +
"\n"));
}
--- a/jdk/src/share/classes/javax/sound/sampled/CompoundControl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sound/sampled/CompoundControl.java Mon Jun 16 13:48:58 2014 -0400
@@ -94,18 +94,18 @@
*/
public String toString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < controls.length; i++) {
if (i != 0) {
- buf.append(", ");
+ sb.append(", ");
if ((i + 1) == controls.length) {
- buf.append("and ");
+ sb.append("and ");
}
}
- buf.append(controls[i].getType());
+ sb.append(controls[i].getType());
}
- return new String(getType() + " Control containing " + buf + " Controls.");
+ return new String(getType() + " Control containing " + sb + " Controls.");
}
--- a/jdk/src/share/classes/javax/sound/sampled/DataLine.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sound/sampled/DataLine.java Mon Jun 16 13:48:58 2014 -0400
@@ -471,23 +471,23 @@
*/
public String toString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if ( (formats.length == 1) && (formats[0] != null) ) {
- buf.append(" supporting format " + formats[0]);
+ sb.append(" supporting format " + formats[0]);
} else if (getFormats().length > 1) {
- buf.append(" supporting " + getFormats().length + " audio formats");
+ sb.append(" supporting " + getFormats().length + " audio formats");
}
if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (maxBufferSize != AudioSystem.NOT_SPECIFIED) ) {
- buf.append(", and buffers of " + minBufferSize + " to " + maxBufferSize + " bytes");
+ sb.append(", and buffers of " + minBufferSize + " to " + maxBufferSize + " bytes");
} else if ( (minBufferSize != AudioSystem.NOT_SPECIFIED) && (minBufferSize > 0) ) {
- buf.append(", and buffers of at least " + minBufferSize + " bytes");
+ sb.append(", and buffers of at least " + minBufferSize + " bytes");
} else if (maxBufferSize != AudioSystem.NOT_SPECIFIED) {
- buf.append(", and buffers of up to " + minBufferSize + " bytes");
+ sb.append(", and buffers of up to " + minBufferSize + " bytes");
}
- return new String(super.toString() + buf);
+ return new String(super.toString() + sb);
}
} // class Info
--- a/jdk/src/share/classes/javax/sql/CommonDataSource.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/CommonDataSource.java Mon Jun 16 13:48:58 2014 -0400
@@ -34,6 +34,7 @@
* Interface that defines the methods which are common between <code>DataSource</code>,
* <code>XADataSource</code> and <code>ConnectionPoolDataSource</code>.
*
+ * @since 1.6
*/
public interface CommonDataSource {
--- a/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java Mon Jun 16 13:48:58 2014 -0400
@@ -291,6 +291,8 @@
* extending class overrides and reimplements any <code>BaseRowSet</code> method and encounters
* connectivity or underlying data source issues, that method <b>may</b> in addition throw an
* <code>SQLException</code> object for that reason.
+*
+* @since 1.5
*/
public abstract class BaseRowSet implements Serializable, Cloneable {
--- a/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java Mon Jun 16 13:48:58 2014 -0400
@@ -626,6 +626,7 @@
* </PRE>
*
* @author Jonathan Bruce
+ * @since 1.5
*/
public interface CachedRowSet extends RowSet, Joinable {
--- a/jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java Mon Jun 16 13:48:58 2014 -0400
@@ -122,6 +122,7 @@
* synchronized with the data source.
*
* @author Jonathan Bruce
+ * @since 1.5
*/
public interface FilteredRowSet extends WebRowSet {
--- a/jdk/src/share/classes/javax/sql/rowset/JdbcRowSet.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/JdbcRowSet.java Mon Jun 16 13:48:58 2014 -0400
@@ -118,6 +118,7 @@
* requirements of connected and disconnected <code>RowSet</code> objects.
*
* @author Jonathan Bruce
+ * @since 1.5
*/
public interface JdbcRowSet extends RowSet, Joinable {
--- a/jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java Mon Jun 16 13:48:58 2014 -0400
@@ -217,6 +217,7 @@
* This method creates a copy that can be persisted to the data source.
* </UL>
*
+ * @since 1.5
*/
public interface JoinRowSet extends WebRowSet {
--- a/jdk/src/share/classes/javax/sql/rowset/Joinable.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/Joinable.java Mon Jun 16 13:48:58 2014 -0400
@@ -129,6 +129,7 @@
*
* @see JoinRowSet
* @author Jonathan Bruce
+ * @since 1.5
*/
public interface Joinable {
--- a/jdk/src/share/classes/javax/sql/rowset/Predicate.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/Predicate.java Mon Jun 16 13:48:58 2014 -0400
@@ -97,6 +97,7 @@
* applications that use both column identification conventions.
*
* @author Jonathan Bruce, Amit Handa
+ * @since 1.5
*
*/
--- a/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -48,6 +48,8 @@
* Therefore, any <code>RowSetMetaDataImpl</code> method that retrieves information
* is defined as having unspecified behavior when it is called
* before the <code>RowSet</code> object contains data.
+ *
+ * @since 1.5
*/
public class RowSetMetaDataImpl implements RowSetMetaData, Serializable {
--- a/jdk/src/share/classes/javax/sql/rowset/RowSetWarning.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/RowSetWarning.java Mon Jun 16 13:48:58 2014 -0400
@@ -50,6 +50,8 @@
* The inherited methods <code>getMessage</code>, <code>getSQLState</code>,
* and <code>getErrorCode</code> retrieve information contained in a
* <code>RowSetWarning</code> object.
+ *
+ * @since 1.5
*/
public class RowSetWarning extends SQLException {
--- a/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java Mon Jun 16 13:48:58 2014 -0400
@@ -408,6 +408,7 @@
* @see javax.sql.rowset.CachedRowSet
* @see javax.sql.rowset.FilteredRowSet
* @see javax.sql.rowset.JoinRowSet
+ * @since 1.5
*/
public interface WebRowSet extends CachedRowSet {
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -52,6 +52,8 @@
* to write data from the <code>SQLData</code> object to
* the <code>SQLOutputImpl</code> output stream as the
* representation of an SQL user-defined type.
+ *
+ * @since 1.5
*/
public class SQLOutputImpl implements SQLOutput {
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java Mon Jun 16 13:48:58 2014 -0400
@@ -56,6 +56,7 @@
* SerialArray is to be used by more than one thread then access to the
* SerialArray should be controlled by appropriate synchronization.
*
+ * @since 1.5
*/
public class SerialArray implements Array, Serializable, Cloneable {
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java Mon Jun 16 13:48:58 2014 -0400
@@ -58,6 +58,7 @@
* should be controlled by appropriate synchronization.
*
* @author Jonathan Bruce
+ * @since 1.5
*/
public class SerialBlob implements Blob, Serializable, Cloneable {
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java Mon Jun 16 13:48:58 2014 -0400
@@ -49,7 +49,9 @@
* <p> A SerialClob is not safe for use by multiple concurrent threads. If a
* SerialClob is to be used by more than one thread then access to the SerialClob
* should be controlled by appropriate synchronization.
+ *
* @author Jonathan Bruce
+ * @since 1.5
*/
public class SerialClob implements Clob, Serializable, Cloneable {
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java Mon Jun 16 13:48:58 2014 -0400
@@ -48,6 +48,8 @@
* A SerialDatalink is not safe for use by multiple concurrent threads. If a
* SerialDatalink is to be used by more than one thread then access to the
* SerialDatalink should be controlled by appropriate synchronization.
+ *
+ * @since 1.5
*/
public class SerialDatalink implements Serializable, Cloneable {
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialException.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialException.java Mon Jun 16 13:48:58 2014 -0400
@@ -32,6 +32,7 @@
* SQL types such as <code>BLOB, CLOB, STRUCT or ARRAY</code> in
* addition to SQL types such as <code>DATALINK and JAVAOBJECT</code>
*
+ * @since 1.5
*/
public class SerialException extends java.sql.SQLException {
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java Mon Jun 16 13:48:58 2014 -0400
@@ -54,6 +54,7 @@
* SerialJavaObject should be controlled by appropriate synchronization.
*
* @author Jonathan Bruce
+ * @since 1.5
*/
public class SerialJavaObject implements Serializable, Cloneable {
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java Mon Jun 16 13:48:58 2014 -0400
@@ -43,6 +43,7 @@
* SerialRef is to be used by more than one thread then access to the SerialRef
* should be controlled by appropriate synchronization.
*
+ * @since 1.5
*/
public class SerialRef implements Ref, Serializable, Cloneable {
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java Mon Jun 16 13:48:58 2014 -0400
@@ -57,6 +57,7 @@
* SerialStruct is to be used by more than one thread then access to the
* SerialStruct should be controlled by appropriate synchronization.
*
+ * @since 1.5
*/
public class SerialStruct implements Struct, Serializable, Cloneable {
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java Mon Jun 16 13:48:58 2014 -0400
@@ -200,6 +200,7 @@
* @author Jonathan Bruce
* @see javax.sql.rowset.spi.SyncProvider
* @see javax.sql.rowset.spi.SyncFactoryException
+ * @since 1.5
*/
public class SyncFactory {
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java Mon Jun 16 13:48:58 2014 -0400
@@ -35,6 +35,7 @@
* @author Jonathan Bruce
* @see javax.sql.rowset.spi.SyncFactory
* @see javax.sql.rowset.spi.SyncFactoryException
+ * @since 1.5
*/
public class SyncFactoryException extends java.sql.SQLException {
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java Mon Jun 16 13:48:58 2014 -0400
@@ -209,6 +209,7 @@
* @author Jonathan Bruce
* @see javax.sql.rowset.spi.SyncFactory
* @see javax.sql.rowset.spi.SyncFactoryException
+ * @since 1.5
*/
public abstract class SyncProvider {
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncProviderException.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncProviderException.java Mon Jun 16 13:48:58 2014 -0400
@@ -61,6 +61,7 @@
* @see javax.sql.rowset.spi.SyncFactory
* @see javax.sql.rowset.spi.SyncResolver
* @see javax.sql.rowset.spi.SyncFactoryException
+ * @since 1.5
*/
public class SyncProviderException extends java.sql.SQLException {
--- a/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java Mon Jun 16 13:48:58 2014 -0400
@@ -231,7 +231,9 @@
* }
* }
* }</PRE>
+ *
* @author Jonathan Bruce
+ * @since 1.5
*/
public interface SyncResolver extends RowSet {
--- a/jdk/src/share/classes/javax/sql/rowset/spi/TransactionalWriter.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/TransactionalWriter.java Mon Jun 16 13:48:58 2014 -0400
@@ -44,6 +44,8 @@
* the <code>CachedRowSet</code> constant <code>COMMIT_ON_ACCEPT_CHANGES</code>
* to <code>false</code> and use the <code>commit</code> and <code>rollback</code>
* methods defined in this interface to manage transaction boundaries.
+ *
+ * @since 1.5
*/
public interface TransactionalWriter extends RowSetWriter {
--- a/jdk/src/share/classes/javax/sql/rowset/spi/XmlReader.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/XmlReader.java Mon Jun 16 13:48:58 2014 -0400
@@ -46,6 +46,8 @@
* rowset's <code>xmlReader</code> field. When the <code>WebRowSet</code>
* object's <code>readXml</code> method is invoked, it in turn invokes
* its XML reader's <code>readXML</code> method.
+ *
+ * @since 1.5
*/
public interface XmlReader extends RowSetReader {
--- a/jdk/src/share/classes/javax/sql/rowset/spi/XmlWriter.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/sql/rowset/spi/XmlWriter.java Mon Jun 16 13:48:58 2014 -0400
@@ -44,6 +44,8 @@
* Writing a <code>WebRowSet</code> object includes printing the
* rowset's data, metadata, and properties, all with the
* appropriate XML tags.
+ *
+ * @since 1.5
*/
public interface XmlWriter extends RowSetWriter {
--- a/jdk/src/share/classes/javax/swing/JColorChooser.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/JColorChooser.java Mon Jun 16 13:48:58 2014 -0400
@@ -542,7 +542,7 @@
* @return a string representation of this <code>JColorChooser</code>
*/
protected String paramString() {
- StringBuffer chooserPanelsString = new StringBuffer("");
+ StringBuilder chooserPanelsString = new StringBuilder("");
for (int i=0; i<chooserPanels.length; i++) {
chooserPanelsString.append("[" + chooserPanels[i].toString()
+ "]");
--- a/jdk/src/share/classes/javax/swing/MultiUIDefaults.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/MultiUIDefaults.java Mon Jun 16 13:48:58 2014 -0400
@@ -190,18 +190,18 @@
@Override
public synchronized String toString() {
- StringBuffer buf = new StringBuffer();
- buf.append("{");
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
Enumeration keys = keys();
while (keys.hasMoreElements()) {
Object key = keys.nextElement();
- buf.append(key + "=" + get(key) + ", ");
+ sb.append(key + "=" + get(key) + ", ");
}
- int length = buf.length();
+ int length = sb.length();
if (length > 1) {
- buf.delete(length-2, length);
+ sb.delete(length-2, length);
}
- buf.append("}");
- return buf.toString();
+ sb.append("}");
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/javax/swing/RepaintManager.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/RepaintManager.java Mon Jun 16 13:48:58 2014 -0400
@@ -975,7 +975,7 @@
* @return a String representation of this object
*/
public synchronized String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if(dirtyComponents != null)
sb.append("" + dirtyComponents);
return sb.toString();
--- a/jdk/src/share/classes/javax/swing/event/TreeModelEvent.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/event/TreeModelEvent.java Mon Jun 16 13:48:58 2014 -0400
@@ -292,24 +292,24 @@
* @return a String representation of this object
*/
public String toString() {
- StringBuffer retBuffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- retBuffer.append(getClass().getName() + " " +
- Integer.toString(hashCode()));
+ sb.append(getClass().getName() + " " +
+ Integer.toString(hashCode()));
if(path != null)
- retBuffer.append(" path " + path);
+ sb.append(" path " + path);
if(childIndices != null) {
- retBuffer.append(" indices [ ");
+ sb.append(" indices [ ");
for(int counter = 0; counter < childIndices.length; counter++)
- retBuffer.append(Integer.toString(childIndices[counter])+ " ");
- retBuffer.append("]");
+ sb.append(Integer.toString(childIndices[counter])+ " ");
+ sb.append("]");
}
if(children != null) {
- retBuffer.append(" children [ ");
+ sb.append(" children [ ");
for(int counter = 0; counter < children.length; counter++)
- retBuffer.append(children[counter] + " ");
- retBuffer.append("]");
+ sb.append(children[counter] + " ");
+ sb.append("]");
}
- return retBuffer.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java Mon Jun 16 13:48:58 2014 -0400
@@ -1322,8 +1322,8 @@
return null;
}
- StringBuffer plainBuf = new StringBuffer();
- StringBuffer htmlBuf = new StringBuffer();
+ StringBuilder plainBuf = new StringBuilder();
+ StringBuilder htmlBuf = new StringBuilder();
htmlBuf.append("<html>\n<body>\n<ul>\n");
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicListUI.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicListUI.java Mon Jun 16 13:48:58 2014 -0400
@@ -2855,23 +2855,23 @@
return null;
}
- StringBuffer plainBuf = new StringBuffer();
- StringBuffer htmlBuf = new StringBuffer();
+ StringBuilder plainStr = new StringBuilder();
+ StringBuilder htmlStr = new StringBuilder();
- htmlBuf.append("<html>\n<body>\n<ul>\n");
+ htmlStr.append("<html>\n<body>\n<ul>\n");
for (int i = 0; i < values.length; i++) {
Object obj = values[i];
String val = ((obj == null) ? "" : obj.toString());
- plainBuf.append(val + "\n");
- htmlBuf.append(" <li>" + val + "\n");
+ plainStr.append(val + "\n");
+ htmlStr.append(" <li>" + val + "\n");
}
// remove the last newline
- plainBuf.deleteCharAt(plainBuf.length() - 1);
- htmlBuf.append("</ul>\n</body>\n</html>");
+ plainStr.deleteCharAt(plainStr.length() - 1);
+ htmlStr.append("</ul>\n</body>\n</html>");
- return new BasicTransferable(plainBuf.toString(), htmlBuf.toString());
+ return new BasicTransferable(plainStr.toString(), htmlStr.toString());
}
return null;
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java Mon Jun 16 13:48:58 2014 -0400
@@ -2182,29 +2182,29 @@
return null;
}
- StringBuffer plainBuf = new StringBuffer();
- StringBuffer htmlBuf = new StringBuffer();
+ StringBuilder plainStr = new StringBuilder();
+ StringBuilder htmlStr = new StringBuilder();
- htmlBuf.append("<html>\n<body>\n<table>\n");
+ htmlStr.append("<html>\n<body>\n<table>\n");
for (int row = 0; row < rows.length; row++) {
- htmlBuf.append("<tr>\n");
+ htmlStr.append("<tr>\n");
for (int col = 0; col < cols.length; col++) {
Object obj = table.getValueAt(rows[row], cols[col]);
String val = ((obj == null) ? "" : obj.toString());
- plainBuf.append(val + "\t");
- htmlBuf.append(" <td>" + val + "</td>\n");
+ plainStr.append(val + "\t");
+ htmlStr.append(" <td>" + val + "</td>\n");
}
// we want a newline at the end of each line and not a tab
- plainBuf.deleteCharAt(plainBuf.length() - 1).append("\n");
- htmlBuf.append("</tr>\n");
+ plainStr.deleteCharAt(plainStr.length() - 1).append("\n");
+ htmlStr.append("</tr>\n");
}
// remove the last newline
- plainBuf.deleteCharAt(plainBuf.length() - 1);
- htmlBuf.append("</table>\n</body>\n</html>");
+ plainStr.deleteCharAt(plainStr.length() - 1);
+ htmlStr.append("</table>\n</body>\n</html>");
- return new BasicTransferable(plainBuf.toString(), htmlBuf.toString());
+ return new BasicTransferable(plainStr.toString(), htmlStr.toString());
}
return null;
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Mon Jun 16 13:48:58 2014 -0400
@@ -3213,10 +3213,10 @@
return null;
}
- StringBuffer plainBuf = new StringBuffer();
- StringBuffer htmlBuf = new StringBuffer();
-
- htmlBuf.append("<html>\n<body>\n<ul>\n");
+ StringBuilder plainStr = new StringBuilder();
+ StringBuilder htmlStr = new StringBuilder();
+
+ htmlStr.append("<html>\n<body>\n<ul>\n");
TreeModel model = tree.getModel();
TreePath lastPath = null;
@@ -3227,17 +3227,17 @@
boolean leaf = model.isLeaf(node);
String label = getDisplayString(path, true, leaf);
- plainBuf.append(label + "\n");
- htmlBuf.append(" <li>" + label + "\n");
+ plainStr.append(label + "\n");
+ htmlStr.append(" <li>" + label + "\n");
}
// remove the last newline
- plainBuf.deleteCharAt(plainBuf.length() - 1);
- htmlBuf.append("</ul>\n</body>\n</html>");
+ plainStr.deleteCharAt(plainStr.length() - 1);
+ htmlStr.append("</ul>\n</body>\n</html>");
tree = null;
- return new BasicTransferable(plainBuf.toString(), htmlBuf.toString());
+ return new BasicTransferable(plainStr.toString(), htmlStr.toString());
}
return null;
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java Mon Jun 16 13:48:58 2014 -0400
@@ -618,20 +618,20 @@
}
private String fileNameString(File[] files) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; files != null && i < files.length; i++) {
if (i > 0) {
- buf.append(" ");
+ sb.append(" ");
}
if (files.length > 1) {
- buf.append("\"");
+ sb.append("\"");
}
- buf.append(fileNameString(files[i]));
+ sb.append(fileNameString(files[i]));
if (files.length > 1) {
- buf.append("\"");
+ sb.append("\"");
}
}
- return buf.toString();
+ return sb.toString();
}
/* The following methods are used by the PropertyChange Listener */
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/State.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/State.java Mon Jun 16 13:48:58 2014 -0400
@@ -179,35 +179,35 @@
}
private static String toString(int state) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if ((state & SynthConstants.DEFAULT) == SynthConstants.DEFAULT) {
- buffer.append("Default");
+ sb.append("Default");
}
if ((state & SynthConstants.DISABLED) == SynthConstants.DISABLED) {
- if (buffer.length() > 0) buffer.append("+");
- buffer.append("Disabled");
+ if (sb.length() > 0) sb.append("+");
+ sb.append("Disabled");
}
if ((state & SynthConstants.ENABLED) == SynthConstants.ENABLED) {
- if (buffer.length() > 0) buffer.append("+");
- buffer.append("Enabled");
+ if (sb.length() > 0) sb.append("+");
+ sb.append("Enabled");
}
if ((state & SynthConstants.FOCUSED) == SynthConstants.FOCUSED) {
- if (buffer.length() > 0) buffer.append("+");
- buffer.append("Focused");
+ if (sb.length() > 0) sb.append("+");
+ sb.append("Focused");
}
if ((state & SynthConstants.MOUSE_OVER) == SynthConstants.MOUSE_OVER) {
- if (buffer.length() > 0) buffer.append("+");
- buffer.append("MouseOver");
+ if (sb.length() > 0) sb.append("+");
+ sb.append("MouseOver");
}
if ((state & SynthConstants.PRESSED) == SynthConstants.PRESSED) {
- if (buffer.length() > 0) buffer.append("+");
- buffer.append("Pressed");
+ if (sb.length() > 0) sb.append("+");
+ sb.append("Pressed");
}
if ((state & SynthConstants.SELECTED) == SynthConstants.SELECTED) {
- if (buffer.length() > 0) buffer.append("+");
- buffer.append("Selected");
+ if (sb.length() > 0) sb.append("+");
+ sb.append("Selected");
}
- return buffer.toString();
+ return sb.toString();
}
}
}
--- a/jdk/src/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java Mon Jun 16 13:48:58 2014 -0400
@@ -156,7 +156,7 @@
}
public String toString() {
- StringBuffer text = new StringBuffer(super.toString());
+ StringBuilder text = new StringBuilder(super.toString());
if (_painters != null) {
text.append(",painters=[");
for (int i = 0; i < +_painters.length; i++) {
@@ -208,7 +208,7 @@
}
public String toString() {
- StringBuffer text = new StringBuffer(super.toString());
+ StringBuilder text = new StringBuilder(super.toString());
text.append(",painters=[");
if (_painterInfo != null) {
for (int i = 0; i < +_painterInfo.length; i++) {
--- a/jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java Mon Jun 16 13:48:58 2014 -0400
@@ -1153,23 +1153,23 @@
*/
public String toString() {
int selCount = getSelectionCount();
- StringBuffer retBuffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int[] rows;
if(rowMapper != null)
rows = rowMapper.getRowsForPaths(selection);
else
rows = null;
- retBuffer.append(getClass().getName() + " " + hashCode() + " [ ");
+ sb.append(getClass().getName() + " " + hashCode() + " [ ");
for(int counter = 0; counter < selCount; counter++) {
if(rows != null)
- retBuffer.append(selection[counter].toString() + "@" +
- Integer.toString(rows[counter])+ " ");
+ sb.append(selection[counter].toString() + "@" +
+ Integer.toString(rows[counter])+ " ");
else
- retBuffer.append(selection[counter].toString() + " ");
+ sb.append(selection[counter].toString() + " ");
}
- retBuffer.append("]");
- return retBuffer.toString();
+ sb.append("]");
+ return sb.toString();
}
/**
--- a/jdk/src/share/classes/javax/swing/tree/TreePath.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/javax/swing/tree/TreePath.java Mon Jun 16 13:48:58 2014 -0400
@@ -349,7 +349,7 @@
* @return a String representation of this object
*/
public String toString() {
- StringBuffer tempSpot = new StringBuffer("[");
+ StringBuilder tempSpot = new StringBuilder("[");
for(int counter = 0, maxCounter = getPathCount();counter < maxCounter;
counter++) {
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java Mon Jun 16 13:48:58 2014 -0400
@@ -118,7 +118,7 @@
}
ExcC14NParameterSpec params = (ExcC14NParameterSpec)spec;
- StringBuffer prefixListAttr = new StringBuffer("");
+ StringBuilder prefixListAttr = new StringBuilder("");
@SuppressWarnings("unchecked")
List<String> prefixList = params.getPrefixList();
for (int i = 0, size = prefixList.size(); i < size; i++) {
--- a/jdk/src/share/classes/sun/applet/AppletViewer.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/applet/AppletViewer.java Mon Jun 16 13:48:58 2014 -0400
@@ -1000,15 +1000,15 @@
* Scan identifier
*/
public static String scanIdentifier(Reader in) throws IOException {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while (true) {
if (((c >= 'a') && (c <= 'z')) ||
((c >= 'A') && (c <= 'Z')) ||
((c >= '0') && (c <= '9')) || (c == '_')) {
- buf.append((char)c);
+ sb.append((char) c);
c = in.read();
} else {
- return buf.toString();
+ return sb.toString();
}
}
}
@@ -1031,19 +1031,19 @@
quote = c;
c = in.read();
}
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while ((c > 0) &&
(((quote < 0) && (c != ' ') && (c != '\t') &&
(c != '\n') && (c != '\r') && (c != '>'))
|| ((quote >= 0) && (c != quote)))) {
- buf.append((char)c);
+ sb.append((char) c);
c = in.read();
}
if (c == quote) {
c = in.read();
}
skipSpace(in);
- val = buf.toString();
+ val = sb.toString();
}
//statusMsgStream.println("PUT " + att + " = '" + val + "'");
if (! val.equals("")) {
--- a/jdk/src/share/classes/sun/font/Decoration.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/font/Decoration.java Mon Jun 16 13:48:58 2014 -0400
@@ -428,17 +428,17 @@
public String toString() {
- StringBuffer buf = new StringBuffer();
- buf.append(super.toString());
- buf.append("[");
- if (fgPaint != null) buf.append("fgPaint: " + fgPaint);
- if (bgPaint != null) buf.append(" bgPaint: " + bgPaint);
- if (swapColors) buf.append(" swapColors: true");
- if (strikethrough) buf.append(" strikethrough: true");
- if (stdUnderline != null) buf.append(" stdUnderline: " + stdUnderline);
- if (imUnderline != null) buf.append(" imUnderline: " + imUnderline);
- buf.append("]");
- return buf.toString();
+ StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.append("[");
+ if (fgPaint != null) sb.append("fgPaint: " + fgPaint);
+ if (bgPaint != null) sb.append(" bgPaint: " + bgPaint);
+ if (swapColors) sb.append(" swapColors: true");
+ if (strikethrough) sb.append(" strikethrough: true");
+ if (stdUnderline != null) sb.append(" stdUnderline: " + stdUnderline);
+ if (imUnderline != null) sb.append(" imUnderline: " + imUnderline);
+ sb.append("]");
+ return sb.toString();
}
}
}
--- a/jdk/src/share/classes/sun/font/ExtendedTextSourceLabel.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/font/ExtendedTextSourceLabel.java Mon Jun 16 13:48:58 2014 -0400
@@ -896,31 +896,31 @@
if (true) {
return source.toString(TextSource.WITHOUT_CONTEXT);
}
- StringBuffer buf = new StringBuffer();
- buf.append(super.toString());
- buf.append("[source:");
- buf.append(source.toString(TextSource.WITHOUT_CONTEXT));
- buf.append(", lb:");
- buf.append(lb);
- buf.append(", ab:");
- buf.append(ab);
- buf.append(", vb:");
- buf.append(vb);
- buf.append(", gv:");
- buf.append(gv);
- buf.append(", ci: ");
+ StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.append("[source:");
+ sb.append(source.toString(TextSource.WITHOUT_CONTEXT));
+ sb.append(", lb:");
+ sb.append(lb);
+ sb.append(", ab:");
+ sb.append(ab);
+ sb.append(", vb:");
+ sb.append(vb);
+ sb.append(", gv:");
+ sb.append(gv);
+ sb.append(", ci: ");
if (charinfo == null) {
- buf.append("null");
+ sb.append("null");
} else {
- buf.append(charinfo[0]);
+ sb.append(charinfo[0]);
for (int i = 1; i < charinfo.length;) {
- buf.append(i % numvals == 0 ? "; " : ", ");
- buf.append(charinfo[i]);
+ sb.append(i % numvals == 0 ? "; " : ", ");
+ sb.append(charinfo[i]);
}
}
- buf.append("]");
+ sb.append("]");
- return buf.toString();
+ return sb.toString();
}
//public static ExtendedTextLabel create(TextSource source) {
--- a/jdk/src/share/classes/sun/font/StandardTextSource.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/font/StandardTextSource.java Mon Jun 16 13:48:58 2014 -0400
@@ -210,16 +210,16 @@
}
public String toString(boolean withContext) {
- StringBuffer buf = new StringBuffer(super.toString());
- buf.append("[start:");
- buf.append(start);
- buf.append(", len:" );
- buf.append(len);
- buf.append(", cstart:");
- buf.append(cstart);
- buf.append(", clen:" );
- buf.append(clen);
- buf.append(", chars:\"");
+ StringBuilder sb = new StringBuilder(super.toString());
+ sb.append("[start:");
+ sb.append(start);
+ sb.append(", len:" );
+ sb.append(len);
+ sb.append(", cstart:");
+ sb.append(cstart);
+ sb.append(", clen:" );
+ sb.append(clen);
+ sb.append(", chars:\"");
int chStart, chLimit;
if (withContext == WITH_CONTEXT) {
chStart = cstart;
@@ -231,23 +231,23 @@
}
for (int i = chStart; i < chLimit; ++i) {
if (i > chStart) {
- buf.append(" ");
+ sb.append(" ");
}
- buf.append(Integer.toHexString(chars[i]));
+ sb.append(Integer.toHexString(chars[i]));
}
- buf.append("\"");
- buf.append(", level:");
- buf.append(level);
- buf.append(", flags:");
- buf.append(flags);
- buf.append(", font:");
- buf.append(font);
- buf.append(", frc:");
- buf.append(frc);
- buf.append(", cm:");
- buf.append(cm);
- buf.append("]");
+ sb.append("\"");
+ sb.append(", level:");
+ sb.append(level);
+ sb.append(", flags:");
+ sb.append(flags);
+ sb.append(", font:");
+ sb.append(font);
+ sb.append(", frc:");
+ sb.append(frc);
+ sb.append(", cm:");
+ sb.append(cm);
+ sb.append("]");
- return buf.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/font/Type1Font.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/font/Type1Font.java Mon Jun 16 13:48:58 2014 -0400
@@ -529,7 +529,7 @@
}
private String expandName(String s, boolean tryExpandAbbreviations) {
- StringBuffer res = new StringBuffer(s.length() + 10);
+ StringBuilder res = new StringBuilder(s.length() + 10);
int start=0, end;
while(start < s.length()) {
--- a/jdk/src/share/classes/sun/java2d/opengl/OGLContext.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLContext.java Mon Jun 16 13:48:58 2014 -0400
@@ -201,29 +201,29 @@
@Override
public String toString() {
- StringBuffer buf = new StringBuffer(super.toString());
+ StringBuilder sb = new StringBuilder(super.toString());
if ((caps & CAPS_EXT_FBOBJECT) != 0) {
- buf.append("CAPS_EXT_FBOBJECT|");
+ sb.append("CAPS_EXT_FBOBJECT|");
}
if ((caps & CAPS_STORED_ALPHA) != 0) {
- buf.append("CAPS_STORED_ALPHA|");
+ sb.append("CAPS_STORED_ALPHA|");
}
if ((caps & CAPS_DOUBLEBUFFERED) != 0) {
- buf.append("CAPS_DOUBLEBUFFERED|");
+ sb.append("CAPS_DOUBLEBUFFERED|");
}
if ((caps & CAPS_EXT_LCD_SHADER) != 0) {
- buf.append("CAPS_EXT_LCD_SHADER|");
+ sb.append("CAPS_EXT_LCD_SHADER|");
}
if ((caps & CAPS_EXT_BIOP_SHADER) != 0) {
- buf.append("CAPS_BIOP_SHADER|");
+ sb.append("CAPS_BIOP_SHADER|");
}
if ((caps & CAPS_EXT_GRAD_SHADER) != 0) {
- buf.append("CAPS_EXT_GRAD_SHADER|");
+ sb.append("CAPS_EXT_GRAD_SHADER|");
}
if ((caps & CAPS_EXT_TEXRECT) != 0) {
- buf.append("CAPS_EXT_TEXRECT|");
+ sb.append("CAPS_EXT_TEXRECT|");
}
- return buf.toString();
+ return sb.toString();
}
}
}
--- a/jdk/src/share/classes/sun/java2d/pipe/Region.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/java2d/pipe/Region.java Mon Jun 16 13:48:58 2014 -0400
@@ -1277,7 +1277,7 @@
}
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Region[[");
sb.append(lox);
sb.append(", ");
--- a/jdk/src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java Mon Jun 16 13:48:58 2014 -0400
@@ -93,37 +93,37 @@
@Override
public String toString() {
- StringBuffer buf =
- new StringBuffer("ContextCapabilities: adapter=" +
+ StringBuilder sb =
+ new StringBuilder("ContextCapabilities: adapter=" +
adapterId+", caps=");
if (caps == CAPS_EMPTY) {
- buf.append("CAPS_EMPTY");
+ sb.append("CAPS_EMPTY");
} else {
if ((caps & CAPS_RT_PLAIN_ALPHA) != 0) {
- buf.append("CAPS_RT_PLAIN_ALPHA|");
+ sb.append("CAPS_RT_PLAIN_ALPHA|");
}
if ((caps & CAPS_RT_TEXTURE_ALPHA) != 0) {
- buf.append("CAPS_RT_TEXTURE_ALPHA|");
+ sb.append("CAPS_RT_TEXTURE_ALPHA|");
}
if ((caps & CAPS_RT_TEXTURE_OPAQUE) != 0) {
- buf.append("CAPS_RT_TEXTURE_OPAQUE|");
+ sb.append("CAPS_RT_TEXTURE_OPAQUE|");
}
if ((caps & CAPS_MULTITEXTURE) != 0) {
- buf.append("CAPS_MULTITEXTURE|");
+ sb.append("CAPS_MULTITEXTURE|");
}
if ((caps & CAPS_TEXNONPOW2) != 0) {
- buf.append("CAPS_TEXNONPOW2|");
+ sb.append("CAPS_TEXNONPOW2|");
}
if ((caps & CAPS_TEXNONSQUARE) != 0) {
- buf.append("CAPS_TEXNONSQUARE|");
+ sb.append("CAPS_TEXNONSQUARE|");
}
if ((caps & CAPS_PS20) != 0) {
- buf.append("CAPS_PS20|");
+ sb.append("CAPS_PS20|");
}
if ((caps & CAPS_PS30) != 0) {
- buf.append("CAPS_PS30|");
+ sb.append("CAPS_PS30|");
}
}
- return buf.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/jvmstat/monitor/HostIdentifier.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/jvmstat/monitor/HostIdentifier.java Mon Jun 16 13:48:58 2014 -0400
@@ -358,7 +358,7 @@
URI nuri = null;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(scheme).append("://");
--- a/jdk/src/share/classes/sun/jvmstat/monitor/MonitoredHost.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/jvmstat/monitor/MonitoredHost.java Mon Jun 16 13:48:58 2014 -0400
@@ -257,7 +257,7 @@
throws MonitorException {
String hostname = hostId.getHost();
String scheme = hostId.getScheme();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
assert hostname != null;
--- a/jdk/src/share/classes/sun/jvmstat/monitor/VmIdentifier.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/jvmstat/monitor/VmIdentifier.java Mon Jun 16 13:48:58 2014 -0400
@@ -255,7 +255,7 @@
* a MonitorException in a future version.
*/
public HostIdentifier getHostIdentifier() throws URISyntaxException {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (getScheme() != null) {
sb.append(getScheme()).append(":");
}
--- a/jdk/src/share/classes/sun/management/Agent.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/management/Agent.java Mon Jun 16 13:48:58 2014 -0400
@@ -401,7 +401,7 @@
if (home == null) {
throw new Error("Can't find java.home ??");
}
- StringBuffer defaultFileName = new StringBuffer(home);
+ StringBuilder defaultFileName = new StringBuilder(home);
defaultFileName.append(File.separator).append("lib");
defaultFileName.append(File.separator).append("management");
defaultFileName.append(File.separator).append("management.properties");
@@ -495,7 +495,7 @@
if (params == null || params.length == 0) {
error(key);
} else {
- StringBuffer message = new StringBuffer(params[0]);
+ StringBuilder message = new StringBuilder(params[0]);
for (int i = 1; i < params.length; i++) {
message.append(" " + params[i]);
}
--- a/jdk/src/share/classes/sun/management/manifest Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Premain-Class: sun.management.Agent
-Agent-Class: sun.management.Agent
-
--- a/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -311,19 +311,19 @@
StackTraceElement[] stackTrace = info.getStackTrace();
//We append the stack trace in a buffer
// XXX Revisit: should check isDebugOn()
- StringBuffer b = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
final int stackSize = stackTrace.length;
log.debug("getJvmThreadInstStackTrace", "Stack size : " + stackSize);
for(int i = 0; i < stackSize; i++) {
log.debug("getJvmThreadInstStackTrace", "Append " +
stackTrace[i].toString());
- b.append(stackTrace[i].toString());
+ sb.append(stackTrace[i].toString());
//Append \n at the end of each line except the last one
if(i < stackSize)
- b.append("\n");
+ sb.append("\n");
}
//The stack trace is truncated if its size exceeds 255.
- return validPathElementTC(b.toString());
+ return validPathElementTC(sb.toString());
}
static final MibLogger log =
new MibLogger(JvmThreadInstanceEntryImpl.class);
--- a/jdk/src/share/classes/sun/misc/MessageUtils.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/misc/MessageUtils.java Mon Jun 16 13:48:58 2014 -0400
@@ -55,7 +55,7 @@
}
public static String subst(String patt, String args[]) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
int len = patt.length();
for (int i = 0; i >= 0 && i < len; i++) {
char ch = patt.charAt(i);
--- a/jdk/src/share/classes/sun/misc/UUDecoder.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/misc/UUDecoder.java Mon Jun 16 13:48:58 2014 -0400
@@ -123,7 +123,7 @@
throws IOException {
int i, c1, c2, c3, c4;
int a, b, c;
- StringBuffer x = new StringBuffer();
+ StringBuilder x = new StringBuilder();
for (i = 0; i < 4; i++) {
c1 = inStream.read();
@@ -152,7 +152,7 @@
*/
protected void decodeBufferPrefix(PushbackInputStream inStream, OutputStream outStream) throws IOException {
int c;
- StringBuffer q = new StringBuffer(32);
+ StringBuilder q = new StringBuilder(32);
String r;
boolean sawNewLine;
--- a/jdk/src/share/classes/sun/net/TransferProtocolClient.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/net/TransferProtocolClient.java Mon Jun 16 13:48:58 2014 -0400
@@ -53,7 +53,7 @@
* number. Returns -1 on failure.
*/
public int readServerResponse() throws IOException {
- StringBuffer replyBuf = new StringBuffer(32);
+ StringBuilder replyBuf = new StringBuilder(32);
int c;
int continuingCode = -1;
int code;
--- a/jdk/src/share/classes/sun/net/ftp/impl/FtpClient.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/net/ftp/impl/FtpClient.java Mon Jun 16 13:48:58 2014 -0400
@@ -408,7 +408,7 @@
* number. Returns -1 on failure.
*/
private int readServerResponse() throws IOException {
- StringBuffer replyBuf = new StringBuffer(32);
+ StringBuilder replyBuf = new StringBuilder(32);
int c;
int continuingCode = -1;
int code;
@@ -1050,7 +1050,7 @@
// keep the welcome message around so we can
// put it in the resulting HTML page.
String l;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < serverResponse.size(); i++) {
l = serverResponse.elementAt(i);
if (l != null) {
@@ -1095,7 +1095,7 @@
// keep the welcome message around so we can
// put it in the resulting HTML page.
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (serverResponse != null) {
for (String l : serverResponse) {
if (l != null) {
@@ -1493,7 +1493,7 @@
* So we need to remove the 1st and last line
*/
Vector<String> resp = getResponseStrings();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 1; i < resp.size() - 1; i++) {
sb.append(resp.get(i));
}
@@ -1985,7 +1985,7 @@
* by the server.
*/
public String getLastResponseString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (serverResponse != null) {
for (String l : serverResponse) {
if (l != null) {
@@ -2188,7 +2188,7 @@
}
// on multiple lines answers, like the ones above, remove 1st and last
// line, concat the the others.
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 1; i < resp.size() - 1; i++) {
sb.append(resp.get(i).substring(3));
}
--- a/jdk/src/share/classes/sun/net/www/MimeEntry.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/net/www/MimeEntry.java Mon Jun 16 13:48:58 2014 -0400
@@ -281,52 +281,52 @@
}
public synchronized String toProperty() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
String separator = "; ";
boolean needSeparator = false;
int action = getAction();
if (action != MimeEntry.UNKNOWN) {
- buf.append("action=" + actionKeywords[action]);
+ sb.append("action=" + actionKeywords[action]);
needSeparator = true;
}
String command = getLaunchString();
if (command != null && command.length() > 0) {
if (needSeparator) {
- buf.append(separator);
+ sb.append(separator);
}
- buf.append("application=" + command);
+ sb.append("application=" + command);
needSeparator = true;
}
if (getImageFileName() != null) {
if (needSeparator) {
- buf.append(separator);
+ sb.append(separator);
}
- buf.append("icon=" + getImageFileName());
+ sb.append("icon=" + getImageFileName());
needSeparator = true;
}
String extensions = getExtensionsAsList();
if (extensions.length() > 0) {
if (needSeparator) {
- buf.append(separator);
+ sb.append(separator);
}
- buf.append("file_extensions=" + extensions);
+ sb.append("file_extensions=" + extensions);
needSeparator = true;
}
String description = getDescription();
if (description != null && !description.equals(getType())) {
if (needSeparator) {
- buf.append(separator);
+ sb.append(separator);
}
- buf.append("description=" + description);
+ sb.append("description=" + description);
}
- return buf.toString();
+ return sb.toString();
}
public String toString() {
--- a/jdk/src/share/classes/sun/net/www/http/HttpClient.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/net/www/http/HttpClient.java Mon Jun 16 13:48:58 2014 -0400
@@ -558,7 +558,7 @@
// Do not use URLStreamHandler.toExternalForm as the fragment
// should not be part of the RequestURI. It should be an
// absolute URI which does not have a fragment part.
- StringBuffer result = new StringBuffer(128);
+ StringBuilder result = new StringBuilder(128);
result.append(url.getProtocol());
result.append(":");
if (url.getAuthority() != null && url.getAuthority().length() > 0) {
--- a/jdk/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java Mon Jun 16 13:48:58 2014 -0400
@@ -191,7 +191,7 @@
if (isDirectory) {
FileNameMap map = java.net.URLConnection.getFileNameMap();
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (files == null) {
throw new FileNotFoundException(filename);
@@ -201,11 +201,11 @@
for (int i = 0 ; i < files.size() ; i++) {
String fileName = files.get(i);
- buf.append(fileName);
- buf.append("\n");
+ sb.append(fileName);
+ sb.append("\n");
}
// Put it into a (default) locale-specific byte-stream.
- is = new ByteArrayInputStream(buf.toString().getBytes());
+ is = new ByteArrayInputStream(sb.toString().getBytes());
} else {
throw new FileNotFoundException(filename);
}
--- a/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java Mon Jun 16 13:48:58 2014 -0400
@@ -532,7 +532,7 @@
}
byte[] digest = md.digest();
- StringBuffer res = new StringBuffer(digest.length * 2);
+ StringBuilder res = new StringBuilder(digest.length * 2);
for (int i = 0; i < digest.length; i++) {
int hashchar = ((digest[i] >>> 4) & 0xf);
res.append(charArray[hashchar]);
--- a/jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -382,7 +382,7 @@
}
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(this.getClass().getName());
sb.append('[');
if (!isOpen()) {
--- a/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -983,7 +983,7 @@
@Override
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(this.getClass().getSuperclass().getName());
sb.append('[');
if (!isOpen())
--- a/jdk/src/share/classes/sun/print/PSPrinterJob.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/print/PSPrinterJob.java Mon Jun 16 13:48:58 2014 -0400
@@ -1269,7 +1269,7 @@
CharsetString cs = acs[i];
CharsetEncoder fontCS = cs.fontDescriptor.encoder;
- StringBuffer nativeStr = new StringBuffer();
+ StringBuilder nativeStr = new StringBuilder();
byte[] strSeg = new byte[cs.length * 2];
int len = 0;
try {
--- a/jdk/src/share/classes/sun/reflect/MethodAccessorGenerator.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/reflect/MethodAccessorGenerator.java Mon Jun 16 13:48:58 2014 -0400
@@ -751,14 +751,14 @@
}
private String buildInternalSignature() {
- StringBuffer buf = new StringBuffer();
- buf.append("(");
+ StringBuilder sb = new StringBuilder();
+ sb.append("(");
for (int i = 0; i < parameterTypes.length; i++) {
- buf.append(getClassName(parameterTypes[i], true));
+ sb.append(getClassName(parameterTypes[i], true));
}
- buf.append(")");
- buf.append(getClassName(returnType, true));
- return buf.toString();
+ sb.append(")");
+ sb.append(getClassName(returnType, true));
+ return sb.toString();
}
private static synchronized String generateName(boolean isConstructor,
--- a/jdk/src/share/classes/sun/rmi/server/Activation.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/rmi/server/Activation.java Mon Jun 16 13:48:58 2014 -0400
@@ -1239,7 +1239,7 @@
checkArgs(desc, argv);
if (debugExec) {
- StringBuffer sb = new StringBuffer(argv[0]);
+ StringBuilder sb = new StringBuilder(argv[0]);
int j;
for (j = 1; j < argv.length; j++) {
sb.append(' ');
--- a/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Mon Jun 16 13:48:58 2014 -0400
@@ -793,7 +793,7 @@
} else if (urls.length == 1) {
return urls[0].toExternalForm();
} else {
- StringBuffer path = new StringBuffer(urls[0].toExternalForm());
+ StringBuilder path = new StringBuilder(urls[0].toExternalForm());
for (int i = 1; i < urls.length; i++) {
path.append(' ');
path.append(urls[i].toExternalForm());
--- a/jdk/src/share/classes/sun/rmi/server/Util.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/rmi/server/Util.java Mon Jun 16 13:48:58 2014 -0400
@@ -391,7 +391,7 @@
* the definition of a "method descriptor".
*/
private static String getMethodNameAndDescriptor(Method m) {
- StringBuffer desc = new StringBuffer(m.getName());
+ StringBuilder desc = new StringBuilder(m.getName());
desc.append('(');
Class<?>[] paramTypes = m.getParameterTypes();
for (int i = 0; i < paramTypes.length; i++) {
--- a/jdk/src/share/classes/sun/security/acl/AclImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/acl/AclImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -253,7 +253,7 @@
* ACL.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Enumeration<AclEntry> entries = entries();
while (entries.hasMoreElements()) {
AclEntry entry = entries.nextElement();
--- a/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -636,29 +636,29 @@
}
GSSCredentialSpi element = null;
- StringBuffer buffer = new StringBuffer("[GSSCredential: ");
+ StringBuilder sb = new StringBuilder("[GSSCredential: ");
Object[] elements = hashtable.entrySet().toArray();
for (int i = 0; i < elements.length; i++) {
try {
- buffer.append('\n');
+ sb.append('\n');
element = (GSSCredentialSpi)
((Map.Entry)elements[i]).getValue();
- buffer.append(element.getName());
- buffer.append(' ');
- buffer.append(element.getMechanism());
- buffer.append(element.isInitiatorCredential() ?
- " Initiate" : "");
- buffer.append(element.isAcceptorCredential() ?
- " Accept" : "");
- buffer.append(" [");
- buffer.append(element.getClass());
- buffer.append(']');
+ sb.append(element.getName());
+ sb.append(' ');
+ sb.append(element.getMechanism());
+ sb.append(element.isInitiatorCredential() ?
+ " Initiate" : "");
+ sb.append(element.isAcceptorCredential() ?
+ " Accept" : "");
+ sb.append(" [");
+ sb.append(element.getClass());
+ sb.append(']');
} catch (GSSException e) {
// skip to next element
}
}
- buffer.append(']');
- return buffer.toString();
+ sb.append(']');
+ return sb.toString();
}
static class SearchKey {
--- a/jdk/src/share/classes/sun/security/jgss/GSSHeader.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/jgss/GSSHeader.java Mon Jun 16 13:48:58 2014 -0400
@@ -327,7 +327,7 @@
private String getHexBytes(byte[] bytes, int len)
throws IOException {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < len; i++) {
int b1 = (bytes[i]>>4) & 0x0f;
--- a/jdk/src/share/classes/sun/security/jgss/GSSToken.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/jgss/GSSToken.java Mon Jun 16 13:48:58 2014 -0400
@@ -216,7 +216,7 @@
}
public static final String getHexBytes(byte[] bytes, int pos, int len) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = pos; i < (pos+len); i++) {
int b1 = (bytes[i]>>4) & 0x0f;
int b2 = bytes[i] & 0x0f;
--- a/jdk/src/share/classes/sun/security/jgss/ProviderList.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/jgss/ProviderList.java Mon Jun 16 13:48:58 2014 -0400
@@ -536,12 +536,12 @@
// For debugging
public String toString() {
- StringBuffer buf = new StringBuffer("<");
- buf.append(p.getName());
- buf.append(", ");
- buf.append(oid);
- buf.append(">");
- return buf.toString();
+ StringBuilder sb = new StringBuilder("<");
+ sb.append(p.getName());
+ sb.append(", ");
+ sb.append(oid);
+ sb.append(">");
+ return sb.toString();
}
}
}
--- a/jdk/src/share/classes/sun/security/jgss/TokenTracker.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/jgss/TokenTracker.java Mon Jun 16 13:48:58 2014 -0400
@@ -336,19 +336,19 @@
}
public String toString() {
- StringBuffer buf = new StringBuffer("TokenTracker: ");
- buf.append(" initNumber=").append(initNumber);
- buf.append(" windowStart=").append(windowStart);
- buf.append(" expectedNumber=").append(expectedNumber);
- buf.append(" windowStartIndex=").append(windowStartIndex);
- buf.append("\n\tIntervals are: {");
+ StringBuilder sb = new StringBuilder("TokenTracker: ");
+ sb.append(" initNumber=").append(initNumber);
+ sb.append(" windowStart=").append(windowStart);
+ sb.append(" expectedNumber=").append(expectedNumber);
+ sb.append(" windowStartIndex=").append(windowStartIndex);
+ sb.append("\n\tIntervals are: {");
for (int i = 0; i < list.size(); i++) {
if (i != 0)
- buf.append(", ");
- buf.append(list.get(i).toString());
+ sb.append(", ");
+ sb.append(list.get(i).toString());
}
- buf.append('}');
- return buf.toString();
+ sb.append('}');
+ return sb.toString();
}
/**
--- a/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Mon Jun 16 13:48:58 2014 -0400
@@ -164,15 +164,15 @@
serviceTicket.getServer();
// Cannot use '\"' instead of "\"" in constructor because
// it is interpreted as suggested length!
- StringBuffer buf = new StringBuffer("\"");
- buf.append(delegateTo.getName()).append('\"');
+ StringBuilder sb = new StringBuilder("\"");
+ sb.append(delegateTo.getName()).append('\"');
String realm = delegateTo.getRealmAsString();
- buf.append(" \"krbtgt/").append(realm).append('@');
- buf.append(realm).append('\"');
+ sb.append(" \"krbtgt/").append(realm).append('@');
+ sb.append(realm).append('\"');
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
DelegationPermission perm =
- new DelegationPermission(buf.toString());
+ new DelegationPermission(sb.toString());
sm.checkPermission(perm);
}
--- a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java Mon Jun 16 13:48:58 2014 -0400
@@ -1345,7 +1345,7 @@
private static String getHexBytes(byte[] bytes, int pos, int len) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < len; i++) {
int b1 = (bytes[i]>>4) & 0x0f;
--- a/jdk/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java Mon Jun 16 13:48:58 2014 -0400
@@ -41,9 +41,9 @@
String krbPrinc = name.getKrbName();
int atIndex = krbPrinc.indexOf('@');
String realm = krbPrinc.substring(atIndex + 1);
- StringBuffer buf = new StringBuffer("krbtgt/");
- buf.append(realm).append('@').append(realm);
- return buf.toString();
+ StringBuilder sb = new StringBuilder("krbtgt/");
+ sb.append(realm).append('@').append(realm);
+ return sb.toString();
}
// Perform the Service Permission check using the specified
--- a/jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java Mon Jun 16 13:48:58 2014 -0400
@@ -139,10 +139,10 @@
if (sm != null) {
String targetStr = targetName.getKrbName();
String tgsStr = Krb5Util.getTGSName(targetName);
- StringBuffer buf = new StringBuffer("\"");
- buf.append(targetStr).append("\" \"");
- buf.append(tgsStr).append('\"');
- String krbPrincPair = buf.toString();
+ StringBuilder sb = new StringBuilder("\"");
+ sb.append(targetStr).append("\" \"");
+ sb.append(tgsStr).append('\"');
+ String krbPrincPair = sb.toString();
SunNativeProvider.debug("Checking DelegationPermission (" +
krbPrincPair + ")");
DelegationPermission perm =
--- a/jdk/src/share/classes/sun/security/krb5/Credentials.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/krb5/Credentials.java Mon Jun 16 13:48:58 2014 -0400
@@ -510,21 +510,21 @@
}
public String toString() {
- StringBuffer buffer = new StringBuffer("Credentials:");
- buffer.append( "\n client=").append(client);
- buffer.append( "\n server=").append(server);
+ StringBuilder sb = new StringBuilder("Credentials:");
+ sb.append( "\n client=").append(client);
+ sb.append( "\n server=").append(server);
if (authTime != null) {
- buffer.append("\n authTime=").append(authTime);
+ sb.append("\n authTime=").append(authTime);
}
if (startTime != null) {
- buffer.append("\n startTime=").append(startTime);
+ sb.append("\n startTime=").append(startTime);
}
- buffer.append( "\n endTime=").append(endTime);
- buffer.append( "\n renewTill=").append(renewTill);
- buffer.append( "\n flags=").append(flags);
- buffer.append( "\nEType (skey)=").append(key.getEType());
- buffer.append( "\n (tkt key)=").append(ticket.encPart.eType);
- return buffer.toString();
+ sb.append( "\n endTime=").append(endTime);
+ sb.append( "\n renewTill=").append(renewTill);
+ sb.append( "\n flags=").append(flags);
+ sb.append( "\nEType (skey)=").append(key.getEType());
+ sb.append( "\n (tkt key)=").append(ticket.encPart.eType);
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/krb5/KrbException.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/krb5/KrbException.java Mon Jun 16 13:48:58 2014 -0400
@@ -96,7 +96,7 @@
public String krbErrorMessage() {
- StringBuffer strbuf = new StringBuffer("krb_error " + returnCode);
+ StringBuilder strbuf = new StringBuilder("krb_error " + returnCode);
String msg = getMessage();
if (msg != null) {
strbuf.append(" ");
@@ -112,7 +112,7 @@
* If the error code is 0 then the first half is skipped.
*/
public String getMessage() {
- StringBuffer message = new StringBuffer();
+ StringBuilder message = new StringBuilder();
int returnCode = returnCode();
if (returnCode != 0) {
message.append(returnCodeMessage());
--- a/jdk/src/share/classes/sun/security/krb5/PrincipalName.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/krb5/PrincipalName.java Mon Jun 16 13:48:58 2014 -0400
@@ -480,7 +480,7 @@
}
public String getPrincipalNameAsString() {
- StringBuffer temp = new StringBuffer(nameStrings[0]);
+ StringBuilder temp = new StringBuilder(nameStrings[0]);
for (int i = 1; i < nameStrings.length; i++)
temp.append(nameStrings[i]);
return temp.toString();
@@ -521,7 +521,7 @@
public String getSalt() {
if (salt == null) {
- StringBuffer salt = new StringBuffer();
+ StringBuilder salt = new StringBuilder();
salt.append(nameRealm.toString());
for (int i = 0; i < nameStrings.length; i++) {
salt.append(nameStrings[i]);
@@ -532,7 +532,7 @@
}
public String toString() {
- StringBuffer str = new StringBuffer();
+ StringBuilder str = new StringBuilder();
for (int i = 0; i < nameStrings.length; i++) {
if (i > 0)
str.append("/");
@@ -544,7 +544,7 @@
}
public String getNameString() {
- StringBuffer str = new StringBuffer();
+ StringBuilder str = new StringBuilder();
for (int i = 0; i < nameStrings.length; i++) {
if (i > 0)
str.append("/");
--- a/jdk/src/share/classes/sun/security/krb5/internal/EncTicketPart.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/krb5/internal/EncTicketPart.java Mon Jun 16 13:48:58 2014 -0400
@@ -117,7 +117,7 @@
private static String getHexBytes(byte[] bytes, int len)
throws IOException {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < len; i++) {
int b1 = (bytes[i] >> 4) & 0x0f;
--- a/jdk/src/share/classes/sun/security/krb5/internal/TicketFlags.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/krb5/internal/TicketFlags.java Mon Jun 16 13:48:58 2014 -0400
@@ -137,7 +137,7 @@
* Returns the string representative of ticket flags.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
boolean[] flags = toBooleanArray();
for (int i = 0; i < flags.length; i++) {
if (flags[i] == true) {
--- a/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java Mon Jun 16 13:48:58 2014 -0400
@@ -269,7 +269,7 @@
}
int len = list.size();
if (len <= 0) {
- StringBuffer keystr = new StringBuffer();
+ StringBuilder keystr = new StringBuilder();
for (int i = 0; i < keys.length; i++) {
keystr.append(toString(keys[i].getEType()));
keystr.append(" ");
--- a/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java Mon Jun 16 13:48:58 2014 -0400
@@ -636,7 +636,7 @@
// Routines used for debugging
static String bytesToString(byte[] digest) {
// Get character representation of digest
- StringBuffer digestString = new StringBuffer();
+ StringBuilder digestString = new StringBuilder();
for (int i = 0; i < digest.length; i++) {
if ((digest[i] & 0x000000ff) < 0x10) {
--- a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java Mon Jun 16 13:48:58 2014 -0400
@@ -73,7 +73,7 @@
}
public String getKeyString() {
- StringBuffer sb = new StringBuffer("0x");
+ StringBuilder sb = new StringBuilder("0x");
for (int i = 0; i < keyblock.length; i++) {
sb.append(String.format("%02x", keyblock[i]&0xff));
}
--- a/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java Mon Jun 16 13:48:58 2014 -0400
@@ -790,26 +790,26 @@
* Returns a string representation of this attribute.
*/
public String toString() {
- StringBuffer buf = new StringBuffer(100);
+ StringBuilder sb = new StringBuilder(100);
- buf.append("[");
+ sb.append("[");
if (index == -1) {
- buf.append(oid.toString());
+ sb.append(oid.toString());
} else {
- buf.append(OID_NAME_TABLE.get(PKCS9_OIDS[index]));
+ sb.append(OID_NAME_TABLE.get(PKCS9_OIDS[index]));
}
- buf.append(": ");
+ sb.append(": ");
if (index == -1 || SINGLE_VALUED[index]) {
if (value instanceof byte[]) { // special case for octet string
HexDumpEncoder hexDump = new HexDumpEncoder();
- buf.append(hexDump.encodeBuffer((byte[]) value));
+ sb.append(hexDump.encodeBuffer((byte[]) value));
} else {
- buf.append(value.toString());
+ sb.append(value.toString());
}
- buf.append("]");
- return buf.toString();
+ sb.append("]");
+ return sb.toString();
} else { // multi-valued
boolean first = true;
Object[] values = (Object[]) value;
@@ -818,11 +818,11 @@
if (first)
first = false;
else
- buf.append(", ");
+ sb.append(", ");
- buf.append(values[j].toString());
+ sb.append(values[j].toString());
}
- return buf.toString();
+ return sb.toString();
}
}
@@ -857,7 +857,7 @@
private void throwTagException(Byte tag)
throws IOException {
Byte[] expectedTags = PKCS9_VALUE_TAGS[index];
- StringBuffer msg = new StringBuffer(100);
+ StringBuilder msg = new StringBuilder(100);
msg.append("Value of attribute ");
msg.append(oid.toString());
msg.append(" (");
--- a/jdk/src/share/classes/sun/security/pkcs/PKCS9Attributes.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs/PKCS9Attributes.java Mon Jun 16 13:48:58 2014 -0400
@@ -323,8 +323,8 @@
* Returns the PKCS9 block in a printable string form.
*/
public String toString() {
- StringBuffer buf = new StringBuffer(200);
- buf.append("PKCS9 Attributes: [\n\t");
+ StringBuilder sb = new StringBuilder(200);
+ sb.append("PKCS9 Attributes: [\n\t");
ObjectIdentifier oid;
PKCS9Attribute value;
@@ -339,14 +339,14 @@
if (first)
first = false;
else
- buf.append(";\n\t");
+ sb.append(";\n\t");
- buf.append(value.toString());
+ sb.append(value.toString());
}
- buf.append("\n\t] (end PKCS9 Attributes)");
+ sb.append("\n\t] (end PKCS9 Attributes)");
- return buf.toString();
+ return sb.toString();
}
/**
--- a/jdk/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java Mon Jun 16 13:48:58 2014 -0400
@@ -92,15 +92,15 @@
}
public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("[\n");
+ StringBuilder sb = new StringBuilder();
+ sb.append("[\n");
for (int i = 0; i < certId.length; i++) {
- buffer.append(certId[i].toString());
+ sb.append(certId[i].toString());
}
// format policies as a string
- buffer.append("\n]");
+ sb.append("\n]");
- return buffer.toString();
+ return sb.toString();
}
public void parse(byte[] bytes) throws IOException {
@@ -151,17 +151,17 @@
}
public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("[\n\tCertificate hash (SHA-1):\n");
+ StringBuilder sb = new StringBuilder();
+ sb.append("[\n\tCertificate hash (SHA-1):\n");
if (hexDumper == null) {
hexDumper = new HexDumpEncoder();
}
- buffer.append(hexDumper.encode(certHash));
+ sb.append(hexDumper.encode(certHash));
if (issuer != null && serialNumber != null) {
- buffer.append("\n\tIssuer: " + issuer + "\n");
- buffer.append("\t" + serialNumber);
+ sb.append("\n\tIssuer: " + issuer + "\n");
+ sb.append("\t" + serialNumber);
}
- buffer.append("\n]");
- return buffer.toString();
+ sb.append("\n]");
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java Mon Jun 16 13:48:58 2014 -0400
@@ -50,17 +50,17 @@
}
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("ulCounterBits: ");
- buffer.append(ulCounterBits);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("ulCounterBits: ");
+ sb.append(ulCounterBits);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("cb: ");
- buffer.append(Functions.toHexString(cb));
+ sb.append(Constants.INDENT);
+ sb.append("cb: ");
+ sb.append(Functions.toHexString(cb));
- return buffer.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java Mon Jun 16 13:48:58 2014 -0400
@@ -122,16 +122,16 @@
* @return the string representation of CK_DATE
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(new String(day));
- buffer.append('.');
- buffer.append(new String(month));
- buffer.append('.');
- buffer.append(new String(year));
- buffer.append(" (DD.MM.YYYY)");
+ sb.append(new String(day));
+ sb.append('.');
+ sb.append(new String(month));
+ sb.append('.');
+ sb.append(new String(year));
+ sb.append(" (DD.MM.YYYY)");
- return buffer.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java Mon Jun 16 13:48:58 2014 -0400
@@ -105,34 +105,34 @@
* @return the string representation of CK_PKCS5_PBKD2_PARAMS
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("kdf: 0x");
- buffer.append(Functions.toFullHexString(kdf));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("kdf: 0x");
+ sb.append(Functions.toFullHexString(kdf));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pSharedDataLen: ");
- buffer.append(pSharedData.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pSharedDataLen: ");
+ sb.append(pSharedData.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pSharedData: ");
- buffer.append(Functions.toHexString(pSharedData));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pSharedData: ");
+ sb.append(Functions.toHexString(pSharedData));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicDataLen: ");
- buffer.append(pPublicData.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pPublicDataLen: ");
+ sb.append(pPublicData.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicData: ");
- buffer.append(Functions.toHexString(pPublicData));
+ sb.append(Constants.INDENT);
+ sb.append("pPublicData: ");
+ sb.append(Functions.toHexString(pPublicData));
//buffer.append(Constants.NEWLINE);
- return buffer.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java Mon Jun 16 13:48:58 2014 -0400
@@ -128,54 +128,54 @@
* @return the string representation of CK_PKCS5_PBKD2_PARAMS
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("kdf: 0x");
- buffer.append(Functions.toFullHexString(kdf));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("kdf: 0x");
+ sb.append(Functions.toFullHexString(kdf));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pSharedDataLen: ");
- buffer.append(pSharedData.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pSharedDataLen: ");
+ sb.append(pSharedData.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pSharedData: ");
- buffer.append(Functions.toHexString(pSharedData));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pSharedData: ");
+ sb.append(Functions.toHexString(pSharedData));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicDataLen: ");
- buffer.append(pPublicData.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pPublicDataLen: ");
+ sb.append(pPublicData.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicData: ");
- buffer.append(Functions.toHexString(pPublicData));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pPublicData: ");
+ sb.append(Functions.toHexString(pPublicData));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulPrivateDataLen: ");
- buffer.append(ulPrivateDataLen);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("ulPrivateDataLen: ");
+ sb.append(ulPrivateDataLen);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("hPrivateData: ");
- buffer.append(hPrivateData);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("hPrivateData: ");
+ sb.append(hPrivateData);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicDataLen2: ");
- buffer.append(pPublicData2.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pPublicDataLen2: ");
+ sb.append(pPublicData2.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicData2: ");
- buffer.append(Functions.toHexString(pPublicData2));
+ sb.append(Constants.INDENT);
+ sb.append("pPublicData2: ");
+ sb.append(Functions.toHexString(pPublicData2));
//buffer.append(Constants.NEWLINE);
- return buffer.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java Mon Jun 16 13:48:58 2014 -0400
@@ -131,34 +131,34 @@
* @return the string representation of CK_INFO
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("cryptokiVersion: ");
- buffer.append(cryptokiVersion.toString());
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("cryptokiVersion: ");
+ sb.append(cryptokiVersion.toString());
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("manufacturerID: ");
- buffer.append(new String(manufacturerID));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("manufacturerID: ");
+ sb.append(new String(manufacturerID));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("flags: ");
- buffer.append(Functions.toBinaryString(flags));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("flags: ");
+ sb.append(Functions.toBinaryString(flags));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("libraryDescription: ");
- buffer.append(new String(libraryDescription));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("libraryDescription: ");
+ sb.append(new String(libraryDescription));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("libraryVersion: ");
- buffer.append(libraryVersion.toString());
+ sb.append(Constants.INDENT);
+ sb.append("libraryVersion: ");
+ sb.append(libraryVersion.toString());
//buffer.append(Constants.NEWLINE);
- return buffer.toString() ;
+ return sb.toString() ;
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java Mon Jun 16 13:48:58 2014 -0400
@@ -143,24 +143,24 @@
* @return the string representation of CK_MECHANISM
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("mechanism: ");
- buffer.append(mechanism);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("mechanism: ");
+ sb.append(mechanism);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pParameter: ");
- buffer.append(pParameter.toString());
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pParameter: ");
+ sb.append(pParameter.toString());
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulParameterLen: ??");
+ sb.append(Constants.INDENT);
+ sb.append("ulParameterLen: ??");
//buffer.append(pParameter.length);
//buffer.append(Constants.NEWLINE);
- return buffer.toString() ;
+ return sb.toString() ;
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java Mon Jun 16 13:48:58 2014 -0400
@@ -103,25 +103,25 @@
* @return the string representation of CK_MECHANISM_INFO
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("ulMinKeySize: ");
- buffer.append(String.valueOf(ulMinKeySize));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("ulMinKeySize: ");
+ sb.append(String.valueOf(ulMinKeySize));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulMaxKeySize: ");
- buffer.append(String.valueOf(ulMaxKeySize));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("ulMaxKeySize: ");
+ sb.append(String.valueOf(ulMaxKeySize));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("flags: ");
- buffer.append(String.valueOf(flags));
- buffer.append(" = ");
- buffer.append(Functions.mechanismInfoFlagsToString(flags));
+ sb.append(Constants.INDENT);
+ sb.append("flags: ");
+ sb.append(String.valueOf(flags));
+ sb.append(" = ");
+ sb.append(Functions.mechanismInfoFlagsToString(flags));
//buffer.append(Constants.NEWLINE);
- return buffer.toString() ;
+ return sb.toString() ;
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java Mon Jun 16 13:48:58 2014 -0400
@@ -109,39 +109,39 @@
* @return the string representation of CK_PBE_PARAMS
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("pInitVector: ");
- buffer.append(pInitVector);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pInitVector: ");
+ sb.append(pInitVector);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulPasswordLen: ");
- buffer.append(pPassword.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("ulPasswordLen: ");
+ sb.append(pPassword.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPassword: ");
- buffer.append(pPassword);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pPassword: ");
+ sb.append(pPassword);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulSaltLen: ");
- buffer.append(pSalt.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("ulSaltLen: ");
+ sb.append(pSalt.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pSalt: ");
- buffer.append(pSalt);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pSalt: ");
+ sb.append(pSalt);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulIteration: ");
- buffer.append(ulIteration);
+ sb.append(Constants.INDENT);
+ sb.append("ulIteration: ");
+ sb.append(ulIteration);
//buffer.append(Constants.NEWLINE);
- return buffer.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java Mon Jun 16 13:48:58 2014 -0400
@@ -118,44 +118,44 @@
* @return the string representation of CK_PKCS5_PBKD2_PARAMS
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("saltSource: ");
- buffer.append(saltSource);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("saltSource: ");
+ sb.append(saltSource);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pSaltSourceData: ");
- buffer.append(Functions.toHexString(pSaltSourceData));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pSaltSourceData: ");
+ sb.append(Functions.toHexString(pSaltSourceData));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulSaltSourceDataLen: ");
- buffer.append(pSaltSourceData.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("ulSaltSourceDataLen: ");
+ sb.append(pSaltSourceData.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("iterations: ");
- buffer.append(iterations);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("iterations: ");
+ sb.append(iterations);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("prf: ");
- buffer.append(prf);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("prf: ");
+ sb.append(prf);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPrfData: ");
- buffer.append(Functions.toHexString(pPrfData));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pPrfData: ");
+ sb.append(Functions.toHexString(pPrfData));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulPrfDataLen: ");
- buffer.append(pPrfData.length);
+ sb.append(Constants.INDENT);
+ sb.append("ulPrfDataLen: ");
+ sb.append(pPrfData.length);
//buffer.append(Constants.NEWLINE);
- return buffer.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java Mon Jun 16 13:48:58 2014 -0400
@@ -110,34 +110,34 @@
* @return the string representation of CK_RSA_PKCS_OAEP_PARAMS
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("hashAlg: ");
- buffer.append(hashAlg);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("hashAlg: ");
+ sb.append(hashAlg);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("mgf: ");
- buffer.append(mgf);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("mgf: ");
+ sb.append(mgf);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("source: ");
- buffer.append(source);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("source: ");
+ sb.append(source);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pSourceData: ");
- buffer.append(pSourceData.toString());
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pSourceData: ");
+ sb.append(pSourceData.toString());
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pSourceDataLen: ");
- buffer.append(Functions.toHexString(pSourceData));
+ sb.append(Constants.INDENT);
+ sb.append("pSourceDataLen: ");
+ sb.append(Functions.toHexString(pSourceData));
//buffer.append(Constants.NEWLINE);
- return buffer.toString() ;
+ return sb.toString() ;
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java Mon Jun 16 13:48:58 2014 -0400
@@ -95,24 +95,24 @@
* @return the string representation of CK_PKCS5_PBKD2_PARAMS
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("hashAlg: 0x");
- buffer.append(Functions.toFullHexString(hashAlg));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("hashAlg: 0x");
+ sb.append(Functions.toFullHexString(hashAlg));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("mgf: 0x");
- buffer.append(Functions.toFullHexString(mgf));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("mgf: 0x");
+ sb.append(Functions.toFullHexString(mgf));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("sLen: ");
- buffer.append(sLen);
+ sb.append(Constants.INDENT);
+ sb.append("sLen: ");
+ sb.append(sLen);
//buffer.append(Constants.NEWLINE);
- return buffer.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java Mon Jun 16 13:48:58 2014 -0400
@@ -114,29 +114,29 @@
* @return the string representation of CK_SESSION_INFO
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("slotID: ");
- buffer.append(String.valueOf(slotID));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("slotID: ");
+ sb.append(String.valueOf(slotID));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("state: ");
- buffer.append(Functions.sessionStateToString(state));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("state: ");
+ sb.append(Functions.sessionStateToString(state));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("flags: ");
- buffer.append(Functions.sessionInfoFlagsToString(flags));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("flags: ");
+ sb.append(Functions.sessionInfoFlagsToString(flags));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulDeviceError: ");
- buffer.append(Functions.toHexString(ulDeviceError));
+ sb.append(Constants.INDENT);
+ sb.append("ulDeviceError: ");
+ sb.append(Functions.toHexString(ulDeviceError));
//buffer.append(Constants.NEWLINE);
- return buffer.toString() ;
+ return sb.toString() ;
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java Mon Jun 16 13:48:58 2014 -0400
@@ -130,34 +130,34 @@
* @return the string representation of CK_SLOT_INFO
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("slotDescription: ");
- buffer.append(new String(slotDescription));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("slotDescription: ");
+ sb.append(new String(slotDescription));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("manufacturerID: ");
- buffer.append(new String(manufacturerID));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("manufacturerID: ");
+ sb.append(new String(manufacturerID));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("flags: ");
- buffer.append(Functions.slotInfoFlagsToString(flags));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("flags: ");
+ sb.append(Functions.slotInfoFlagsToString(flags));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("hardwareVersion: ");
- buffer.append(hardwareVersion.toString());
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("hardwareVersion: ");
+ sb.append(hardwareVersion.toString());
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("firmwareVersion: ");
- buffer.append(firmwareVersion.toString());
+ sb.append(Constants.INDENT);
+ sb.append("firmwareVersion: ");
+ sb.append(firmwareVersion.toString());
//buffer.append(Constants.NEWLINE);
- return buffer.toString() ;
+ return sb.toString() ;
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java Mon Jun 16 13:48:58 2014 -0400
@@ -271,119 +271,119 @@
* @return the string representation of CK_TOKEN_INFO
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("label: ");
- buffer.append(new String(label));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("label: ");
+ sb.append(new String(label));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("manufacturerID: ");
- buffer.append(new String(manufacturerID));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("manufacturerID: ");
+ sb.append(new String(manufacturerID));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("model: ");
- buffer.append(new String(model));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("model: ");
+ sb.append(new String(model));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("serialNumber: ");
- buffer.append(new String(serialNumber));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("serialNumber: ");
+ sb.append(new String(serialNumber));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("flags: ");
- buffer.append(Functions.tokenInfoFlagsToString(flags));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("flags: ");
+ sb.append(Functions.tokenInfoFlagsToString(flags));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulMaxSessionCount: ");
- buffer.append((ulMaxSessionCount == PKCS11Constants.CK_EFFECTIVELY_INFINITE)
+ sb.append(Constants.INDENT);
+ sb.append("ulMaxSessionCount: ");
+ sb.append((ulMaxSessionCount == PKCS11Constants.CK_EFFECTIVELY_INFINITE)
? "CK_EFFECTIVELY_INFINITE"
: (ulMaxSessionCount == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
? "CK_UNAVAILABLE_INFORMATION"
: String.valueOf(ulMaxSessionCount));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulSessionCount: ");
- buffer.append((ulSessionCount == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
+ sb.append(Constants.INDENT);
+ sb.append("ulSessionCount: ");
+ sb.append((ulSessionCount == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
? "CK_UNAVAILABLE_INFORMATION"
: String.valueOf(ulSessionCount));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulMaxRwSessionCount: ");
- buffer.append((ulMaxRwSessionCount == PKCS11Constants.CK_EFFECTIVELY_INFINITE)
+ sb.append(Constants.INDENT);
+ sb.append("ulMaxRwSessionCount: ");
+ sb.append((ulMaxRwSessionCount == PKCS11Constants.CK_EFFECTIVELY_INFINITE)
? "CK_EFFECTIVELY_INFINITE"
: (ulMaxRwSessionCount == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
? "CK_UNAVAILABLE_INFORMATION"
: String.valueOf(ulMaxRwSessionCount));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulRwSessionCount: ");
- buffer.append((ulRwSessionCount == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
+ sb.append(Constants.INDENT);
+ sb.append("ulRwSessionCount: ");
+ sb.append((ulRwSessionCount == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
? "CK_UNAVAILABLE_INFORMATION"
: String.valueOf(ulRwSessionCount));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulMaxPinLen: ");
- buffer.append(String.valueOf(ulMaxPinLen));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("ulMaxPinLen: ");
+ sb.append(String.valueOf(ulMaxPinLen));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulMinPinLen: ");
- buffer.append(String.valueOf(ulMinPinLen));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("ulMinPinLen: ");
+ sb.append(String.valueOf(ulMinPinLen));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulTotalPublicMemory: ");
- buffer.append((ulTotalPublicMemory == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
+ sb.append(Constants.INDENT);
+ sb.append("ulTotalPublicMemory: ");
+ sb.append((ulTotalPublicMemory == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
? "CK_UNAVAILABLE_INFORMATION"
: String.valueOf(ulTotalPublicMemory));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulFreePublicMemory: ");
- buffer.append((ulFreePublicMemory == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
+ sb.append(Constants.INDENT);
+ sb.append("ulFreePublicMemory: ");
+ sb.append((ulFreePublicMemory == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
? "CK_UNAVAILABLE_INFORMATION"
: String.valueOf(ulFreePublicMemory));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulTotalPrivateMemory: ");
- buffer.append((ulTotalPrivateMemory == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
+ sb.append(Constants.INDENT);
+ sb.append("ulTotalPrivateMemory: ");
+ sb.append((ulTotalPrivateMemory == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
? "CK_UNAVAILABLE_INFORMATION"
: String.valueOf(ulTotalPrivateMemory));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulFreePrivateMemory: ");
- buffer.append((ulFreePrivateMemory == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
+ sb.append(Constants.INDENT);
+ sb.append("ulFreePrivateMemory: ");
+ sb.append((ulFreePrivateMemory == PKCS11Constants.CK_UNAVAILABLE_INFORMATION)
? "CK_UNAVAILABLE_INFORMATION"
: String.valueOf(ulFreePrivateMemory));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("hardwareVersion: ");
- buffer.append(hardwareVersion.toString());
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("hardwareVersion: ");
+ sb.append(hardwareVersion.toString());
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("firmwareVersion: ");
- buffer.append(firmwareVersion.toString());
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("firmwareVersion: ");
+ sb.append(firmwareVersion.toString());
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("utcTime: ");
- buffer.append(new String(utcTime));
+ sb.append(Constants.INDENT);
+ sb.append("utcTime: ");
+ sb.append(new String(utcTime));
//buffer.append(Constants.NEWLINE);
- return buffer.toString() ;
+ return sb.toString() ;
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java Mon Jun 16 13:48:58 2014 -0400
@@ -99,34 +99,34 @@
* @return the string representation of CK_PKCS5_PBKD2_PARAMS
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("kdf: 0x");
- buffer.append(Functions.toFullHexString(kdf));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("kdf: 0x");
+ sb.append(Functions.toFullHexString(kdf));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pOtherInfoLen: ");
- buffer.append(pOtherInfo.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pOtherInfoLen: ");
+ sb.append(pOtherInfo.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pOtherInfo: ");
- buffer.append(Functions.toHexString(pOtherInfo));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pOtherInfo: ");
+ sb.append(Functions.toHexString(pOtherInfo));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicDataLen: ");
- buffer.append(pPublicData.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pPublicDataLen: ");
+ sb.append(pPublicData.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicData: ");
- buffer.append(Functions.toHexString(pPublicData));
+ sb.append(Constants.INDENT);
+ sb.append("pPublicData: ");
+ sb.append(Functions.toHexString(pPublicData));
//buffer.append(Constants.NEWLINE);
- return buffer.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java Mon Jun 16 13:48:58 2014 -0400
@@ -128,54 +128,54 @@
* @return the string representation of CK_PKCS5_PBKD2_PARAMS
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buffer.append(Constants.INDENT);
- buffer.append("kdf: 0x");
- buffer.append(Functions.toFullHexString(kdf));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("kdf: 0x");
+ sb.append(Functions.toFullHexString(kdf));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pOtherInfoLen: ");
- buffer.append(pOtherInfo.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pOtherInfoLen: ");
+ sb.append(pOtherInfo.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pOtherInfo: ");
- buffer.append(Functions.toHexString(pOtherInfo));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pOtherInfo: ");
+ sb.append(Functions.toHexString(pOtherInfo));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicDataLen: ");
- buffer.append(pPublicData.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pPublicDataLen: ");
+ sb.append(pPublicData.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicData: ");
- buffer.append(Functions.toHexString(pPublicData));
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pPublicData: ");
+ sb.append(Functions.toHexString(pPublicData));
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("ulPrivateDataLen: ");
- buffer.append(ulPrivateDataLen);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("ulPrivateDataLen: ");
+ sb.append(ulPrivateDataLen);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("hPrivateData: ");
- buffer.append(hPrivateData);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("hPrivateData: ");
+ sb.append(hPrivateData);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicDataLen2: ");
- buffer.append(pPublicData2.length);
- buffer.append(Constants.NEWLINE);
+ sb.append(Constants.INDENT);
+ sb.append("pPublicDataLen2: ");
+ sb.append(pPublicData2.length);
+ sb.append(Constants.NEWLINE);
- buffer.append(Constants.INDENT);
- buffer.append("pPublicData2: ");
- buffer.append(Functions.toHexString(pPublicData2));
+ sb.append(Constants.INDENT);
+ sb.append("pPublicData2: ");
+ sb.append(Functions.toHexString(pPublicData2));
//buffer.append(Constants.NEWLINE);
- return buffer.toString();
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/pkcs11/wrapper/Functions.java Mon Jun 16 13:48:58 2014 -0400
@@ -109,14 +109,14 @@
*/
public static String toFullHexString(long value) {
long currentValue = value;
- StringBuffer stringBuffer = new StringBuffer(16);
+ StringBuilder sb = new StringBuilder(16);
for(int j = 0; j < 16; j++) {
int currentDigit = (int) currentValue & 0xf;
- stringBuffer.append(HEX_DIGITS[currentDigit]);
+ sb.append(HEX_DIGITS[currentDigit]);
currentValue >>>= 4;
}
- return stringBuffer.reverse().toString();
+ return sb.reverse().toString();
}
/**
@@ -128,14 +128,14 @@
*/
public static String toFullHexString(int value) {
int currentValue = value;
- StringBuffer stringBuffer = new StringBuffer(8);
+ StringBuilder sb = new StringBuilder(8);
for(int i = 0; i < 8; i++) {
int currentDigit = currentValue & 0xf;
- stringBuffer.append(HEX_DIGITS[currentDigit]);
+ sb.append(HEX_DIGITS[currentDigit]);
currentValue >>>= 4;
}
- return stringBuffer.reverse().toString();
+ return sb.reverse().toString();
}
/**
@@ -161,20 +161,20 @@
return null;
}
- StringBuffer buffer = new StringBuffer(2 * value.length);
+ StringBuilder sb = new StringBuilder(2 * value.length);
int single;
for (int i = 0; i < value.length; i++) {
single = value[i] & 0xFF;
if (single < 0x10) {
- buffer.append('0');
+ sb.append('0');
}
- buffer.append(Integer.toString(single, 16));
+ sb.append(Integer.toString(single, 16));
}
- return buffer.toString();
+ return sb.toString();
}
/**
--- a/jdk/src/share/classes/sun/security/provider/AuthPolicyFile.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/provider/AuthPolicyFile.java Mon Jun 16 13:48:58 2014 -0400
@@ -944,7 +944,7 @@
}
File f = new File(path);
path = f.getCanonicalPath();
- StringBuffer sb = new StringBuffer(path);
+ StringBuilder sb = new StringBuilder(path);
// reappend '*' to canonicalized filename (note that
// canonicalization may have removed trailing file
// separator, so we have to check for that, too)
@@ -1095,7 +1095,7 @@
@Override
public String toString(){
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(rb.getString("LPARAM"));
sb.append(getCodeSource());
sb.append("\n");
--- a/jdk/src/share/classes/sun/security/provider/X509Factory.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/provider/X509Factory.java Mon Jun 16 13:48:58 2014 -0400
@@ -519,7 +519,7 @@
// Step 2: Read the rest of header, determine the line end
int end;
- StringBuffer header = new StringBuffer("-----");
+ StringBuilder header = new StringBuilder("-----");
while (true) {
int next = is.read();
if (next == -1) {
@@ -562,7 +562,7 @@
}
// Step 4: Consume the footer
- StringBuffer footer = new StringBuffer("-");
+ StringBuilder footer = new StringBuilder("-");
while (true) {
int next = is.read();
// Add next == '\n' for maximum safety, in case endline
--- a/jdk/src/share/classes/sun/security/smartcardio/PCSC.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/smartcardio/PCSC.java Mon Jun 16 13:48:58 2014 -0400
@@ -172,7 +172,7 @@
private final static char[] hexDigits = "0123456789abcdef".toCharArray();
public static String toString(byte[] b) {
- StringBuffer sb = new StringBuffer(b.length * 3);
+ StringBuilder sb = new StringBuilder(b.length * 3);
for (int i = 0; i < b.length; i++) {
int k = b[i] & 0xff;
if (i != 0) {
--- a/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java Mon Jun 16 13:48:58 2014 -0400
@@ -1474,17 +1474,17 @@
s.println();
if (protocolVersion.v >= ProtocolVersion.TLS12.v) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
boolean opened = false;
for (SignatureAndHashAlgorithm signAlg : algorithms) {
if (opened) {
- buffer.append(", " + signAlg.getAlgorithmName());
+ sb.append(", " + signAlg.getAlgorithmName());
} else {
- buffer.append(signAlg.getAlgorithmName());
+ sb.append(signAlg.getAlgorithmName());
opened = true;
}
}
- s.println("Supported Signature Algorithms: " + buffer);
+ s.println("Supported Signature Algorithms: " + sb);
}
s.println("Cert Authorities:");
--- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -2594,7 +2594,7 @@
*/
@Override
public String toString() {
- StringBuffer retval = new StringBuffer(80);
+ StringBuilder retval = new StringBuilder(80);
retval.append(Integer.toHexString(hashCode()));
retval.append("[");
--- a/jdk/src/share/classes/sun/security/ssl/ServerNameExtension.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/ssl/ServerNameExtension.java Mon Jun 16 13:48:58 2014 -0400
@@ -266,12 +266,12 @@
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (SNIServerName sniName : sniMap.values()) {
- buffer.append("[" + sniName + "]");
+ sb.append("[" + sniName + "]");
}
- return "Extension " + type + ", server_name: " + buffer;
+ return "Extension " + type + ", server_name: " + sb;
}
private static class UnknownServerName extends SNIServerName {
--- a/jdk/src/share/classes/sun/security/ssl/SessionId.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/ssl/SessionId.java Mon Jun 16 13:48:58 2014 -0400
@@ -72,16 +72,16 @@
public String toString ()
{
int len = sessionId.length;
- StringBuffer s = new StringBuffer (10 + 2 * len);
+ StringBuilder sb = new StringBuilder (10 + 2 * len);
- s.append ("{");
+ sb.append("{");
for (int i = 0; i < len; i++) {
- s.append (0x0ff & sessionId [i]);
+ sb.append(0x0ff & sessionId[i]);
if (i != (len - 1))
- s.append (", ");
+ sb.append (", ");
}
- s.append ("}");
- return s.toString ();
+ sb.append("}");
+ return sb.toString ();
}
--- a/jdk/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java Mon Jun 16 13:48:58 2014 -0400
@@ -118,18 +118,18 @@
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
boolean opened = false;
for (SignatureAndHashAlgorithm signAlg : algorithms) {
if (opened) {
- buffer.append(", " + signAlg.getAlgorithmName());
+ sb.append(", " + signAlg.getAlgorithmName());
} else {
- buffer.append(signAlg.getAlgorithmName());
+ sb.append(signAlg.getAlgorithmName());
opened = true;
}
}
- return "Extension " + type + ", signature_algorithms: " + buffer;
+ return "Extension " + type + ", signature_algorithms: " + sb;
}
}
--- a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java Mon Jun 16 13:48:58 2014 -0400
@@ -728,7 +728,7 @@
output.put(label, new ArrayList<String>());
}
- StringBuffer fb = new StringBuffer();
+ StringBuilder fb = new StringBuilder();
String s = Long.toString(je.getSize());
for (int i = 6 - s.length(); i > 0; --i) {
fb.append(' ');
@@ -1572,25 +1572,25 @@
if (cacheForSignerInfo.containsKey(signer)) {
return cacheForSignerInfo.get(signer);
}
- StringBuffer s = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
List<? extends Certificate> certs = signer.getSignerCertPath().getCertificates();
// display the signature timestamp, if present
Date timestamp;
Timestamp ts = signer.getTimestamp();
if (ts != null) {
- s.append(printTimestamp(tab, ts));
- s.append('\n');
+ sb.append(printTimestamp(tab, ts));
+ sb.append('\n');
timestamp = ts.getTimestamp();
} else {
timestamp = null;
noTimestamp = true;
}
- // display the certificate(s). The first one is end-entity cert and
+ // display the certificate(sb). The first one is end-entity cert and
// its KeyUsage should be checked.
boolean first = true;
for (Certificate c : certs) {
- s.append(printCert(tab, c, true, timestamp, first));
- s.append('\n');
+ sb.append(printCert(tab, c, true, timestamp, first));
+ sb.append('\n');
first = false;
}
try {
@@ -1605,11 +1605,11 @@
// No more warning, we alreay have hasExpiredCert or notYetValidCert
} else {
chainNotValidated = true;
- s.append(tab + rb.getString(".CertPath.not.validated.") +
+ sb.append(tab + rb.getString(".CertPath.not.validated.") +
e.getLocalizedMessage() + "]\n"); // TODO
}
}
- String result = s.toString();
+ String result = sb.toString();
cacheForSignerInfo.put(signer, result);
return result;
}
--- a/jdk/src/share/classes/sun/security/tools/keytool/Main.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Main.java Mon Jun 16 13:48:58 2014 -0400
@@ -3664,7 +3664,7 @@
.startsWith(s.toLowerCase(Locale.ENGLISH))) {
match[nmatch++] = i;
} else {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
boolean first = true;
for (char c: one.toCharArray()) {
if (first) {
@@ -3690,7 +3690,7 @@
if (match[1] > experiment) {
return match[0];
}
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
MessageFormat form = new MessageFormat(rb.getString
("command.{0}.is.ambiguous."));
Object[] source = {s};
--- a/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java Mon Jun 16 13:48:58 2014 -0400
@@ -975,16 +975,16 @@
String result = "";
if ((grantEntry.principals != null) &&
(!grantEntry.principals.isEmpty())) {
- StringBuffer buffer = new StringBuffer(200);
+ StringBuilder sb = new StringBuilder(200);
ListIterator<PolicyParser.PrincipalEntry> list =
grantEntry.principals.listIterator();
while (list.hasNext()) {
PolicyParser.PrincipalEntry pppe = list.next();
- buffer.append(" Principal " + pppe.getDisplayClass() + " " +
+ sb.append(" Principal " + pppe.getDisplayClass() + " " +
pppe.getDisplayName(true));
- if (list.hasNext()) buffer.append(", ");
+ if (list.hasNext()) sb.append(", ");
}
- result = buffer.toString();
+ result = sb.toString();
}
return result;
}
--- a/jdk/src/share/classes/sun/security/util/Debug.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/util/Debug.java Mon Jun 16 13:48:58 2014 -0400
@@ -188,13 +188,13 @@
*/
public static String toHexString(BigInteger b) {
String hexValue = b.toString(16);
- StringBuffer buf = new StringBuffer(hexValue.length()*2);
+ StringBuilder sb = new StringBuilder(hexValue.length()*2);
if (hexValue.startsWith("-")) {
- buf.append(" -");
+ sb.append(" -");
hexValue = hexValue.substring(1);
} else {
- buf.append(" "); // four spaces
+ sb.append(" "); // four spaces
}
if ((hexValue.length()%2) != 0) {
// add back the leading 0
@@ -203,17 +203,17 @@
int i=0;
while (i < hexValue.length()) {
// one byte at a time
- buf.append(hexValue.substring(i, i+2));
+ sb.append(hexValue.substring(i, i + 2));
i+=2;
if (i!= hexValue.length()) {
if ((i%64) == 0) {
- buf.append("\n "); // line after eight words
+ sb.append("\n "); // line after eight words
} else if (i%8 == 0) {
- buf.append(" "); // space between words
+ sb.append(" "); // space between words
}
}
}
- return buf.toString();
+ return sb.toString();
}
/**
@@ -221,7 +221,7 @@
*/
private static String marshal(String args) {
if (args != null) {
- StringBuffer target = new StringBuffer();
+ StringBuilder target = new StringBuilder();
StringBuffer source = new StringBuffer(args);
// obtain the "permission=<classname>" options
--- a/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java Mon Jun 16 13:48:58 2014 -0400
@@ -238,7 +238,7 @@
static String toHex(byte[] data) {
- StringBuffer sb = new StringBuffer(data.length*2);
+ StringBuilder sb = new StringBuilder(data.length*2);
for (int i=0; i<data.length; i++) {
sb.append(hexc[(data[i] >>4) & 0x0f]);
--- a/jdk/src/share/classes/sun/security/util/ObjectIdentifier.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/util/ObjectIdentifier.java Mon Jun 16 13:48:58 2014 -0400
@@ -418,7 +418,7 @@
String s = stringForm;
if (s == null) {
int length = encoding.length;
- StringBuffer sb = new StringBuffer(length * 4);
+ StringBuilder sb = new StringBuilder(length * 4);
int fromPos = 0;
for (int i = 0; i < length; i++) {
--- a/jdk/src/share/classes/sun/security/util/PropertyExpander.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/util/PropertyExpander.java Mon Jun 16 13:48:58 2014 -0400
@@ -67,7 +67,7 @@
// no special characters
if (p == -1) return value;
- StringBuffer sb = new StringBuffer(value.length());
+ StringBuilder sb = new StringBuilder(value.length());
int max = value.length();
int i = 0; // index of last character we copied
--- a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Mon Jun 16 13:48:58 2014 -0400
@@ -552,7 +552,7 @@
static String toHex(byte[] data) {
- StringBuffer sb = new StringBuffer(data.length*2);
+ StringBuilder sb = new StringBuilder(data.length*2);
for (int i=0; i<data.length; i++) {
sb.append(hexc[(data[i] >>4) & 0x0f]);
--- a/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -536,7 +536,7 @@
* @return value of this CRL in a printable form.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("X.509 CRL v" + (version+1) + "\n");
if (sigAlgId != null)
sb.append("Signature Algorithm: " + sigAlgId.toString() +
--- a/jdk/src/share/classes/sun/swing/SwingUtilities2.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/swing/SwingUtilities2.java Mon Jun 16 13:48:58 2014 -0400
@@ -1431,7 +1431,7 @@
}
public static String displayPropertiesToCSS(Font font, Color fg) {
- StringBuffer rule = new StringBuffer("body {");
+ StringBuilder rule = new StringBuilder("body {");
if (font != null) {
rule.append(" font-family: ");
rule.append(font.getFamily());
--- a/jdk/src/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java Mon Jun 16 13:48:58 2014 -0400
@@ -673,33 +673,33 @@
public String toString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buf.append(super.toString()).append(',');
+ sb.append(super.toString()).append(',');
- buf.append("data=").append(data).append(',');
+ sb.append("data=").append(data).append(',');
- buf.append("font=").append(font).append(',');
+ sb.append("font=").append(font).append(',');
- buf.append("insets=").append(insets).append(',');
+ sb.append("insets=").append(insets).append(',');
- buf.append("synthGraphics=").append(synthGraphics).append(',');
+ sb.append("synthGraphics=").append(synthGraphics).append(',');
- buf.append("painter=").append(painter).append(',');
+ sb.append("painter=").append(painter).append(',');
StateInfo[] states = getStateInfo();
if (states != null) {
- buf.append("states[");
+ sb.append("states[");
for (StateInfo state : states) {
- buf.append(state.toString()).append(',');
+ sb.append(state.toString()).append(',');
}
- buf.append(']').append(',');
+ sb.append(']').append(',');
}
// remove last newline
- buf.deleteCharAt(buf.length() - 1);
+ sb.deleteCharAt(sb.length() - 1);
- return buf.toString();
+ return sb.toString();
}
@@ -909,19 +909,19 @@
}
public String toString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- buf.append(super.toString()).append(',');
+ sb.append(super.toString()).append(',');
- buf.append("state=").append(Integer.toString(state)).append(',');
+ sb.append("state=").append(Integer.toString(state)).append(',');
- buf.append("font=").append(font).append(',');
+ sb.append("font=").append(font).append(',');
if (colors != null) {
- buf.append("colors=").append(Arrays.asList(colors)).
+ sb.append("colors=").append(Arrays.asList(colors)).
append(',');
}
- return buf.toString();
+ return sb.toString();
}
}
}
--- a/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -439,20 +439,20 @@
}
private String fileNameString(File[] files) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; files != null && i < files.length; i++) {
if (i > 0) {
- buf.append(" ");
+ sb.append(" ");
}
if (files.length > 1) {
- buf.append("\"");
+ sb.append("\"");
}
- buf.append(fileNameString(files[i]));
+ sb.append(fileNameString(files[i]));
if (files.length > 1) {
- buf.append("\"");
+ sb.append("\"");
}
}
- return buf.toString();
+ return sb.toString();
}
public void uninstallUI(JComponent c) {
--- a/jdk/src/share/classes/sun/text/normalizer/UTF16.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/text/normalizer/UTF16.java Mon Jun 16 13:48:58 2014 -0400
@@ -530,7 +530,7 @@
return String.valueOf((char)ch);
}
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
result.append(getLeadSurrogate(ch));
result.append(getTrailSurrogate(ch));
return result.toString();
--- a/jdk/src/share/classes/sun/tools/java/MemberDefinition.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/java/MemberDefinition.java Mon Jun 16 13:48:58 2014 -0400
@@ -919,18 +919,18 @@
if (isInitializer()) {
return isStatic() ? "static {}" : "instance {}";
} else if (isConstructor()) {
- StringBuffer buf = new StringBuffer();
- buf.append(name);
- buf.append('(');
+ StringBuilder sb = new StringBuilder();
+ sb.append(name);
+ sb.append('(');
Type argTypes[] = getType().getArgumentTypes();
for (int i = 0 ; i < argTypes.length ; i++) {
if (i > 0) {
- buf.append(',');
+ sb.append(',');
}
- buf.append(argTypes[i].toString());
+ sb.append(argTypes[i].toString());
}
- buf.append(')');
- return buf.toString();
+ sb.append(')');
+ return sb.toString();
} else if (isInnerClass()) {
return getInnerClass().toString();
}
--- a/jdk/src/share/classes/sun/tools/java/MethodSet.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/java/MethodSet.java Mon Jun 16 13:48:58 2014 -0400
@@ -261,18 +261,18 @@
*/
public String toString() {
int len = size();
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Iterator all = iterator();
- buf.append("{");
+ sb.append("{");
while (all.hasNext()) {
- buf.append(all.next().toString());
+ sb.append(all.next().toString());
len--;
if (len > 0) {
- buf.append(", ");
+ sb.append(", ");
}
}
- buf.append("}");
- return buf.toString();
+ sb.append("}");
+ return sb.toString();
}
}
--- a/jdk/src/share/classes/sun/tools/java/MethodType.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/java/MethodType.java Mon Jun 16 13:48:58 2014 -0400
@@ -91,17 +91,17 @@
}
public String typeString(String id, boolean abbrev, boolean ret) {
- StringBuffer buf = new StringBuffer();
- buf.append(id);
- buf.append('(');
+ StringBuilder sb = new StringBuilder();
+ sb.append(id);
+ sb.append('(');
for (int i = 0 ; i < argTypes.length ; i++) {
if (i > 0) {
- buf.append(", ");
+ sb.append(", ");
}
- buf.append(argTypes[i].typeString("", abbrev, ret));
+ sb.append(argTypes[i].typeString("", abbrev, ret));
}
- buf.append(')');
+ sb.append(')');
- return ret ? getReturnType().typeString(buf.toString(), abbrev, ret) : buf.toString();
+ return ret ? getReturnType().typeString(sb.toString(), abbrev, ret) : sb.toString();
}
}
--- a/jdk/src/share/classes/sun/tools/java/Parser.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/java/Parser.java Mon Jun 16 13:48:58 2014 -0400
@@ -1395,24 +1395,24 @@
return res;
}
- StringBuffer buf = new StringBuffer(res.id.toString());
+ StringBuilder sb = new StringBuilder(res.id.toString());
while (token == FIELD) {
scan();
if ((token == MUL) && star) {
scan();
- buf.append(".*");
+ sb.append(".*");
break;
}
- buf.append('.');
+ sb.append('.');
if (token == IDENT) {
- buf.append(scanner.idValue);
+ sb.append(scanner.idValue);
}
expect(IDENT);
}
- res.id = Identifier.lookup(buf.toString());
+ res.id = Identifier.lookup(sb.toString());
return res;
}
/**
--- a/jdk/src/share/classes/sun/tools/java/Type.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/java/Type.java Mon Jun 16 13:48:58 2014 -0400
@@ -274,15 +274,15 @@
* Create a method type with arguments.
*/
public static synchronized Type tMethod(Type returnType, Type argTypes[]) {
- StringBuffer buf = new StringBuffer();
- buf.append(SIG_METHOD);
+ StringBuilder sb = new StringBuilder();
+ sb.append(SIG_METHOD);
for (int i = 0 ; i < argTypes.length ; i++) {
- buf.append(argTypes[i].getTypeSignature());
+ sb.append(argTypes[i].getTypeSignature());
}
- buf.append(SIG_ENDMETHOD);
- buf.append(returnType.getTypeSignature());
+ sb.append(SIG_ENDMETHOD);
+ sb.append(returnType.getTypeSignature());
- String sig = buf.toString();
+ String sig = sb.toString();
Type t = (Type)typeHash.get(sig);
if (t == null) {
t = new MethodType(sig, returnType, argTypes);
--- a/jdk/src/share/classes/sun/tools/jconsole/Formatter.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/jconsole/Formatter.java Mon Jun 16 13:48:58 2014 -0400
@@ -232,15 +232,15 @@
}
static String justify(String str, int size) {
- StringBuffer buf = new StringBuffer();
- buf.append("<TT>");
+ StringBuilder sb = new StringBuilder();
+ sb.append("<TT>");
int n = size - str.length();
for (int i = 0; i < n; i++) {
- buf.append(" ");
+ sb.append(" ");
}
- buf.append(str);
- buf.append("</TT>");
- return buf.toString();
+ sb.append(str);
+ sb.append("</TT>");
+ return sb.toString();
}
static String newRow(String label, String value) {
--- a/jdk/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java Mon Jun 16 13:48:58 2014 -0400
@@ -64,7 +64,7 @@
throws RemoteException, MonitorException {
Integer v = new Integer(lvmid);
RemoteVm stub = null;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("local://").append(lvmid).append("@localhost");
if (mode != null) {
--- a/jdk/src/share/classes/sun/tools/native2ascii/N2AFilter.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/native2ascii/N2AFilter.java Mon Jun 16 13:48:58 2014 -0400
@@ -58,7 +58,7 @@
out.write('u');
String hex =
Integer.toHexString(buf[i]);
- StringBuffer hex4 = new StringBuffer(hex);
+ StringBuilder hex4 = new StringBuilder(hex);
hex4.reverse();
int length = 4 - hex4.length();
for (int j = 0; j < length; j++) {
--- a/jdk/src/share/classes/sun/tools/serialver/SerialVer.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/serialver/SerialVer.java Mon Jun 16 13:48:58 2014 -0400
@@ -85,7 +85,7 @@
/* Class not found so far */
}
if (!classFound) {
- StringBuffer workBuffer = new StringBuffer(classname);
+ StringBuilder workBuffer = new StringBuilder(classname);
String workName = workBuffer.toString();
int i;
while ((i = workName.lastIndexOf('.')) != -1 && !classFound) {
--- a/jdk/src/share/classes/sun/tools/tree/FieldExpression.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/tree/FieldExpression.java Mon Jun 16 13:48:58 2014 -0400
@@ -79,21 +79,21 @@
* Convert an '.' expression to a qualified identifier
*/
static public Identifier toIdentifier(Expression e) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while (e.op == FIELD) {
FieldExpression fe = (FieldExpression)e;
if (fe.id == idThis || fe.id == idClass) {
return null;
}
- buf.insert(0, fe.id);
- buf.insert(0, '.');
+ sb.insert(0, fe.id);
+ sb.insert(0, '.');
e = fe.right;
}
if (e.op != IDENT) {
return null;
}
- buf.insert(0, ((IdentifierExpression)e).id);
- return Identifier.lookup(buf.toString());
+ sb.insert(0, ((IdentifierExpression) e).id);
+ return Identifier.lookup(sb.toString());
}
/**
--- a/jdk/src/share/classes/sun/tools/tree/Vset.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tools/tree/Vset.java Mon Jun 16 13:48:58 2014 -0400
@@ -495,7 +495,7 @@
public String toString() {
if (this == DEAD_END)
return "{DEAD_END}";
- StringBuffer sb = new StringBuffer("{");
+ StringBuilder sb = new StringBuilder("{");
int maxVar = VBITS * (1 + (x.length+1)/2);
for (int i = 0; i < maxVar; i++) {
if (!testVarUnassigned(i)) {
--- a/jdk/src/share/classes/sun/tracing/PrintStreamProviderFactory.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/classes/sun/tracing/PrintStreamProviderFactory.java Mon Jun 16 13:48:58 2014 -0400
@@ -99,7 +99,7 @@
}
public void uncheckedTrigger(Object[] args) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(provider.getName());
sb.append(".");
sb.append(name);
--- a/jdk/src/share/demo/jvmti/hprof/hprof.h Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/demo/jvmti/hprof/hprof.h Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -67,10 +67,6 @@
#include "classfile_constants.h"
#include "jvm_md.h"
-#ifndef SKIP_NPT
-#include "npt.h" /* To get NptEnv for doing character conversions */
-#endif
-
/* Macros to extract the upper and lower 32 bits of a jlong */
#define jlong_high(a) ((jint)((a)>>32))
@@ -207,9 +203,6 @@
jvmtiEnv *jvmti; /* JVMTI env for this session */
JavaVM *jvm; /* JavaVM* for this session */
-#ifndef SKIP_NPT
- NptEnv *npt; /* NptEnv* for this session, see npt.h */
-#endif
jint cachedJvmtiVersion; /* JVMTI version number */
char *header; /* "JAVA PROFILE 1.0.[12]" */
--- a/jdk/src/share/demo/jvmti/hprof/hprof_init.c Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/share/demo/jvmti/hprof/hprof_init.c Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -740,16 +740,11 @@
}
if ( gdata->utf8_output_filename != NULL ) {
- /* UTF-8 to platform encoding (fill in gdata->output_filename) */
+ // Don't attempt to convert output filename.
+ // If fileystem uses the same encoding as the rest of the OS it will work as is.
ulen = (int)strlen(gdata->utf8_output_filename);
gdata->output_filename = (char*)HPROF_MALLOC(ulen*3+3);
-#ifdef SKIP_NPT
(void)strcpy(gdata->output_filename, gdata->utf8_output_filename);
-#else
- (void)(gdata->npt->utf8ToPlatform)
- (gdata->npt->utf, (jbyte*)gdata->utf8_output_filename, ulen,
- gdata->output_filename, ulen*3+3);
-#endif
}
/* By default we turn on gdata->alloc_sites and gdata->heap_dump */
@@ -1949,7 +1944,6 @@
Agent_OnLoad(JavaVM *vm, char *options, void *reserved)
{
char *boot_path = NULL;
- char npt_lib[JVM_MAXPATHLEN];
/* See if it's already loaded */
if ( gdata!=NULL && gdata->isLoaded==JNI_TRUE ) {
@@ -1970,24 +1964,6 @@
/* Get the JVMTI environment */
getJvmti();
-#ifndef SKIP_NPT
- getSystemProperty("sun.boot.library.path", &boot_path);
- /* Load in NPT library for character conversions */
- md_build_library_name(npt_lib, sizeof(npt_lib), boot_path, NPT_LIBNAME);
- if ( strlen(npt_lib) == 0 ) {
- HPROF_ERROR(JNI_TRUE, "Could not find npt library");
- }
- jvmtiDeallocate(boot_path);
- NPT_INITIALIZE(npt_lib, &(gdata->npt), NPT_VERSION, NULL);
- if ( gdata->npt == NULL ) {
- HPROF_ERROR(JNI_TRUE, "Cannot load npt library");
- }
- gdata->npt->utf = (gdata->npt->utfInitialize)(NULL);
- if ( gdata->npt->utf == NULL ) {
- HPROF_ERROR(JNI_TRUE, "Cannot initialize npt utf functions");
- }
-#endif
-
/* Lock needed to protect debug_malloc() code, which is not MT safe */
#ifdef DEBUG
gdata->debug_malloc_lock = createRawMonitor("HPROF debug_malloc lock");
--- a/jdk/src/share/npt/README.txt Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-
-README: For NPT Library.
-------------------------
-
-To use this Native Platform Toolkit library, you need to add
--Isrc/share/npt and -I/src/${platform}/npt (platform is solaris or windows)
-to your compilation lines.
-
-To initialize/use the library:
-
- #include "npt.h"
-
- NptEnv *npt;
-
- NPT_INITIALIZE(&npt, NPT_VERSION, NULL);
- if (npt == NULL) {
- FATAL_ERROR_MESSAGE(("Unable to gain access to Npt library"));
- }
-
- /* To use the npt utf functions, they require initialization */
- npt->utf = (npt->utfInitialize)(NULL);
- if (npt->utf == NULL) {
- FATAL_ERROR_MESSAGE(("Unable to gain access to Npt utf functions"));
- }
-
- ...
-
-
- /* After all uses is done, it can be terminated, however, if the
- * process will be exiting anyway it isn't necessary, and if
- * you have other threads running that might use these handles
- * you will need to wait here until all those threads have terminated.
- * So in general, termination can be a pain and slow your process
- * termination down.
- */
- (npt->utfTerminate)(npt->utf,NULL);
- NPT_TERMINATE(&npt, NULL);
-
-
--- a/jdk/src/share/npt/npt.c Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "jni.h"
-
-#include "npt.h"
-
-#include "utf.h"
-
-static int
-version_check(char *version)
-{
- if ( version==NULL || strcmp(version, NPT_VERSION)!=0 ) {
- return 1;
- }
- return 0;
-}
-
-JNIEXPORT void JNICALL
-nptInitialize(NptEnv **pnpt, char *nptVersion, char *options)
-{
- NptEnv *npt;
-
- (*pnpt) = NULL;
-
- if ( version_check(nptVersion) ) {
- NPT_ERROR("NPT version doesn't match");
- return;
- }
-
- npt = (NptEnv*)calloc(sizeof(NptEnv), 1);
- if ( npt == NULL ) {
- NPT_ERROR("Cannot allocate calloc space for NptEnv*");
- return;
- }
-
- if ( options != NULL ) {
- npt->options = strdup(options);
- }
- npt->utfInitialize = &utfInitialize;
- npt->utfTerminate = &utfTerminate;
- npt->utf8ToPlatform = &utf8ToPlatform;
- npt->utf8FromPlatform = &utf8FromPlatform;
- npt->utf8ToUtf16 = &utf8ToUtf16;
- npt->utf16ToUtf8m = &utf16ToUtf8m;
- npt->utf16ToUtf8s = &utf16ToUtf8s;
- npt->utf8sToUtf8mLength = &utf8sToUtf8mLength;
- npt->utf8sToUtf8m = &utf8sToUtf8m;
- npt->utf8mToUtf8sLength = &utf8mToUtf8sLength;
- npt->utf8mToUtf8s = &utf8mToUtf8s;
-
- (*pnpt) = npt;
-}
-
-JNIEXPORT void JNICALL
-nptTerminate(NptEnv* npt, char *options)
-{
-
- /* FIXUP: options? Check memory or something? */
- if ( npt->options != NULL ) {
- (void)free(npt->options);
- }
- (void)free(npt);
-}
--- a/jdk/src/share/npt/npt.h Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* Native Platform Toolkit */
-
-#ifndef _NPT_H
-#define _NPT_H
-
-#define NPT_VERSION "0.0.0"
-
-#include <stdio.h>
-
-#include "jni.h"
-
-#include "npt_md.h"
-#include "utf.h"
-
-#define NPT_ERROR(s) { (void)fprintf(stderr, "NPT ERROR: %s\n", s); exit(1); }
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-
- /* Used to save handle to our own dynamicly loaded library */
- void *libhandle;
-
- /* Copy of the options sent in at initialization */
- char *options;
-
- /* Can be used to save the UtfInst handle */
- struct UtfInst *utf;
-
- /* UTF interfaces, see utf.c */
- struct UtfInst* (JNICALL *utfInitialize)
- (char *options);
- void (JNICALL *utfTerminate)
- (struct UtfInst *utf, char *options);
- int (JNICALL *utf8ToPlatform)
- (struct UtfInst *utf, jbyte *utf8, int len,
- char *output, int outputMaxLen);
- int (JNICALL *utf8FromPlatform)
- (struct UtfInst *utf, char *str, int len,
- jbyte *output, int outputMaxLen);
- int (JNICALL *utf8ToUtf16)
- (struct UtfInst *utf, jbyte *utf8, int len,
- jchar *output, int outputMaxLen);
- int (JNICALL *utf16ToUtf8m)
- (struct UtfInst *utf, jchar *utf16, int len,
- jbyte *output, int outputMaxLen);
- int (JNICALL *utf16ToUtf8s)
- (struct UtfInst *utf, jchar *utf16, int len,
- jbyte *output, int outputMaxLen);
- int (JNICALL *utf8sToUtf8mLength)
- (struct UtfInst *utf, jbyte *string, int length);
- void (JNICALL *utf8sToUtf8m)
- (struct UtfInst *utf, jbyte *string, int length,
- jbyte *newString, int newLength);
- int (JNICALL *utf8mToUtf8sLength)
- (struct UtfInst *utf, jbyte *string, int length);
- void (JNICALL *utf8mToUtf8s)
- (struct UtfInst *utf, jbyte *string, int length,
- jbyte *newString, int newLength);
-
-} NptEnv;
-
-/* Typedefs for the only 2 'extern' functions in npt library:
- * nptInitialize and nptTerminate
- * See NPT_INITIALIZE() and NPT_TERMINATE() in npt_md.h.
- */
-
-JNIEXPORT void JNICALL nptInitialize
- (NptEnv **pnpt, char *nptVersion, char *options);
-typedef void (JNICALL *NptInitialize)
- (NptEnv **pnpt, char *nptVersion, char *options);
-
-JNIEXPORT void JNICALL nptTerminate
- (NptEnv* npt, char *options);
-typedef void (JNICALL *NptTerminate)
- (NptEnv* npt, char *options);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif
--- a/jdk/src/share/npt/utf.c Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,500 +0,0 @@
-/*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* Misc functions for conversion of Unicode and UTF-8 and platform encoding */
-
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "jni.h"
-
-#include "utf.h"
-
-/*
- * Error handler
- */
-void
-utfError(char *file, int line, char *message)
-{
- (void)fprintf(stderr, "UTF ERROR [\"%s\":%d]: %s\n", file, line, message);
- abort();
-}
-
-/*
- * Convert UTF-8 to UTF-16
- * Returns length or -1 if output overflows.
- */
-int JNICALL
-utf8ToUtf16(struct UtfInst *ui, jbyte *utf8, int len, unsigned short *output, int outputMaxLen)
-{
- int outputLen;
- int i;
-
- UTF_ASSERT(utf8);
- UTF_ASSERT(len>=0);
- UTF_ASSERT(output);
- UTF_ASSERT(outputMaxLen>0);
-
- i = 0;
- outputLen = 0;
- while ( i<len ) {
- unsigned code, x, y, z;
-
- if ( outputLen >= outputMaxLen ) {
- return -1;
- }
- x = (unsigned char)utf8[i++];
- code = x;
- if ( (x & 0xE0)==0xE0 ) {
- y = (unsigned char)utf8[i++];
- z = (unsigned char)utf8[i++];
- code = ((x & 0xF)<<12) + ((y & 0x3F)<<6) + (z & 0x3F);
- } else if ( (x & 0xC0)==0xC0 ) {
- y = (unsigned char)utf8[i++];
- code = ((x & 0x1F)<<6) + (y & 0x3F);
- }
- output[outputLen++] = code;
- }
- return outputLen;
-}
-
-/*
- * Convert UTF-16 to UTF-8 Modified
- * Returns length or -1 if output overflows.
- */
-int JNICALL
-utf16ToUtf8m(struct UtfInst *ui, unsigned short *utf16, int len, jbyte *output, int outputMaxLen)
-{
- int i;
- int outputLen;
-
- UTF_ASSERT(utf16);
- UTF_ASSERT(len>=0);
- UTF_ASSERT(output);
- UTF_ASSERT(outputMaxLen>0);
-
- outputLen = 0;
- for (i = 0; i < len; i++) {
- unsigned code;
-
- code = utf16[i];
- if ( code >= 0x0001 && code <= 0x007F ) {
- if ( outputLen + 1 >= outputMaxLen ) {
- return -1;
- }
- output[outputLen++] = code;
- } else if ( code == 0 || ( code >= 0x0080 && code <= 0x07FF ) ) {
- if ( outputLen + 2 >= outputMaxLen ) {
- return -1;
- }
- output[outputLen++] = ((code>>6) & 0x1F) | 0xC0;
- output[outputLen++] = (code & 0x3F) | 0x80;
- } else if ( code >= 0x0800 && code <= 0xFFFF ) {
- if ( outputLen + 3 >= outputMaxLen ) {
- return -1;
- }
- output[outputLen++] = ((code>>12) & 0x0F) | 0xE0;
- output[outputLen++] = ((code>>6) & 0x3F) | 0x80;
- output[outputLen++] = (code & 0x3F) | 0x80;
- }
- }
- output[outputLen] = 0;
- return outputLen;
-}
-
-int JNICALL
-utf16ToUtf8s(struct UtfInst *ui, unsigned short *utf16, int len, jbyte *output, int outputMaxLen)
-{
- return -1; /* FIXUP */
-}
-
-/* Determine length of this Standard UTF-8 in Modified UTF-8.
- * Validation is done of the basic UTF encoding rules, returns
- * length (no change) when errors are detected in the UTF encoding.
- *
- * Note: Accepts Modified UTF-8 also, no verification on the
- * correctness of Standard UTF-8 is done. e,g, 0xC080 input is ok.
- */
-int JNICALL
-utf8sToUtf8mLength(struct UtfInst *ui, jbyte *string, int length)
-{
- int newLength;
- int i;
-
- newLength = 0;
- for ( i = 0 ; i < length ; i++ ) {
- unsigned byte;
-
- byte = (unsigned char)string[i];
- if ( (byte & 0x80) == 0 ) { /* 1byte encoding */
- newLength++;
- if ( byte == 0 ) {
- newLength++; /* We gain one byte in length on NULL bytes */
- }
- } else if ( (byte & 0xE0) == 0xC0 ) { /* 2byte encoding */
- /* Check encoding of following bytes */
- if ( (i+1) >= length || (string[i+1] & 0xC0) != 0x80 ) {
- break; /* Error condition */
- }
- i++; /* Skip next byte */
- newLength += 2;
- } else if ( (byte & 0xF0) == 0xE0 ) { /* 3byte encoding */
- /* Check encoding of following bytes */
- if ( (i+2) >= length || (string[i+1] & 0xC0) != 0x80
- || (string[i+2] & 0xC0) != 0x80 ) {
- break; /* Error condition */
- }
- i += 2; /* Skip next two bytes */
- newLength += 3;
- } else if ( (byte & 0xF8) == 0xF0 ) { /* 4byte encoding */
- /* Check encoding of following bytes */
- if ( (i+3) >= length || (string[i+1] & 0xC0) != 0x80
- || (string[i+2] & 0xC0) != 0x80
- || (string[i+3] & 0xC0) != 0x80 ) {
- break; /* Error condition */
- }
- i += 3; /* Skip next 3 bytes */
- newLength += 6; /* 4byte encoding turns into 2 3byte ones */
- } else {
- break; /* Error condition */
- }
- }
- if ( i != length ) {
- /* Error in finding new length, return old length so no conversion */
- /* FIXUP: ERROR_MESSAGE? */
- return length;
- }
- return newLength;
-}
-
-/* Convert Standard UTF-8 to Modified UTF-8.
- * Assumes the UTF-8 encoding was validated by utf8mLength() above.
- *
- * Note: Accepts Modified UTF-8 also, no verification on the
- * correctness of Standard UTF-8 is done. e,g, 0xC080 input is ok.
- */
-void JNICALL
-utf8sToUtf8m(struct UtfInst *ui, jbyte *string, int length, jbyte *newString, int newLength)
-{
- int i;
- int j;
-
- j = 0;
- for ( i = 0 ; i < length ; i++ ) {
- unsigned byte1;
-
- byte1 = (unsigned char)string[i];
-
- /* NULL bytes and bytes starting with 11110xxx are special */
- if ( (byte1 & 0x80) == 0 ) { /* 1byte encoding */
- if ( byte1 == 0 ) {
- /* Bits out: 11000000 10000000 */
- newString[j++] = (jbyte)0xC0;
- newString[j++] = (jbyte)0x80;
- } else {
- /* Single byte */
- newString[j++] = byte1;
- }
- } else if ( (byte1 & 0xE0) == 0xC0 ) { /* 2byte encoding */
- newString[j++] = byte1;
- newString[j++] = string[++i];
- } else if ( (byte1 & 0xF0) == 0xE0 ) { /* 3byte encoding */
- newString[j++] = byte1;
- newString[j++] = string[++i];
- newString[j++] = string[++i];
- } else if ( (byte1 & 0xF8) == 0xF0 ) { /* 4byte encoding */
- /* Beginning of 4byte encoding, turn into 2 3byte encodings */
- unsigned byte2, byte3, byte4, u21;
-
- /* Bits in: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
- byte2 = (unsigned char)string[++i];
- byte3 = (unsigned char)string[++i];
- byte4 = (unsigned char)string[++i];
- /* Reconstruct full 21bit value */
- u21 = (byte1 & 0x07) << 18;
- u21 += (byte2 & 0x3F) << 12;
- u21 += (byte3 & 0x3F) << 6;
- u21 += (byte4 & 0x3F);
- /* Bits out: 11101101 1010xxxx 10xxxxxx */
- newString[j++] = (jbyte)0xED;
- newString[j++] = (jbyte)(0xA0 + (((u21 >> 16) - 1) & 0x0F));
- newString[j++] = (jbyte)(0x80 + ((u21 >> 10) & 0x3F));
- /* Bits out: 11101101 1011xxxx 10xxxxxx */
- newString[j++] = (jbyte)0xED;
- newString[j++] = (jbyte)(0xB0 + ((u21 >> 6) & 0x0F));
- newString[j++] = byte4;
- }
- }
- UTF_ASSERT(i==length);
- UTF_ASSERT(j==newLength);
- newString[j] = (jbyte)0;
-}
-
-/* Given a Modified UTF-8 string, calculate the Standard UTF-8 length.
- * Basic validation of the UTF encoding rules is done, and length is
- * returned (no change) when errors are detected.
- *
- * Note: No validation is made that this is indeed Modified UTF-8 coming in.
- *
- */
-int JNICALL
-utf8mToUtf8sLength(struct UtfInst *ui, jbyte *string, int length)
-{
- int newLength;
- int i;
-
- newLength = 0;
- for ( i = 0 ; i < length ; i++ ) {
- unsigned byte1, byte2, byte3, byte4, byte5, byte6;
-
- byte1 = (unsigned char)string[i];
- if ( (byte1 & 0x80) == 0 ) { /* 1byte encoding */
- newLength++;
- } else if ( (byte1 & 0xE0) == 0xC0 ) { /* 2byte encoding */
- /* Check encoding of following bytes */
- if ( (i+1) >= length || (string[i+1] & 0xC0) != 0x80 ) {
- break; /* Error condition */
- }
- byte2 = (unsigned char)string[++i];
- if ( byte1 != 0xC0 || byte2 != 0x80 ) {
- newLength += 2; /* Normal 2byte encoding, not 0xC080 */
- } else {
- newLength++; /* We will turn 0xC080 into 0 */
- }
- } else if ( (byte1 & 0xF0) == 0xE0 ) { /* 3byte encoding */
- /* Check encoding of following bytes */
- if ( (i+2) >= length || (string[i+1] & 0xC0) != 0x80
- || (string[i+2] & 0xC0) != 0x80 ) {
- break; /* Error condition */
- }
- byte2 = (unsigned char)string[++i];
- byte3 = (unsigned char)string[++i];
- newLength += 3;
- /* Possible process a second 3byte encoding */
- if ( (i+3) < length && byte1 == 0xED && (byte2 & 0xF0) == 0xA0 ) {
- /* See if this is a pair of 3byte encodings */
- byte4 = (unsigned char)string[i+1];
- byte5 = (unsigned char)string[i+2];
- byte6 = (unsigned char)string[i+3];
- if ( byte4 == 0xED && (byte5 & 0xF0) == 0xB0 ) {
- /* Check encoding of 3rd byte */
- if ( (byte6 & 0xC0) != 0x80 ) {
- break; /* Error condition */
- }
- newLength++; /* New string will have 4byte encoding */
- i += 3; /* Skip next 3 bytes */
- }
- }
- } else {
- break; /* Error condition */
- }
- }
- if ( i != length ) {
- /* Error in UTF encoding */
- /* FIXUP: ERROR_MESSAGE()? */
- return length;
- }
- return newLength;
-}
-
-/* Convert a Modified UTF-8 string into a Standard UTF-8 string
- * It is assumed that this string has been validated in terms of the
- * basic UTF encoding rules by utf8Length() above.
- *
- * Note: No validation is made that this is indeed Modified UTF-8 coming in.
- *
- */
-void JNICALL
-utf8mToUtf8s(struct UtfInst *ui, jbyte *string, int length, jbyte *newString, int newLength)
-{
- int i;
- int j;
-
- j = 0;
- for ( i = 0 ; i < length ; i++ ) {
- unsigned byte1, byte2, byte3, byte4, byte5, byte6;
-
- byte1 = (unsigned char)string[i];
- if ( (byte1 & 0x80) == 0 ) { /* 1byte encoding */
- /* Single byte */
- newString[j++] = byte1;
- } else if ( (byte1 & 0xE0) == 0xC0 ) { /* 2byte encoding */
- byte2 = (unsigned char)string[++i];
- if ( byte1 != 0xC0 || byte2 != 0x80 ) {
- newString[j++] = byte1;
- newString[j++] = byte2;
- } else {
- newString[j++] = 0;
- }
- } else if ( (byte1 & 0xF0) == 0xE0 ) { /* 3byte encoding */
- byte2 = (unsigned char)string[++i];
- byte3 = (unsigned char)string[++i];
- if ( i+3 < length && byte1 == 0xED && (byte2 & 0xF0) == 0xA0 ) {
- /* See if this is a pair of 3byte encodings */
- byte4 = (unsigned char)string[i+1];
- byte5 = (unsigned char)string[i+2];
- byte6 = (unsigned char)string[i+3];
- if ( byte4 == 0xED && (byte5 & 0xF0) == 0xB0 ) {
- unsigned u21;
-
- /* Bits in: 11101101 1010xxxx 10xxxxxx */
- /* Bits in: 11101101 1011xxxx 10xxxxxx */
- i += 3;
-
- /* Reconstruct 21 bit code */
- u21 = ((byte2 & 0x0F) + 1) << 16;
- u21 += (byte3 & 0x3F) << 10;
- u21 += (byte5 & 0x0F) << 6;
- u21 += (byte6 & 0x3F);
-
- /* Bits out: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
-
- /* Convert to 4byte encoding */
- newString[j++] = 0xF0 + ((u21 >> 18) & 0x07);
- newString[j++] = 0x80 + ((u21 >> 12) & 0x3F);
- newString[j++] = 0x80 + ((u21 >> 6) & 0x3F);
- newString[j++] = 0x80 + (u21 & 0x3F);
- continue;
- }
- }
- /* Normal 3byte encoding */
- newString[j++] = byte1;
- newString[j++] = byte2;
- newString[j++] = byte3;
- }
- }
- UTF_ASSERT(i==length);
- UTF_ASSERT(j==newLength);
- newString[j] = 0;
-}
-
-/* ================================================================= */
-
-#ifdef COMPILE_WITH_UTF_TEST /* Test program */
-
-/*
- * Convert any byte array into a printable string.
- * Returns length or -1 if output overflows.
- */
-static int
-bytesToPrintable(struct UtfInst *ui, char *bytes, int len, char *output, int outputMaxLen)
-{
- int outputLen;
- int i;
-
- UTF_ASSERT(bytes);
- UTF_ASSERT(len>=0);
- UTF_ASSERT(output);
- UTF_ASSERT(outputMaxLen>=0);
-
- outputLen = 0;
- for ( i=0; i<len ; i++ ) {
- unsigned byte;
-
- byte = bytes[i];
- if ( byte <= 0x7f && isprint(byte) && !iscntrl(byte) ) {
- if ( outputLen + 1 >= outputMaxLen ) {
- return -1;
- }
- output[outputLen++] = (char)byte;
- } else {
- if ( outputLen + 4 >= outputMaxLen ) {
- return -1;
- }
- (void)sprintf(output+outputLen,"\\x%02x",byte);
- outputLen += 4;
- }
- }
- output[outputLen] = 0;
- return outputLen;
-}
-
-static void
-test(void)
-{
- static char *strings[] = {
- "characters",
- "abcdefghijklmnopqrstuvwxyz",
- "0123456789",
- "!@#$%^&*()_+=-{}[]:;",
- NULL };
- int i;
- struct UtfInst *ui;
-
- ui = utfInitialize(NULL);
-
- i = 0;
- while ( strings[i] != NULL ) {
- char *str;
- #define MAX 1024
- char buf0[MAX];
- char buf1[MAX];
- char buf2[MAX];
- unsigned short buf3[MAX];
- int len1;
- int len2;
- int len3;
-
- str = strings[i];
-
- (void)bytesToPrintable(ui, str, (int)strlen(str), buf0, 1024);
-
- len1 = utf8FromPlatform(ui, str, (int)strlen(str), (jbyte*)buf1, 1024);
-
- UTF_ASSERT(len1==(int)strlen(str));
-
- len3 = utf8ToUtf16(ui, (jbyte*)buf1, len1, (jchar*)buf3, 1024);
-
- UTF_ASSERT(len3==len1);
-
- len1 = utf16ToUtf8m(ui, (jchar*)buf3, len3, (jbyte*)buf1, 1024);
-
- UTF_ASSERT(len1==len3);
- UTF_ASSERT(strcmp(str, buf1) == 0);
-
- len2 = utf8ToPlatform(ui, (jbyte*)buf1, len1, buf2, 1024);
-
- UTF_ASSERT(len2==len1);
- UTF_ASSERT(strcmp(str, buf2) == 0);
-
- i++;
- }
-
- utfTerminate(ui, NULL);
-
-}
-
-int
-main(int argc, char **argv)
-{
- test();
- return 0;
-}
-
-#endif
--- a/jdk/src/share/npt/utf.h Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* Routines for various UTF conversions */
-
-#ifndef _UTF_H
-#define _UTF_H
-
-#include <stdio.h>
-
-#include "jni.h"
-#include "utf_md.h"
-
-/* Use THIS_FILE when it is available. */
-#ifndef THIS_FILE
- #define THIS_FILE __FILE__
-#endif
-
-/* Error and assert macros */
-#define UTF_ERROR(m) utfError(THIS_FILE, __LINE__, m)
-#define UTF_ASSERT(x) ( (x)==0 ? UTF_ERROR("ASSERT ERROR " #x) : (void)0 )
-
-void utfError(char *file, int line, char *message);
-
-struct UtfInst* JNICALL utfInitialize
- (char *options);
-void JNICALL utfTerminate
- (struct UtfInst *ui, char *options);
-int JNICALL utf8ToPlatform
- (struct UtfInst *ui, jbyte *utf8,
- int len, char *output, int outputMaxLen);
-int JNICALL utf8FromPlatform
- (struct UtfInst *ui, char *str, int len,
- jbyte *output, int outputMaxLen);
-int JNICALL utf8ToUtf16
- (struct UtfInst *ui, jbyte *utf8, int len,
- jchar *output, int outputMaxLen);
-int JNICALL utf16ToUtf8m
- (struct UtfInst *ui, jchar *utf16, int len,
- jbyte *output, int outputMaxLen);
-int JNICALL utf16ToUtf8s
- (struct UtfInst *ui, jchar *utf16, int len,
- jbyte *output, int outputMaxLen);
-int JNICALL utf8sToUtf8mLength
- (struct UtfInst *ui, jbyte *string, int length);
-void JNICALL utf8sToUtf8m
- (struct UtfInst *ui, jbyte *string, int length,
- jbyte *new_string, int new_length);
-int JNICALL utf8mToUtf8sLength
- (struct UtfInst *ui, jbyte *string, int length);
-void JNICALL utf8mToUtf8s
- (struct UtfInst *ui, jbyte *string, int length,
- jbyte *new_string, int new_length);
-
-#endif
--- a/jdk/src/solaris/npt/npt_md.h Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* Native Platform Toolkit */
-
-#ifndef _NPT_MD_H
-#define _NPT_MD_H
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <dlfcn.h>
-#include <jvm_md.h>
-
-#define NPT_LIBNAME "npt"
-
-#define NPT_INITIALIZE(path,pnpt,version,options) \
- { \
- void *_handle; \
- void *_sym; \
- \
- if ( (pnpt) == NULL ) NPT_ERROR("NptEnv* is NULL"); \
- *(pnpt) = NULL; \
- _handle = dlopen(path, RTLD_LAZY); \
- if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \
- _sym = dlsym(_handle, "nptInitialize"); \
- if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \
- ((NptInitialize)_sym)((pnpt), version, (options)); \
- if ( (*(pnpt)) == NULL ) NPT_ERROR("Cannot initialize NptEnv"); \
- (*(pnpt))->libhandle = _handle; \
- }
-
-#define NPT_TERMINATE(npt,options) \
- { \
- void *_handle; \
- void *_sym; \
- \
- if ( (npt) == NULL ) NPT_ERROR("NptEnv* is NULL"); \
- _handle = (npt)->libhandle; \
- _sym = dlsym(_handle, "nptTerminate"); \
- if ( _sym == NULL ) NPT_ERROR("Cannot find nptTerminate"); \
- ((NptTerminate)_sym)((npt), (options)); \
- if ( _handle != NULL ) (void)dlclose(_handle); \
- }
-
-
-#endif
--- a/jdk/src/solaris/npt/utf_md.c Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-#include <langinfo.h>
-#include <iconv.h>
-
-#include "utf.h"
-
-/* Global variables */
-
-/*
- * Initialize all utf processing.
- */
-struct UtfInst *JNICALL
-utfInitialize(char *options)
-{
- struct UtfInst *ui;
- char *codeset;
-
- ui = (struct UtfInst*)calloc(sizeof(struct UtfInst), 1);
- ui->iconvToPlatform = (void *)-1;
- ui->iconvFromPlatform = (void *)-1;
-
- /* Set the locale from the environment */
- (void)setlocale(LC_ALL, "");
-
- /* Get the codeset name */
- codeset = (char*)nl_langinfo(CODESET);
- if ( codeset == NULL || codeset[0] == 0 ) {
- return ui;
- }
-
- /* If we don't need this, skip it */
- if (strcmp(codeset, "UTF-8") == 0 || strcmp(codeset, "utf8") == 0 ) {
- return ui;
- }
-
- /* Open conversion descriptors */
- ui->iconvToPlatform = iconv_open(codeset, "UTF-8");
- if ( ui->iconvToPlatform == (void *)-1 ) {
- UTF_ERROR("Failed to complete iconv_open() setup");
- }
- ui->iconvFromPlatform = iconv_open("UTF-8", codeset);
- if ( ui->iconvFromPlatform == (void *)-1 ) {
- UTF_ERROR("Failed to complete iconv_open() setup");
- }
- return ui;
-}
-
-/*
- * Terminate all utf processing
- */
-void JNICALL
-utfTerminate(struct UtfInst *ui, char *options)
-{
- if ( ui->iconvFromPlatform != (void *)-1 ) {
- (void)iconv_close(ui->iconvFromPlatform);
- }
- if ( ui->iconvToPlatform != (void *)-1 ) {
- (void)iconv_close(ui->iconvToPlatform);
- }
- ui->iconvToPlatform = (void *)-1;
- ui->iconvFromPlatform = (void *)-1;
- (void)free(ui);
-}
-
-/*
- * Do iconv() conversion.
- * Returns length or -1 if output overflows.
- */
-static int
-iconvConvert(iconv_t ic, char *bytes, int len, char *output, int outputMaxLen)
-{
- int outputLen = 0;
-
- UTF_ASSERT(bytes);
- UTF_ASSERT(len>=0);
- UTF_ASSERT(output);
- UTF_ASSERT(outputMaxLen>len);
-
- output[0] = 0;
- outputLen = 0;
-
- if ( ic != (iconv_t)(void *)-1 ) {
- int returnValue;
- size_t inLeft;
- size_t outLeft;
- char *inbuf;
- char *outbuf;
-
- inbuf = bytes;
- outbuf = output;
- inLeft = len;
- outLeft = outputMaxLen;
- returnValue = iconv(ic, (void*)&inbuf, &inLeft, &outbuf, &outLeft);
- if ( returnValue >= 0 && inLeft==0 ) {
- outputLen = outputMaxLen-outLeft;
- output[outputLen] = 0;
- return outputLen;
- }
-
- /* Failed to do the conversion */
- return -1;
- }
-
- /* Just copy bytes */
- outputLen = len;
- (void)memcpy(output, bytes, len);
- output[len] = 0;
- return outputLen;
-}
-
-/*
- * Convert UTF-8 to Platform Encoding.
- * Returns length or -1 if output overflows.
- */
-int JNICALL
-utf8ToPlatform(struct UtfInst*ui, jbyte *utf8, int len, char *output, int outputMaxLen)
-{
- /* Negative length is an error */
- if ( len < 0 ) {
- return -1;
- }
-
- /* Zero length is ok, but we don't need to do much */
- if ( len == 0 ) {
- output[0] = 0;
- return 0;
- }
-
- return iconvConvert(ui->iconvToPlatform, (char*)utf8, len, output, outputMaxLen);
-}
-
-/*
- * Convert Platform Encoding to UTF-8.
- * Returns length or -1 if output overflows.
- */
-int JNICALL
-utf8FromPlatform(struct UtfInst*ui, char *str, int len, jbyte *output, int outputMaxLen)
-{
- /* Negative length is an error */
- if ( len < 0 ) {
- return -1;
- }
-
- /* Zero length is ok, but we don't need to do much */
- if ( len == 0 ) {
- output[0] = 0;
- return 0;
- }
-
- return iconvConvert(ui->iconvFromPlatform, str, len, (char*)output, outputMaxLen);
-}
--- a/jdk/src/solaris/npt/utf_md.h Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#ifndef _UTF_MD_H
-#define _UTF_MD_H
-
-struct UtfInst {
- void *iconvToPlatform;
- void *iconvFromPlatform;
-};
-
-#endif
--- a/jdk/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,11 +59,16 @@
numBytes = (*env)->GetArrayLength(env, randArray);
randBytes = (*env)->GetByteArrayElements(env, randArray, NULL);
+ if (randBytes == NULL) {
+ goto cleanup;
+ }
+
if (CryptGenRandom(hCryptProv, numBytes, randBytes)) {
result = JNI_TRUE;
}
(*env)->ReleaseByteArrayElements(env, randArray, randBytes, 0);
+cleanup:
CryptReleaseContext(hCryptProv, 0);
return result;
--- a/jdk/src/windows/npt/npt_md.h Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* Native Platform Toolkit */
-
-#ifndef _NPT_MD_H
-#define _NPT_MD_H
-
-#include <windows.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#define NPT_LIBNAME "npt"
-
-#define NPT_INITIALIZE(path,pnpt,version,options) \
- { \
- void *_handle; \
- void *_sym; \
- \
- if ( (pnpt) == NULL ) NPT_ERROR("NptEnv* is NULL"); \
- *(pnpt) = NULL; \
- _handle = LoadLibrary(path); \
- if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \
- _sym = GetProcAddress(_handle, "nptInitialize"); \
- if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \
- ((NptInitialize)_sym)((pnpt), version, (options)); \
- if ( *(pnpt) == NULL ) NPT_ERROR("Cannot initialize NptEnv"); \
- (*(pnpt))->libhandle = _handle; \
- }
-
-#define NPT_TERMINATE(npt,options) \
- { \
- void *_handle; \
- void *_sym; \
- \
- if ( (npt) == NULL ) NPT_ERROR("NptEnv* is NULL"); \
- _handle = (npt)->libhandle; \
- if ( _handle == NULL ) NPT_ERROR("npt->libhandle is NULL"); \
- _sym = GetProcAddress(_handle, "nptTerminate"); \
- if ( _sym == NULL ) NPT_ERROR("Cannot find nptTerminate"); \
- ((NptTerminate)_sym)((npt), (options)); \
- (void)FreeLibrary(_handle); \
- }
-
-#endif
--- a/jdk/src/windows/npt/utf_md.c Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include "utf.h"
-
-#include <windows.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-/*
- * Initialize all utf processing.
- */
-struct UtfInst * JNICALL
-utfInitialize(char *options)
-{
- struct UtfInst *ui;
- LANGID langID;
- LCID localeID;
- TCHAR strCodePage[7]; // ANSI code page id
-
- ui = (struct UtfInst*)calloc(sizeof(struct UtfInst), 1);
-
- /*
- * Get the code page for this locale
- */
- langID = LANGIDFROMLCID(GetUserDefaultLCID());
- localeID = MAKELCID(langID, SORT_DEFAULT);
- if (GetLocaleInfo(localeID, LOCALE_IDEFAULTANSICODEPAGE,
- strCodePage, sizeof(strCodePage)/sizeof(TCHAR)) > 0 ) {
- ui->platformCodePage = atoi(strCodePage);
- } else {
- ui->platformCodePage = GetACP();
- }
- return ui;
-}
-
-/*
- * Terminate all utf processing
- */
-void JNICALL
-utfTerminate(struct UtfInst *ui, char *options)
-{
- (void)free(ui);
-}
-
-/*
- * Get wide string (assumes len>0)
- */
-static WCHAR*
-getWideString(UINT codePage, char* str, int len, int *pwlen)
-{
- int wlen;
- WCHAR* wstr;
-
- /* Convert the string to WIDE string */
- wlen = MultiByteToWideChar(codePage, 0, str, len, NULL, 0);
- *pwlen = wlen;
- if (wlen <= 0) {
- UTF_ERROR(("Can't get WIDE string length"));
- return NULL;
- }
- wstr = (WCHAR*)malloc(wlen * sizeof(WCHAR));
- if (wstr == NULL) {
- UTF_ERROR(("Can't malloc() any space"));
- return NULL;
- }
- if (MultiByteToWideChar(codePage, 0, str, len, wstr, wlen) == 0) {
- UTF_ERROR(("Can't get WIDE string"));
- return NULL;
- }
- return wstr;
-}
-
-/*
- * Convert UTF-8 to a platform string
- */
-int JNICALL
-utf8ToPlatform(struct UtfInst *ui, jbyte *utf8, int len, char* output, int outputMaxLen)
-{
- int wlen;
- int plen;
- WCHAR* wstr;
-
- /* Negative length is an error */
- if ( len < 0 ) {
- return -1;
- }
-
- /* Zero length is ok, but we don't need to do much */
- if ( len == 0 ) {
- output[0] = 0;
- return 0;
- }
-
- /* Get WIDE string version (assumes len>0) */
- wstr = getWideString(CP_UTF8, (char*)utf8, len, &wlen);
- if ( wstr == NULL ) {
- return -1;
- }
-
- /* Convert WIDE string to MultiByte string */
- plen = WideCharToMultiByte(ui->platformCodePage, 0, wstr, wlen,
- output, outputMaxLen, NULL, NULL);
- free(wstr);
- if (plen <= 0) {
- UTF_ERROR(("Can't convert WIDE string to multi-byte"));
- return -1;
- }
- output[plen] = '\0';
- return plen;
-}
-
-/*
- * Convert Platform Encoding to UTF-8.
- */
-int JNICALL
-utf8FromPlatform(struct UtfInst *ui, char *str, int len, jbyte *output, int outputMaxLen)
-{
- int wlen;
- int plen;
- WCHAR* wstr;
-
- /* Negative length is an error */
- if ( len < 0 ) {
- return -1;
- }
-
- /* Zero length is ok, but we don't need to do much */
- if ( len == 0 ) {
- output[0] = 0;
- return 0;
- }
-
- /* Get WIDE string version (assumes len>0) */
- wstr = getWideString(ui->platformCodePage, str, len, &wlen);
- if ( wstr == NULL ) {
- return -1;
- }
-
- /* Convert WIDE string to UTF-8 string */
- plen = WideCharToMultiByte(CP_UTF8, 0, wstr, wlen,
- (char*)output, outputMaxLen, NULL, NULL);
- free(wstr);
- if (plen <= 0) {
- UTF_ERROR(("Can't convert WIDE string to multi-byte"));
- return -1;
- }
- output[plen] = '\0';
- return plen;
-}
--- a/jdk/src/windows/npt/utf_md.h Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#ifndef _UTF_MD_H
-#define _UTF_MD_H
-
-struct UtfInst {
- unsigned int platformCodePage;
-};
-
-#endif
--- a/jdk/test/sun/tools/jhat/HatHeapDump1Test.java Mon Jun 16 13:47:42 2014 -0400
+++ b/jdk/test/sun/tools/jhat/HatHeapDump1Test.java Mon Jun 16 13:48:58 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,31 +21,68 @@
* questions.
*/
+import java.io.File;
+import java.util.Arrays;
-/* @test HatHeapDump1Test.java
+import jdk.testlibrary.Asserts;
+import jdk.testlibrary.JDKToolLauncher;
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+/* @test
* @bug 5102009
- * @summary Test jhat
- *
- * @compile -g HelloWorld.java HatRun.java
- * @build HatHeapDump1Test
- * @run main HatHeapDump1Test HelloWorld
+ * @summary Sanity test of jhat functionality
+ * @library /lib/testlibrary
+ * @build jdk.testlibarary.*
+ * @compile -g HelloWorld.java
+ * @run main HatHeapDump1Test
*/
+public class HatHeapDump1Test {
-public class HatHeapDump1Test {
+ private static final String TEST_CLASSES = System.getProperty("test.classes", ".");
public static void main(String args[]) throws Exception {
- HatRun run;
+ String className = "HelloWorld";
+ File dumpFile = new File(className + ".hdump");
+
+ // Generate a heap dump
+ ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder("-cp",
+ TEST_CLASSES,
+ "-Xcheck:jni",
+ "-Xverify:all",
+ "-agentlib:hprof=heap=dump,format=b,file=" + dumpFile.getAbsolutePath(),
+ className);
+ OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+ System.out.println(output.getOutput());
+ output.shouldHaveExitValue(0);
+ output.shouldContain("Dumping Java heap ... done");
+ Asserts.assertTrue(dumpFile.exists() && dumpFile.isFile(), "Invalid dump file " + dumpFile.getAbsolutePath());
- /* Run hprof and jhat */
- run = new HatRun("heap=dump", "");
- run.runit(args[0]);
+ // Run jhat to analyze the heap dump
+ output = jhat("-debug", "2", dumpFile.getAbsolutePath());
+ output.shouldHaveExitValue(0);
+ output.shouldContain("Snapshot resolved");
+ output.shouldContain("-debug 2 was used");
+ output.shouldNotContain("ERROR");
- /* Make sure patterns in output look ok */
- if (run.output_contains("ERROR")) {
- throw new RuntimeException("Test failed - ERROR seen in output");
+ dumpFile.delete();
+ }
+
+ private static OutputAnalyzer jhat(String... toolArgs) throws Exception {
+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhat");
+ if (toolArgs != null) {
+ for (String toolArg : toolArgs) {
+ launcher.addToolArg(toolArg);
+ }
}
- /* Must be a pass. */
- System.out.println("Test passed - cleanly terminated");
+ ProcessBuilder processBuilder = new ProcessBuilder();
+ processBuilder.command(launcher.getCommand());
+ System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
+ OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
+ System.out.println(output.getOutput());
+
+ return output;
}
+
}
--- a/jdk/test/sun/tools/jhat/HatRun.java Mon Jun 16 13:47:42 2014 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- *
- * Support classes for running jhat tests
- *
- */
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.File;
-import java.io.BufferedInputStream;
-import java.io.PrintStream;
-
-/*
- * Helper class to direct process output to a StringBuffer
- */
-class MyInputStream implements Runnable {
- private String name;
- private BufferedInputStream in;
- private StringBuffer buffer;
-
- /* Create MyInputStream that saves all output to a StringBuffer */
- MyInputStream(String name, InputStream in) {
- this.name = name;
- this.in = new BufferedInputStream(in);
- buffer = new StringBuffer(4096);
- Thread thr = new Thread(this);
- thr.setDaemon(true);
- thr.start();
- }
-
- /* Dump the buffer */
- void dump(PrintStream x) {
- String str = buffer.toString();
- x.println("<beginning of " + name + " buffer>");
- x.println(str);
- x.println("<end of buffer>");
- }
-
- /* Check to see if a pattern is inside the output. */
- boolean contains(String pattern) {
- String str = buffer.toString();
- return str.contains(pattern);
- }
-
- /* Runs as a separate thread capturing all output in a StringBuffer */
- public void run() {
- try {
- byte b[] = new byte[100];
- for (;;) {
- int n = in.read(b);
- String str;
- if (n < 0) {
- break;
- }
- str = new String(b, 0, n);
- buffer.append(str);
- System.out.print(str);
- }
- } catch (IOException ioe) { /* skip */ }
- }
-}
-
-/*
- * Main jhat run
- */
-public class HatRun {
-
- private String all_hprof_options;
- private String all_hat_options;
- private String dumpfile;
- private MyInputStream output;
- private MyInputStream error;
-
- /* Create a Hat run process */
- public HatRun(String hprof_options, String hat_options)
- {
- all_hprof_options = hprof_options;
- all_hat_options = hat_options;
- }
-
- /*
- * Execute a process with an -agentpath or -agentlib command option
- */
- public void runit(String class_name)
- {
- runit(class_name, null);
- }
-
- /*
- * Execute a command.
- */
- private void execute(String cmd[])
- {
- /* Begin process */
- Process p;
- String cmdLine = "";
- int i;
-
- for ( i = 0 ; i < cmd.length; i++ ) {
- cmdLine += cmd[i];
- cmdLine += " ";
- }
- System.out.println("Starting: " + cmdLine);
-
- try {
- p = Runtime.getRuntime().exec(cmd);
- } catch ( IOException e ) {
- throw new RuntimeException("Test failed - exec got IO exception");
- }
-
- /* Save process output in StringBuffers */
- output = new MyInputStream("Input Stream", p.getInputStream());
- error = new MyInputStream("Error Stream", p.getErrorStream());
-
- /* Wait for process to complete, and if exit code is non-zero we fail */
- try {
- int exitStatus;
- exitStatus = p.waitFor();
- if ( exitStatus != 0) {
- System.out.println("Exit code is " + exitStatus);
- error.dump(System.out);
- output.dump(System.out);
- throw new RuntimeException("Test failed - " +
- "exit return code non-zero " +
- "(exitStatus==" + exitStatus + ")");
- }
- } catch ( InterruptedException e ) {
- throw new RuntimeException("Test failed - process interrupted");
- }
- System.out.println("Completed: " + cmdLine);
- }
-
- /*
- * Execute a process with an -agentpath or -agentlib command option
- * plus any set of other java options.
- */
- public void runit(String class_name, String vm_options[])
- {
- String jre_home = System.getProperty("java.home");
- String sdk_home = (jre_home.endsWith("jre") ?
- (jre_home + File.separator + "..") :
- jre_home );
- String cdir = System.getProperty("test.classes", ".");
- String os_arch = System.getProperty("os.arch");
- String os_name = System.getProperty("os.name");
- String java = jre_home
- + File.separator + "bin"
- + File.separator + "java";
- String jhat = sdk_home + File.separator + "bin"
- + File.separator + "jhat";
- /* Array of strings to be passed in for exec:
- * 1. java
- * 2. -Dtest.classes=.
- * 3. -Xcheck:jni (Just because it finds bugs)
- * 4. -Xverify:all (Make sure verification is on full blast)
- * 5. -agent
- * vm_options
- * 6+i. classname
- */
- int nvm_options = 0;
- if ( vm_options != null ) nvm_options = vm_options.length;
- String cmd[] = new String[1 + 7 + nvm_options];
- int i,j;
-
- i = 0;
- cmd[i++] = java;
- cmd[i++] = "-cp";
- cmd[i++] = cdir;
- cmd[i++] = "-Dtest.classes=" + cdir;
- cmd[i++] = "-Xcheck:jni";
- cmd[i++] = "-Xverify:all";
- dumpfile= cdir + File.separator + class_name + ".hdump";
- cmd[i++] = "-agentlib:hprof=" + all_hprof_options
- + ",format=b,file=" + dumpfile;
- /* Add any special VM options */
- for ( j = 0; j < nvm_options; j++ ) {
- cmd[i++] = vm_options[j];
- }
- /* Add classname */
- cmd[i++] = class_name;
-
- /* Execute process */
- execute(cmd);
-
- /* Run jhat */
- String jhat_cmd[] = new String[4];
- jhat_cmd[0] = jhat;
- jhat_cmd[1] = "-debug";
- jhat_cmd[2] = "2";
- jhat_cmd[3] = dumpfile;
-
- /* Execute process */
- execute(jhat_cmd);
-
- }
-
- /* Does the pattern appear in the output of this process */
- public boolean output_contains(String pattern)
- {
- return output.contains(pattern) || error.contains(pattern);
- }
-}