--- a/usr/src/java/rad/org/opensolaris/os/rad/ADRName.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/rad/org/opensolaris/os/rad/ADRName.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,20 +20,14 @@
*/
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.rad;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
+import java.util.*;
+import java.util.logging.*;
+import javax.management.*;
public class ADRName {
private String domain_;
@@ -138,7 +132,7 @@
* below we cons up a String so that ObjectName(String) can then
* immediately undo our work and parse it.
*/
- StringBuffer sb = new StringBuffer(domain_).append(':');
+ StringBuilder sb = new StringBuilder(domain_).append(':');
boolean first = true;
for (String key : keys_) {
if (first)
--- a/usr/src/java/util/org/opensolaris/os/vp/util/cli/HelpFormatter.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/cli/HelpFormatter.java Mon Mar 28 10:53:34 2011 -0400
@@ -72,7 +72,7 @@
OptionElement[] options = getOptionElements();
OptionFormatter formatter = usage.getOptionFormatter();
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
int width = usage.getWidth();
buffer.append(usage.getUsage()).
--- a/usr/src/java/util/org/opensolaris/os/vp/util/cli/OptionFormatter.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/cli/OptionFormatter.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.util.cli;
@@ -72,7 +71,7 @@
private String getFormatted(Option opt, boolean allNames,
boolean showGroup, boolean required) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
if (!required) {
buffer.append(OPT_REQUIRED_ENCLOSE_LEFT);
--- a/usr/src/java/util/org/opensolaris/os/vp/util/cli/PosixOptionFormatter.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/cli/PosixOptionFormatter.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.util.cli;
@@ -48,7 +47,7 @@
@Override
public String getFormatted(String[] opts, String optArg) {
String separator = "";
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < opts.length; i++) {
String opt = opts[i];
--- a/usr/src/java/util/org/opensolaris/os/vp/util/cli/UsageFormatter.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/cli/UsageFormatter.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.util.cli;
@@ -117,7 +117,7 @@
String.format("%" + getIndent() + "s", "");
int width = getWidth();
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0, n = options.size(); i < n; i++) {
Option o = options.get(i);
if (o.isDocumented()) {
--- a/usr/src/java/util/org/opensolaris/os/vp/util/misc/DataSizeUtil.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/misc/DataSizeUtil.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.util.misc;
@@ -197,7 +197,7 @@
DataSize dataSize = getDataSize(bytes, precision, units, unit);
// Build format string
- StringBuffer pattern = new StringBuffer();
+ StringBuilder pattern = new StringBuilder();
pattern.append(useCommas ? "#,##0" : "###0");
char formatChar =
(forcePrecision && dataSize.unitsIndex != 0) ? '0' : '#';
--- a/usr/src/java/util/org/opensolaris/os/vp/util/misc/LibraryUtil.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/misc/LibraryUtil.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,15 +20,13 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.util.misc;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.io.File;
+import java.net.*;
import java.security.CodeSource;
/**
@@ -100,7 +98,7 @@
static private void loadLibrary(LibraryLoader loader, String paths[],
String name, boolean debug)
{
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append("Unable to find ").append(name).append(':');
for (String p : paths) {
--- a/usr/src/java/util/org/opensolaris/os/vp/util/misc/MathUtil.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/misc/MathUtil.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.util.misc;
@@ -52,7 +51,7 @@
}
public static String toBinary(long l, int bits) {
- StringBuffer buffer = new StringBuffer(bits);
+ StringBuilder buffer = new StringBuilder(bits);
for (int i = 0; i < bits; i++) {
buffer.insert(0, l & 1);
--- a/usr/src/java/util/org/opensolaris/os/vp/util/misc/TextUtil.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/misc/TextUtil.java Mon Mar 28 10:53:34 2011 -0400
@@ -62,7 +62,7 @@
* and {@code maxLen}.
*/
public static String getRandomAlphaString(int minLen, int maxLen) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
int length = (int)(Math.random() * (maxLen - minLen + 1)) + minLen;
for (int j = 0; j < length; j++) {
char c = (char)((Math.random() * 26) + 97);
@@ -76,7 +76,7 @@
* equivalents.
*/
public static String escapeHTMLChars(String text) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (char c : text.toCharArray()) {
switch (c) {
@@ -148,7 +148,7 @@
// Replace newlines
text = text.replaceAll("\\s*[\\r\\n]\\s*", " ");
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
String indent = indent1;
int w = width - indent.length();
@@ -210,7 +210,7 @@
}
public static String join(String delim, Object... list) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < list.length; i++) {
if (i != 0 && delim != null) {
@@ -332,7 +332,7 @@
* characters with {@code repl}.
*/
public static String toJavaIdentifier(String str, String repl) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (char c : str.toCharArray()) {
boolean empty = buffer.length() == 0;
if ((empty && Character.isJavaIdentifierStart(c)) ||
@@ -346,7 +346,7 @@
}
public static String toJavaMethodName(String... words) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (String word : words) {
try {
buffer.append(word.substring(0, 1).toUpperCase());
--- a/usr/src/java/util/org/opensolaris/os/vp/util/misc/XMLUtil.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/misc/XMLUtil.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.util.misc;
@@ -31,7 +30,7 @@
public class XMLUtil {
public static String getTextContent(Element element) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
element.normalize();
NodeList children = element.getChildNodes();
@@ -46,7 +45,7 @@
}
public static String getFullPath(Node node) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
while (node != null) {
buffer.insert(0, node.getNodeName());
char separator = '/';
--- a/usr/src/java/util/org/opensolaris/os/vp/util/swing/ThrowableEditorPane.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/swing/ThrowableEditorPane.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.util.swing;
@@ -82,7 +81,7 @@
public void setThrowable(Throwable throwable) {
this.throwable = throwable;
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
while (throwable != null) {
buffer.append("<b>").append(
--- a/usr/src/java/util/org/opensolaris/os/vp/util/swing/WrappingText.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/swing/WrappingText.java Mon Mar 28 10:53:34 2011 -0400
@@ -243,7 +243,7 @@
String text = getText();
// The current line
- StringBuffer line = new StringBuffer();
+ StringBuilder line = new StringBuilder();
// Space that will be added to current line as long as it's not the last
// token in the line
--- a/usr/src/java/util/org/opensolaris/os/vp/util/swing/layout/TableLayout.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/swing/layout/TableLayout.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.util.swing.layout;
@@ -185,7 +184,7 @@
for (int row = 0; row < rows; row++) {
for (int col = 0; col < cols; col++) {
- StringBuffer b = new StringBuffer("<html>");
+ StringBuilder b = new StringBuilder("<html>");
for (int i = 0; i <= row; i++) {
for (int j = 0; j <= col; j++) {
b.append('m');
--- a/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/common/PanelClassLoader.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/common/PanelClassLoader.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.client.common;
@@ -118,7 +118,7 @@
return null;
}
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
Pattern re = Pattern.compile("^(.*?)\\$\\{([^}]*)\\}(.*)");
while (true) {
Matcher matcher = re.matcher(str);
--- a/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/common/RadLoginManager.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/common/RadLoginManager.java Mon Mar 28 10:53:34 2011 -0400
@@ -246,7 +246,7 @@
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = depChain.size() - 1; i >= 0; i--) {
buffer.append(String.format("%d. %s (%s)\n", i,
depChain.get(i), acks.get(i) ? "acknowledged" :
--- a/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/App.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/App.java Mon Mar 28 10:53:34 2011 -0400
@@ -139,7 +139,7 @@
* much less straightforward than what follows.
*/
String[] parts = address.split("=", 2);
- StringBuffer b = new StringBuffer(this.address);
+ StringBuilder b = new StringBuilder(this.address);
b.append(inParam ? "&" : "?");
b.append(URLEncoder.encode(parts[0], Control.ENCODING));
b.append('=');
--- a/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/CertificateEditorPane.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/client/org/opensolaris/os/vp/client/swing/CertificateEditorPane.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.client.swing;
@@ -129,7 +129,7 @@
'9', 'A', 'B', 'C', 'D', 'E', 'F'
};
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < digest.length; i++) {
if (i != 0) {
buffer.append(':');
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/ConnectionInfo.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/ConnectionInfo.java Mon Mar 28 10:53:34 2011 -0400
@@ -133,7 +133,7 @@
@Override
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
if (zone != null) {
buffer.append(toString(zone, zoneUser, zoneRole)).append(", via ");
}
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/control/Control.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/control/Control.java Mon Mar 28 10:53:34 2011 -0400
@@ -672,7 +672,7 @@
* @return an encoded String
*/
public static String encode(String id, Map<String, String> parameters) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
try {
buffer.append(URLEncoder.encode(id, ENCODING));
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/control/Navigator.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/control/Navigator.java Mon Mar 28 10:53:34 2011 -0400
@@ -644,7 +644,7 @@
* Gets the given path as a {@code String}.
*/
public static String getPathString(Iterable<? extends Navigable> path) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (Navigable nav : path) {
buffer.append(PATH_SEPARATOR).append(Control.encode(
--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/view/AuthPanel.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/view/AuthPanel.java Mon Mar 28 10:53:34 2011 -0400
@@ -108,7 +108,7 @@
host = NetUtil.getHostName();
}
- StringBuffer resource = new StringBuffer("auth.text");
+ StringBuilder resource = new StringBuilder("auth.text");
if (shortForm) {
resource.append(".short");
}
--- a/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/CoreUtil.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/CoreUtil.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.coreadm.client.swing;
@@ -68,7 +67,7 @@
{
/* assert(mappings.keySet().containsAll(MAP_REGEX.keySet())); */
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
char[] chars = path.toCharArray();
for (int i = 0; i < chars.length; i++) {
if (i != chars.length - 1 && chars[i] == '%') {
@@ -119,7 +118,7 @@
continue;
}
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
char[] chars = elements[e].toCharArray();
int pos = 0;
boolean isDir = false;
--- a/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/path/PathDocument.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/path/PathDocument.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.coreadm.client.swing.path;
@@ -177,7 +176,7 @@
public String getText() {
int start = -1;
int offset = 0;
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
try {
for (int n = getLength(); offset < n; offset++) {
--- a/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/path/PathField.java Mon Mar 28 10:29:45 2011 -0400
+++ b/usr/src/java/vpanels/panels/coreadm/org/opensolaris/os/vp/panels/coreadm/client/swing/path/PathField.java Mon Mar 28 10:53:34 2011 -0400
@@ -20,8 +20,7 @@
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
*/
package org.opensolaris.os.vp.panels.coreadm.client.swing.path;
@@ -108,7 +107,7 @@
public static void main(String args[]) {
final PathField textPane = new PathField();
// textPane.setFont(new Font("Serif", Font.ITALIC, 36));
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (String token : PathDocument.TOKENS) {
buffer.append(token).append('/');
}