Bug 516530 - Use StringBuilder instead of StringBuffer - Part 3

Change-Id: If6226229f426431caac0d5817ad94ce835fc0bea
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

24 files changed, 45 insertions, 45 deletions

diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/StringMatcher.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/StringMatcher.java
index 53187c1cee6..54497e2f343 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/StringMatcher.java
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/StringMatcher.java
@@ -308,7 +308,7 @@ public class StringMatcher {
 		Vector<String> temp = new Vector<>();
 
 		int pos = 0;
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		while (pos < fLength) {
 			char c = fPattern.charAt(pos++);
 			switch (c) {
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/Parameter.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/Parameter.java
index 494722902c6..2efac0a8967 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/Parameter.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/Parameter.java
@@ -224,7 +224,7 @@ public final class Parameter implements IParameter, ITypedParameter {
 	@Override
 	public final String toString() {
 		if (string == null) {
-			final StringBuffer buffer = new StringBuffer();
+			final StringBuilder buffer = new StringBuilder();
 
 			buffer.append("Parameter("); //$NON-NLS-1$
 			buffer.append(id);
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ReflectionContributionFactory.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ReflectionContributionFactory.java
index 050dc7df1b4..54ee822b664 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ReflectionContributionFactory.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ReflectionContributionFactory.java
@@ -91,7 +91,7 @@ public class ReflectionContributionFactory implements IContributionFactory {
 				Activator.log(LogService.LOG_ERROR, message);
 				return null;
 			}
-			StringBuffer resource = new StringBuffer(uri.segment(1));
+			StringBuilder resource = new StringBuilder(uri.segment(1));
 			for (int i = 2; i < uri.segmentCount(); i++) {
 				resource.append('/');
 				resource.append(uri.segment(i));
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/URIHelper.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/URIHelper.java
index e19ed5b42eb..33245079562 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/URIHelper.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/URIHelper.java
@@ -56,7 +56,7 @@ public class URIHelper {
 		if (bundleRevision == null)
 			return null;
 
-		StringBuffer tmp = new StringBuffer();
+		StringBuilder tmp = new StringBuilder();
 		tmp.append(PLATFORM_SCHEMA);
 		if ((bundleRevision.getTypes() & BundleRevision.TYPE_FRAGMENT) == BundleRevision.TYPE_FRAGMENT)
 			tmp.append(FRAGMENT_SEGMENT);
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/Util.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/Util.java
index 50739c23e79..1caa9287e4e 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/Util.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/Util.java
@@ -382,7 +382,7 @@ public final class Util {
 			return "null"; //$NON-NLS-1$
 		}
 
-		final StringBuffer buffer = new StringBuffer();
+		final StringBuilder buffer = new StringBuilder();
 		buffer.append('[');
 
 		final int length = array.length;
@@ -451,7 +451,7 @@ public final class Util {
 			return src;
 		}
 
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		int beginIndex = 0;
 		while (idx != -1 && idx < len) {
 			buf.append(src.substring(beginIndex, idx));
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/LegacyActionTools.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/LegacyActionTools.java
index 5a08f7b3da1..520b8f27bd5 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/LegacyActionTools.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/LegacyActionTools.java
@@ -738,7 +738,7 @@ public final class LegacyActionTools {
 			return text;
 		}
 		int len = text.length();
-		StringBuffer sb = new StringBuffer(len);
+		StringBuilder sb = new StringBuilder(len);
 		int lastIndex = 0;
 		while (index != -1) {
 			// ignore & at the end
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/BindingManager.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/BindingManager.java
index d9e9c8c05a2..21702ddf519 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/BindingManager.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/BindingManager.java
@@ -146,7 +146,7 @@ public final class BindingManager extends HandleObjectManager implements
 		}
 
 		final List<String> strings = new ArrayList<>();
-		final StringBuffer stringBuffer = new StringBuffer();
+		final StringBuilder stringBuffer = new StringBuilder();
 		string = string.trim(); // remove whitespace
 		if (string.length() > 0) {
 			final StringTokenizer stringTokenizer = new StringTokenizer(string,
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/Scheme.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/Scheme.java
index 018c4cdaad0..f5ac95c342a 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/Scheme.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/Scheme.java
@@ -244,7 +244,7 @@ public final class Scheme extends NamedHandleObject implements Comparable {
     @Override
 	public final String toString() {
         if (string == null) {
-            final StringBuffer stringBuffer = new StringBuffer();
+            final StringBuilder stringBuffer = new StringBuilder();
             stringBuffer.append("Scheme("); //$NON-NLS-1$
             stringBuffer.append(id);
             stringBuffer.append(',');
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/keys/formatting/AbstractKeyFormatter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/keys/formatting/AbstractKeyFormatter.java
index c085f1c5c27..19c262b8bad 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/keys/formatting/AbstractKeyFormatter.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/bindings/keys/formatting/AbstractKeyFormatter.java
@@ -89,7 +89,7 @@ public abstract class AbstractKeyFormatter implements IKeyFormatter {
 
 	@Override
 	public String format(KeySequence keySequence) {
-		StringBuffer stringBuffer = new StringBuffer();
+		StringBuilder stringBuffer = new StringBuilder();
 
 		final KeyStroke[] keyStrokes = keySequence.getKeyStrokes();
 		final int keyStrokesLength = keyStrokes.length;
@@ -111,7 +111,7 @@ public abstract class AbstractKeyFormatter implements IKeyFormatter {
 		// Format the modifier keys, in sorted order.
 		final int modifierKeys = keyStroke.getModifierKeys();
 		final int[] sortedModifierKeys = sortModifierKeys(modifierKeys);
-		final StringBuffer stringBuffer = new StringBuffer();
+		final StringBuilder stringBuffer = new StringBuilder();
 		if (sortedModifierKeys != null) {
 			for (final int modifierKey : sortedModifierKeys) {
 				if (modifierKey != KeyStroke.NO_KEY) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/commands/ActionHandler.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/commands/ActionHandler.java
index 6400aff33a2..3e5088828b9 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/commands/ActionHandler.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/commands/ActionHandler.java
@@ -157,7 +157,7 @@ public final class ActionHandler extends AbstractHandler {
 
 	@Override
 	public final String toString() {
-		final StringBuffer buffer = new StringBuffer();
+		final StringBuilder buffer = new StringBuilder();
 
 		buffer.append("ActionHandler("); //$NON-NLS-1$
 		buffer.append(action);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/DialogSettings.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/DialogSettings.java
index b44662f8f6d..a744f14a1f7 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/DialogSettings.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/DialogSettings.java
@@ -477,7 +477,7 @@ public class DialogSettings implements IDialogSettings {
     	}
 
     	private void printTag(String name, HashMap<String, String> parameters, boolean shouldTab, boolean newLine, boolean close) throws IOException {
-    		StringBuffer sb = new StringBuffer();
+    		StringBuilder sb = new StringBuilder();
     		sb.append('<');
     		sb.append(name);
     		if (parameters != null) {
@@ -519,7 +519,7 @@ public class DialogSettings implements IDialogSettings {
     		printTag(name, parameters, true, newLine, false);
     	}
 
-    	private static void appendEscapedChar(StringBuffer buffer, char c) {
+    	private static void appendEscapedChar(StringBuilder buffer, char c) {
     		String replacement = getReplacement(c);
     		if (replacement != null) {
     			buffer.append('&');
@@ -531,7 +531,7 @@ public class DialogSettings implements IDialogSettings {
     	}
 
     	private static String getEscaped(String s) {
-    		StringBuffer result = new StringBuffer(s.length() + 10);
+    		StringBuilder result = new StringBuilder(s.length() + 10);
     		for (int i = 0; i < s.length(); ++i) {
 				appendEscapedChar(result, s.charAt(i));
 			}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/ErrorDialog.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/ErrorDialog.java
index 5fcf2d86abc..2e10d03e54a 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/ErrorDialog.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/dialogs/ErrorDialog.java
@@ -464,7 +464,7 @@ public class ErrorDialog extends IconAndMessageDialog {
 		boolean incrementNesting = false;
 
 		if (includeStatus) {
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			for (int i = 0; i < nesting; i++) {
 				sb.append(NESTING_INDENT);
 			}
@@ -479,7 +479,7 @@ public class ErrorDialog extends IconAndMessageDialog {
 
 		if (!(t instanceof CoreException) && t != null) {
 			// Include low-level exception message
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			for (int i = 0; i < nesting; i++) {
 				sb.append(NESTING_INDENT);
 			}
@@ -639,7 +639,7 @@ public class ErrorDialog extends IconAndMessageDialog {
 	 * @param nesting
 	 */
 	private void populateCopyBuffer(IStatus buildingStatus,
-			StringBuffer buffer, int nesting) {
+			StringBuilder buffer, int nesting) {
 		if (!buildingStatus.matches(displayMask)) {
 			return;
 		}
@@ -680,7 +680,7 @@ public class ErrorDialog extends IconAndMessageDialog {
 		if (clipboard != null) {
 			clipboard.dispose();
 		}
-		StringBuffer statusBuffer = new StringBuffer();
+		StringBuilder statusBuffer = new StringBuilder();
 		populateCopyBuffer(status, statusBuffer, 0);
 		clipboard = new Clipboard(list.getDisplay());
 		clipboard.setContents(new Object[] { statusBuffer.toString() },
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ComboContentAdapter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ComboContentAdapter.java
index 71a19e40d3e..e63eef36a2b 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ComboContentAdapter.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ComboContentAdapter.java
@@ -56,7 +56,7 @@ public class ComboContentAdapter implements IControlContentAdapter,
 		Combo combo = (Combo) control;
 		String contents = combo.getText();
 		Point selection = combo.getSelection();
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append(contents.substring(0, selection.x));
 		sb.append(text);
 		if (selection.y < contents.length()) {
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ContentProposalAdapter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ContentProposalAdapter.java
index 733635af922..513d690e3cf 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ContentProposalAdapter.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ContentProposalAdapter.java
@@ -1664,11 +1664,11 @@ public class ContentProposalAdapter {
 				case SWT.Traverse:
 				case SWT.KeyDown:
 					if (DEBUG) {
-						StringBuffer sb;
+						StringBuilder sb;
 						if (e.type == SWT.Traverse) {
-							sb = new StringBuffer("Traverse"); //$NON-NLS-1$
+							sb = new StringBuilder("Traverse"); //$NON-NLS-1$
 						} else {
-							sb = new StringBuffer("KeyDown"); //$NON-NLS-1$
+							sb = new StringBuilder("KeyDown"); //$NON-NLS-1$
 						}
 						sb.append(" received by adapter"); //$NON-NLS-1$
 						dump(sb.toString(), e);
@@ -1678,11 +1678,11 @@ public class ContentProposalAdapter {
 					if (popup != null) {
 						popup.getTargetControlListener().handleEvent(e);
 						if (DEBUG) {
-							StringBuffer sb;
+							StringBuilder sb;
 							if (e.type == SWT.Traverse) {
-								sb = new StringBuffer("Traverse"); //$NON-NLS-1$
+								sb = new StringBuilder("Traverse"); //$NON-NLS-1$
 							} else {
-								sb = new StringBuffer("KeyDown"); //$NON-NLS-1$
+								sb = new StringBuilder("KeyDown"); //$NON-NLS-1$
 							}
 							sb.append(" after being handled by popup"); //$NON-NLS-1$
 							dump(sb.toString(), e);
@@ -1810,7 +1810,7 @@ public class ContentProposalAdapter {
 			 *            the event
 			 */
 			private void dump(String who, Event e) {
-				StringBuffer sb = new StringBuffer(
+				StringBuilder sb = new StringBuilder(
 						"--- [ContentProposalAdapter]\n"); //$NON-NLS-1$
 				sb.append(who);
 				sb.append(" - e: keyCode=" + e.keyCode + hex(e.keyCode)); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PathEditor.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PathEditor.java
index 0faf5627c0c..3c61cc2906f 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PathEditor.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PathEditor.java
@@ -57,7 +57,7 @@ public class PathEditor extends ListEditor {
 
     @Override
 	protected String createList(String[] items) {
-        StringBuffer path = new StringBuffer("");//$NON-NLS-1$
+        StringBuilder path = new StringBuilder("");//$NON-NLS-1$
 
         for (String item : items) {
             path.append(item);
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceConverter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceConverter.java
index 7d9611ff8b6..26ee02b8141 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceConverter.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceConverter.java
@@ -524,7 +524,7 @@ public class PreferenceConverter {
      * @since 3.0
      */
     public static String getStoredRepresentation(FontData[] fontData) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         for (FontData element : fontData) {
             if (element != null) {
                 buffer.append(element.toString());
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java
index 724951f994e..67899ef47f4 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/StringConverter.java
@@ -701,7 +701,7 @@ public class StringConverter {
      * @since 3.0
      */
     public static String asString(FontData[] value) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         for (int i = 0; i < value.length; i++) {
             buffer.append(asString(value[i]));
             if (i != value.length - 1) {
@@ -719,7 +719,7 @@ public class StringConverter {
      */
     public static String asString(FontData value) {
         Assert.isNotNull(value);
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append(value.getName());
         buffer.append(SEPARATOR);
         int style = value.getStyle();
@@ -754,7 +754,7 @@ public class StringConverter {
      */
     public static String asString(Point value) {
         Assert.isNotNull(value);
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append(value.x);
         buffer.append(',');
         buffer.append(value.y);
@@ -776,7 +776,7 @@ public class StringConverter {
      */
     public static String asString(Rectangle value) {
         Assert.isNotNull(value);
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append(value.x);
         buffer.append(',');
         buffer.append(value.y);
@@ -801,7 +801,7 @@ public class StringConverter {
      */
     public static String asString(RGB value) {
         Assert.isNotNull(value);
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append(value.red);
         buffer.append(',');
         buffer.append(value.green);
@@ -847,7 +847,7 @@ public class StringConverter {
 			return s;
 		}
 
-        StringBuffer result = new StringBuffer(s.substring(0, wsIndex));
+        StringBuilder result = new StringBuilder(s.substring(0, wsIndex));
         for (int i = wsIndex + 1; i < size; i++) {
             char ch = s.charAt(i);
             if (!Character.isWhitespace(ch)) {
@@ -868,7 +868,7 @@ public class StringConverter {
     @Deprecated
 	public static String asDisplayableString(FontData value) {
         Assert.isNotNull(value);
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append(value.getName());
         buffer.append(SEPARATOR);
         int style = value.getStyle();
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/Util.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/Util.java
index 172daa7c0fe..e6a2550400e 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/Util.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/Util.java
@@ -406,7 +406,7 @@ public final class Util {
 			return "null"; //$NON-NLS-1$
 		}
 
-		final StringBuffer buffer = new StringBuffer();
+		final StringBuilder buffer = new StringBuilder();
 		buffer.append('[');
 
 		final int length = array.length;
@@ -479,7 +479,7 @@ public final class Util {
 			return src;
 		}
 
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		int beginIndex = 0;
 		while (idx != -1 && idx < len) {
 			buf.append(src.substring(beginIndex, idx));
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CustomHashtable.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CustomHashtable.java
index 076c4feb609..89454a3749d 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CustomHashtable.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/CustomHashtable.java
@@ -412,7 +412,7 @@ import java.util.NoSuchElementException;
 			return "{}"; //$NON-NLS-1$
 		}
 
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append('{');
         for (int i = elementData.length; --i >= 0;) {
             HashMapEntry entry = elementData[i];
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java
index a27fd5289cb..a1b17070468 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/StyledString.java
@@ -95,14 +95,14 @@ public class StyledString implements CharSequence {
 	}
 
 	private static final StyleRange[] EMPTY = new StyleRange[0];
-	private StringBuffer fBuffer;
+	private StringBuilder fBuffer;
 	private StyleRunList fStyleRuns;
 
 	/**
 	 * Creates an empty {@link StyledString}.
 	 */
 	public StyledString() {
-		fBuffer = new StringBuffer();
+		fBuffer = new StringBuilder();
 		fStyleRuns = null;
 	}
 
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java
index 909fb09696d..0f5eb864168 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/ProgressMonitorPart.java
@@ -192,7 +192,7 @@ public class ProgressMonitorPart extends Composite implements
 			return in;
 		}
         int length = in.length();
-        StringBuffer out = new StringBuffer(length + 1);
+        StringBuilder out = new StringBuilder(length + 1);
         for (int i = 0; i < length; i++) {
             char c = in.charAt(i);
             if (c == '&') {
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreference.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreference.java
index cb950771e9a..32b16056c05 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreference.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreference.java
@@ -82,7 +82,7 @@ public class WebBrowserPreference {
 	 *            the history
 	 */
 	public static void setInternalWebBrowserHistory(List<String> list) {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		if (list != null) {
 			Iterator<String> iterator = list.iterator();
 			while (iterator.hasNext()) {
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java
index 8eb89a11ba2..ed8af6e8b56 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java
@@ -137,7 +137,7 @@ public class WebBrowserUtil {
 			isInternalBrowserOperational = Boolean.TRUE;
 			return true;
 		} catch (Throwable t) {
-			StringBuffer message = new StringBuffer("Internal browser is not available"); //$NON-NLS-1$
+			StringBuilder message = new StringBuilder("Internal browser is not available"); //$NON-NLS-1$
 			message.append(t.getMessage() == null?".":": " + t.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
 			WebBrowserUIPlugin.getInstance().getLog().log(
 					new Status(IStatus.WARNING, WebBrowserUIPlugin.PLUGIN_ID,
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/browsers/DefaultBrowser.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/browsers/DefaultBrowser.java
index a6630aa64ba..73cf791a931 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/browsers/DefaultBrowser.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/browsers/DefaultBrowser.java
@@ -135,7 +135,7 @@ public class DefaultBrowser extends AbstractWebBrowser {
 	 */
 	protected String doSubstitutions(String token, String url) {
 		boolean substituted = false;
-		StringBuffer newToken = new StringBuffer(token);
+		StringBuilder newToken = new StringBuilder(token);
 		String substitutionMarker = "%1"; //$NON-NLS-1$
 		int index = newToken.indexOf(substitutionMarker);
 		while (index != -1) {