Bug 522083 - Simplify StringUtils classes
Make concat return String directly as it opens the door for moving to
StringBuilder for concatenation and it was not used as buffer anywhere.
Change-Id: Ie81c3995694437ee84806fc9f4d372b2c2f78d80
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java
index 53b1eee..591dd08 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2017 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,12 +41,11 @@
if (bundle == null)
Log.error("Universal Welcome tried accessing a NULL bundle.", null); //$NON-NLS-1$
else {
- String msg = StringUtil
- .concat("Universal Welcome tried accessing Bundle: ", getBundleHeader( //$NON-NLS-1$
- bundle, Constants.BUNDLE_NAME), " vendor: ", //$NON-NLS-1$
- getBundleHeader(bundle, Constants.BUNDLE_VENDOR),
- " bundle state: ", String.valueOf(bundle.getState())).toString(); //$NON-NLS-1$
- Log.error(msg, null);
+ String msg = StringUtil.concat("Universal Welcome tried accessing Bundle: ", getBundleHeader( //$NON-NLS-1$
+ bundle, Constants.BUNDLE_NAME), " vendor: ", //$NON-NLS-1$
+ getBundleHeader(bundle, Constants.BUNDLE_VENDOR), " bundle state: ", //$NON-NLS-1$
+ String.valueOf(bundle.getState()));
+ Log.error(msg, null);
}
return false;
}
@@ -155,9 +154,9 @@
// localLocation can be null if the passed resource could not
// be found relative to the plugin. log fact, return resource,
// as is.
- String msg = StringUtil.concat("Could not find resource: ", //$NON-NLS-1$
- resource, " in ", getBundleHeader( //$NON-NLS-1$
- bundle, Constants.BUNDLE_NAME)).toString();
+ String msg = StringUtil.concat("Could not find resource: ", //$NON-NLS-1$
+ resource, " in ", getBundleHeader( //$NON-NLS-1$
+ bundle, Constants.BUNDLE_NAME));
Log.warning(msg);
return resource;
}
@@ -167,9 +166,9 @@
*/
return toExternalForm(localLocation);
} catch (Exception e) {
- String msg = StringUtil.concat("Failed to load resource: ", //$NON-NLS-1$
- resource, " from ", getBundleHeader(bundle, //$NON-NLS-1$
- Constants.BUNDLE_NAME)).toString();
+ String msg = StringUtil.concat("Failed to load resource: ", //$NON-NLS-1$
+ resource, " from ", getBundleHeader(bundle, //$NON-NLS-1$
+ Constants.BUNDLE_NAME));
Log.error(msg, e);
return resource;
}
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/StringUtil.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/StringUtil.java
index 77eccf0..1d2148b 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/StringUtil.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/StringUtil.java
@@ -12,11 +12,11 @@
public class StringUtil {
- public static StringBuffer concat(String... strings) {
- StringBuffer buffer = new StringBuffer();
+ public static String concat(String... strings) {
+ StringBuilder buffer = new StringBuilder();
for (String string : strings) {
buffer.append(string);
}
- return buffer;
+ return buffer.toString();
}
}
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
index 5c30bed..7a008e2 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2016 IBM Corporation and others.
+ * Copyright (c) 2004, 2017 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -147,7 +147,7 @@
protected boolean doExecute() {
if (Log.logInfo) {
String msg = StringUtil.concat("Running Intro URL action ", action, //$NON-NLS-1$
- " with parameters: ", parameters.toString()).toString(); //$NON-NLS-1$
+ " with parameters: ", parameters.toString()); //$NON-NLS-1$
Log.info(msg);
}
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/util/BundleUtil.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/util/BundleUtil.java
index c2fdc3a..331f5ec 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/util/BundleUtil.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/util/BundleUtil.java
@@ -44,11 +44,10 @@
if (bundle == null)
Log.error("Intro tried accessing a NULL bundle.", null); //$NON-NLS-1$
else {
- String msg = StringUtil
- .concat("Intro tried accessing Bundle: ", getBundleHeader( //$NON-NLS-1$
- bundle, Constants.BUNDLE_NAME), " vendor: ", //$NON-NLS-1$
- getBundleHeader(bundle, Constants.BUNDLE_VENDOR),
- " bundle state: ", String.valueOf(bundle.getState())).toString(); //$NON-NLS-1$
+ String msg = StringUtil.concat("Intro tried accessing Bundle: ", getBundleHeader( //$NON-NLS-1$
+ bundle, Constants.BUNDLE_NAME), " vendor: ", //$NON-NLS-1$
+ getBundleHeader(bundle, Constants.BUNDLE_VENDOR), " bundle state: ", //$NON-NLS-1$
+ String.valueOf(bundle.getState()));
Log.error(msg, null);
}
return false;
@@ -182,9 +181,8 @@
// localLocation can be null if the passed resource could not
// be found relative to the plugin. log fact, return resource,
// as is.
- String msg = StringUtil.concat("Could not find resource: ", //$NON-NLS-1$
- resource, " in ", getBundleHeader( //$NON-NLS-1$
- bundle, Constants.BUNDLE_NAME)).toString();
+ String msg = StringUtil.concat("Could not find resource: ", //$NON-NLS-1$
+ resource, " in ", getBundleHeader(bundle, Constants.BUNDLE_NAME)); //$NON-NLS-1$
Log.warning(msg);
return resource;
}
@@ -194,9 +192,8 @@
*/
return toExternalForm(localLocation);
} catch (Exception e) {
- String msg = StringUtil.concat("Failed to load resource: ", //$NON-NLS-1$
- resource, " from ", getBundleHeader(bundle, //$NON-NLS-1$
- Constants.BUNDLE_NAME)).toString();
+ String msg = StringUtil.concat("Failed to load resource: ", //$NON-NLS-1$
+ resource, " from ", getBundleHeader(bundle, Constants.BUNDLE_NAME)); //$NON-NLS-1$
Log.error(msg, e);
return resource;
}
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/StandbyPart.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/StandbyPart.java
index 9c7e276..0c133a5 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/StandbyPart.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/StandbyPart.java
@@ -288,10 +288,8 @@
if (controlKey.getControl() == null) {
// control is null. This means that interface was not
// implemented properly. log fact.
- String message = StringUtil
- .concat("Standby Content part: ", partId, //$NON-NLS-1$
- " has a null Control defined. This prevents the part from being displayed.") //$NON-NLS-1$
- .toString();
+ String message = StringUtil.concat("Standby Content part: ", partId, //$NON-NLS-1$
+ " has a null Control defined. This prevents the part from being displayed."); //$NON-NLS-1$
Log.error(message, null);
return null;
}
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java
index 8da253c..62641f7 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java
@@ -154,11 +154,10 @@
String embddedLink = html.getSrc();
if (embddedLink == null)
break;
- String linkText = StringUtil
- .concat(
- "<p><a href=\"http://org.eclipse.ui.intro/openBrowser?url=", //$NON-NLS-1$
- embddedLink, "\">", //$NON-NLS-1$
- Messages.HTML_embeddedLink, "</a></p>").toString(); //$NON-NLS-1$
+ String linkText = StringUtil.concat(
+ "<p><a href=\"http://org.eclipse.ui.intro/openBrowser?url=", //$NON-NLS-1$
+ embddedLink, "\">", //$NON-NLS-1$
+ Messages.HTML_embeddedLink, "</a></p>"); //$NON-NLS-1$
linkText = generateFormText(linkText);
c = createFormText(parent, linkText, null);
}
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java
index 18f01b6..dd6a8f2 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2016 IBM Corporation and others.
+ * Copyright (c) 2004, 2017 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -323,8 +323,7 @@
*/
private Label createHoverLabel(Composite body) {
Label label = toolkit.createLabel(body, "", SWT.WRAP); //$NON-NLS-1$
- String key = StringUtil.concat(rootPage.getId(), ".", "hover-text.fg") //$NON-NLS-1$ //$NON-NLS-2$
- .toString();
+ String key = StringUtil.concat(rootPage.getId(), ".", "hover-text.fg"); //$NON-NLS-1$ //$NON-NLS-2$
Color fg = rootPageStyleManager.getColor(toolkit, key);
if (fg == null)
fg = toolkit.getColors().getColor(IFormColors.TITLE);
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/StringUtil.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/StringUtil.java
index b268318..abce3b2 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/StringUtil.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/StringUtil.java
@@ -15,12 +15,12 @@
public class StringUtil {
- public static StringBuffer concat(String... strings) {
- StringBuffer buffer = new StringBuffer();
+ public static String concat(String... strings) {
+ StringBuilder buffer = new StringBuilder();
for (String string : strings) {
buffer.append(string);
}
- return buffer;
+ return buffer.toString();
}
public static String decode(String s, String enc) throws UnsupportedEncodingException {
