Bug 516530 - Use StringBuilder instead of StringBuffer - Part 8

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

28 files changed, 37 insertions, 37 deletions

diff --git a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/ExtendedNodeImpl.java b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/ExtendedNodeImpl.java
index 50e72bce840..67648ad8857 100644
--- a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/ExtendedNodeImpl.java
+++ b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/ExtendedNodeImpl.java
@@ -158,7 +158,7 @@ public class ExtendedNodeImpl extends NodeImpl implements ExtendedNode {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/MenuElementImpl.java b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/MenuElementImpl.java
index 9f994879772..eb1c521df99 100644
--- a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/MenuElementImpl.java
+++ b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/MenuElementImpl.java
@@ -209,7 +209,7 @@ public class MenuElementImpl extends EObjectImpl implements MenuElement {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (id: ");
 		result.append(id);
 		result.append(", label: ");
diff --git a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/MenuItemImpl.java b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/MenuItemImpl.java
index cb664423ea4..64bd77fd494 100644
--- a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/MenuItemImpl.java
+++ b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/MenuItemImpl.java
@@ -154,7 +154,7 @@ public class MenuItemImpl extends MenuElementImpl implements MenuItem {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (mnemonic: ");
 		result.append(mnemonic);
 		result.append(')');
diff --git a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/NodeImpl.java b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/NodeImpl.java
index 5c2632dc47a..822c6a9c78e 100644
--- a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/NodeImpl.java
+++ b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/NodeImpl.java
@@ -597,7 +597,7 @@ public class NodeImpl extends EObjectImpl implements Node {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (cat: ");
 		result.append(cat);
 		result.append(", value: ");
diff --git a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/RootImpl.java b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/RootImpl.java
index 6d79c72b9d4..b8f16b73a17 100644
--- a/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/RootImpl.java
+++ b/tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/model/xpathtest/impl/RootImpl.java
@@ -219,7 +219,7 @@ public class RootImpl extends EObjectImpl implements Root {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (id: ");
 		result.append(id);
 		result.append(')');
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/StyledTextScrollbarTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/StyledTextScrollbarTest.java
index d803d0ffde7..55c6611cbb2 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/StyledTextScrollbarTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/StyledTextScrollbarTest.java
@@ -45,7 +45,7 @@ public class StyledTextScrollbarTest extends CSSSWTTestCase {
 		shell.setLayout(layout);
 
 		StyledText styledText = new StyledText(shell, SWT.V_SCROLL | SWT.H_SCROLL);
-		StringBuffer buf = new StringBuffer(500);
+		StringBuilder buf = new StringBuilder(500);
 		for (int i = 0; i < 1000; i++) {
 			buf.append(i
 					+ "  - This is a really really really really really really long line to be shown in the styled text\n");
@@ -78,7 +78,7 @@ public class StyledTextScrollbarTest extends CSSSWTTestCase {
 	public void testScrollBarEngine() throws Exception {
 		StyledText styledText = createStyledText();
 
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		buf.append("StyledText{");
 
 		// It's here mostly as a way for non-themed variants to set it to false
@@ -109,7 +109,7 @@ public class StyledTextScrollbarTest extends CSSSWTTestCase {
 		assertEquals(false, styledText.getVerticalBar().getVisible());
 
 		// Remove the theming now
-		buf = new StringBuffer();
+		buf = new StringBuilder();
 		buf.append("StyledText{");
 		buf.append("  swt-scrollbar-themed: false;");
 		buf.append("}");
diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/model/test/impl/TestHarnessImpl.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/model/test/impl/TestHarnessImpl.java
index 1fee01cd50b..44a8aa069d1 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/model/test/impl/TestHarnessImpl.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/model/test/impl/TestHarnessImpl.java
@@ -1980,7 +1980,7 @@ public class TestHarnessImpl extends ApplicationElementImpl implements
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (commandName: ");
 		result.append(commandName);
 		result.append(", description: ");
diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableCollectionContractTest.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableCollectionContractTest.java
index 002e7700794..4434f5149be 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableCollectionContractTest.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableCollectionContractTest.java
@@ -341,7 +341,7 @@ public class MutableObservableCollectionContractTest extends
 		listener.contains = true;
 		collection.remove(elementNotContained);
 		assertFalse(
-				formatFail(new StringBuffer("When ")
+				formatFail(new StringBuilder("When ")
 						.append(methodName)
 						.append(" fires a change event the element should have been removed from the Collection.")
 						.toString()), listener.contains);
@@ -368,7 +368,7 @@ public class MutableObservableCollectionContractTest extends
 		runnable.run();
 
 		assertTrue(
-				formatFail(new StringBuffer("When ")
+				formatFail(new StringBuilder("When ")
 						.append(methodName)
 						.append(" fires a change event the element should have been added to the Collection.")
 						.toString()), listener.contains);
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/viewers/ObservableValueEditingSupportTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/viewers/ObservableValueEditingSupportTest.java
index 9dfd052438b..92ac08ce7fc 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/viewers/ObservableValueEditingSupportTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/viewers/ObservableValueEditingSupportTest.java
@@ -151,7 +151,7 @@ public class ObservableValueEditingSupportTest extends AbstractSWTTestCase {
 
 	private static class ObservableValueEditingSupportStub extends
 			ObservableValueEditingSupport {
-		StringBuffer events = new StringBuffer();
+		StringBuilder events = new StringBuilder();
 
 		Text text;
 
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/Screenshots.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/Screenshots.java
index 5634f24e169..a35a62d8b47 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/Screenshots.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/Screenshots.java
@@ -65,7 +65,7 @@ public class Screenshots {
 		if (focusControl == null) {
 			System.out.println("  null!");
 		} else {
-			StringBuffer indent = new StringBuffer("  ");
+			StringBuilder indent = new StringBuilder("  ");
 			do {
 				out.println(indent.toString() + focusControl);
 				focusControl = focusControl.getParent();
diff --git a/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/UITestHelper.java b/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/UITestHelper.java
index a1fa38af379..1d626e605e6 100644
--- a/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/UITestHelper.java
+++ b/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/UITestHelper.java
@@ -181,7 +181,7 @@ public class UITestHelper {
 		}
 
 		String message =
-			new StringBuffer("Warning: ")
+			new StringBuilder("Warning: ")
 				.append(widget)
 				.append("\n\tActual Width -> ")
 				.append(size.x)
@@ -213,7 +213,7 @@ public class UITestHelper {
 				preferred.x /= (size.y / preferred.y);
 			}
 		}
-		String message = new StringBuffer("Warning: ").append(widget)
+		String message = new StringBuilder("Warning: ").append(widget)
 			.append("\n\tActual Width -> ").append(size.x)
 			.append("\n\tRecommended Width -> ").append(preferred.x).toString();
 		if (preferred.x > size.x) {
diff --git a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/performance/FormsPerformanceTest.java b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/performance/FormsPerformanceTest.java
index 3ea63875c12..b49ae9551a5 100755
--- a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/performance/FormsPerformanceTest.java
+++ b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/performance/FormsPerformanceTest.java
@@ -172,7 +172,7 @@ public class FormsPerformanceTest extends PerformanceTestCase {
 		button = toolkit.createButton(sectionClient, "Radio 2", SWT.RADIO);
 		section.setClient(sectionClient);
 
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		buf.append("<form>");
 		buf.append("<p>");
 		buf.append("Here is some plain text for the text to render; ");
diff --git a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/DialogCheck.java b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/DialogCheck.java
index e90b8d1bd02..c0739f77892 100644
--- a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/DialogCheck.java
+++ b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/DialogCheck.java
@@ -216,7 +216,7 @@ public class DialogCheck {
             }
         }
 
-        String message = new StringBuffer("Warning: ").append(widget).append(
+        String message = new StringBuilder("Warning: ").append(widget).append(
                 "\n\tActual Width -> ").append(size.x).append(
                 "\n\tRecommended Width -> ").append(preferred.x).toString();
         if (preferred.x > size.x) {
@@ -248,7 +248,7 @@ public class DialogCheck {
                 preferred.x /= (size.y / preferred.y);
             }
         }
-        String message = new StringBuffer("Warning: ").append(widget).append(
+        String message = new StringBuilder("Warning: ").append(widget).append(
                 "\n\tActual Width -> ").append(size.x).append(
                 "\n\tRecommended Width -> ").append(preferred.x).toString();
         if (preferred.x > size.x) {
diff --git a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/DisplayWaiter.java b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/DisplayWaiter.java
index 30b8054379c..3a835436dbf 100755
--- a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/DisplayWaiter.java
+++ b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/DisplayWaiter.java
@@ -388,7 +388,7 @@ final class DisplayWaiter {
 	 * @return a string representation of the states
 	 */
 	private String name(int states) {
-		StringBuffer buf= new StringBuffer();
+		StringBuilder buf= new StringBuilder();
 		boolean comma= false;
 		if ((states & RUNNING) == RUNNING) {
 			buf.append("RUNNING"); //$NON-NLS-1$
diff --git a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/FileTool.java b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/FileTool.java
index 479a80575d0..7fb6575a7ec 100644
--- a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/FileTool.java
+++ b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/FileTool.java
@@ -150,7 +150,7 @@ public class FileTool {
 	}
 
 	public static StringBuffer read(Reader reader) throws IOException {
-		StringBuffer s= new StringBuffer();
+		StringBuffer s = new StringBuffer();
 		try {
 			char[] buffer= new char[8196];
 			int chars= reader.read(buffer);
diff --git a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/internal/util/VerifyDialog.java b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/internal/util/VerifyDialog.java
index 01eb47ed309..d52031d1736 100644
--- a/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/internal/util/VerifyDialog.java
+++ b/tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/internal/util/VerifyDialog.java
@@ -288,7 +288,7 @@ public class VerifyDialog extends TitleAreaDialog {
      */
     private void handleFailure() {
         IDialogTestPass test = _dialogTests[TEST_TYPE];
-        StringBuffer text = new StringBuffer();
+        StringBuilder text = new StringBuilder();
         String label = test.label();
         label = label.substring(0, label.indexOf("&"))
                 + label.substring(label.indexOf("&") + 1);
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionTreeData.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionTreeData.java
index 86d419c362c..9fc81ef8817 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionTreeData.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestExtensionTreeData.java
@@ -81,7 +81,7 @@ public class TestExtensionTreeData {
 
 	@Override
 	public String toString() {
-		StringBuffer toString = new StringBuffer(getName()).append(":");
+		StringBuilder toString = new StringBuilder(getName()).append(":");
 
 		toString.append("[");
 		// update local children to remove any stale kids
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestPipelineProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestPipelineProvider.java
index 947adc8b552..d36e9726b4f 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestPipelineProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestPipelineProvider.java
@@ -97,7 +97,7 @@ public class TestPipelineProvider extends ResourceWrapperContentProvider {
 		System.out.println("track:  " + mapName(map) + " " + key + " id: " + id);
 
 		String queries = (String) map.get(key);
-		StringBuffer buf = new StringBuffer(queries==null ? "" : queries);
+		StringBuilder buf = new StringBuilder(queries==null ? "" : queries);
 		buf.append(id);
 		map.put(key, buf.toString());
 	}
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java
index f09ada0f534..bcbd4d9465a 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TrackingLabelProvider.java
@@ -75,7 +75,7 @@ IFontProvider, IStyledLabelProvider {
 
 	private void _track(Map map, Object element) {
 		String entry = (String) map.get(element);
-		StringBuffer builder = new StringBuffer(entry==null ? "" : entry);
+		StringBuilder builder = new StringBuilder(entry==null ? "" : entry);
 		builder.append(_id);
 		map.put(element, builder.toString());
 		if (PRINT_DEBUG_INFO)
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/model/DynamicTestsElement.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/model/DynamicTestsElement.java
index c29be5ac93a..23ac5340784 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/model/DynamicTestsElement.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/model/DynamicTestsElement.java
@@ -72,7 +72,7 @@ public class DynamicTestsElement implements
 		this.dynamicTestsColor = DynamicTestsColor.getColor(path.substring(
 				slash + 1, underscore));
 		this.image = Activator.getImageDescriptor(path).createImage();
-		StringBuffer nameBuffer = new StringBuffer(path);
+		StringBuilder nameBuffer = new StringBuilder(path);
 		nameBuffer.replace(slash + 1, slash + 2, path.substring(slash + 1,
 				slash + 2).toUpperCase());
 		nameBuffer.replace(underscore + 1, underscore + 2, path.substring(
diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/views/LabelProvider.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/views/LabelProvider.java
index a847b951e3d..deef449e965 100644
--- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/views/LabelProvider.java
+++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/views/LabelProvider.java
@@ -62,7 +62,7 @@ public class LabelProvider
             obj = structuredSelection.getFirstElement();

             size = structuredSelection.size();

         }

-        StringBuffer ret = new StringBuffer();

+        StringBuilder ret = new StringBuilder();

         Element element = (Element) ((TreeNode) obj).getValue();

         String type = element.getClass().getName();

         String name = element.getName();

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/labelProviders/DecoratingStyledCellLabelProviderTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/labelProviders/DecoratingStyledCellLabelProviderTest.java
index 7c0b5926a68..3aebdc293ee 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/labelProviders/DecoratingStyledCellLabelProviderTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/labelProviders/DecoratingStyledCellLabelProviderTest.java
@@ -461,7 +461,7 @@ public class DecoratingStyledCellLabelProviderTest extends ViewerTestCase {
 		 */
 		protected void drawName(Event event) {
 
-			StringBuffer buffer = getDisplayString();
+			StringBuilder buffer = getDisplayString();
 
 			Display display = fViewer.getControl().getDisplay();
 			TextLayout layout = new TextLayout(display);
@@ -489,8 +489,8 @@ public class DecoratingStyledCellLabelProviderTest extends ViewerTestCase {
 		/**
 		 * @return
 		 */
-		private StringBuffer getDisplayString() {
-			StringBuffer buffer = new StringBuffer();
+		private StringBuilder getDisplayString() {
+			StringBuilder buffer = new StringBuilder();
 			buffer.append(name);
 			buffer.append(" (");
 			buffer.append(baseName);
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java
index c6719fa2275..790316c6ede 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java
@@ -1038,7 +1038,7 @@ public class ImportExistingProjectsWizardTest extends UITestCase {
 						+ rootLocation.toOSString());
 			}
 		}
-		StringBuffer filesNotImported = new StringBuffer();
+		StringBuilder filesNotImported = new StringBuilder();
 		// make sure the files in the project were imported
 		for (String element : fileList) {
 			IResource res = isListFiles ? (IResource) project
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dnd/DragOperations.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dnd/DragOperations.java
index 1c95c3b86c9..9cc9ce8827d 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dnd/DragOperations.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dnd/DragOperations.java
@@ -145,7 +145,7 @@ public class DragOperations {
      * @return
      */
     public static String getLayoutDescription(WorkbenchPage page) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         //page.getActivePerspective().describeLayout(buf);
         buf.append("this layout still not quite described - TODO");
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/layout/constraints/LayoutConstraintsView.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/layout/constraints/LayoutConstraintsView.java
index c8a9d91e71b..3ee3d78a7e6 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/layout/constraints/LayoutConstraintsView.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/layout/constraints/LayoutConstraintsView.java
@@ -149,7 +149,7 @@ public class LayoutConstraintsView extends ViewPart implements ISizeProvider {
         quantizedHeight = getInt(quantizedHeightText);
         fixedArea = getInt(fixedAreaText);
 
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         result.append("// Sample implementation: Make sure your ViewPart adapts to ISizeProvider.\n");
         result.append("// Then implement the following two methods.\n\n");
         sampleImplementation.setText(result.toString() +
@@ -194,7 +194,7 @@ public class LayoutConstraintsView extends ViewPart implements ISizeProvider {
     }
 
     public String getSizeFlagsString() {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         result.append("/* (non-Javadoc)\n");
         result.append(" * @see org.eclipse.ui.ISizeProvider#getSizeFlags(boolean)\n");
         result.append(" */\n");
@@ -330,7 +330,7 @@ public class LayoutConstraintsView extends ViewPart implements ISizeProvider {
     }
 
     private String computePreferredSizeString() {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         result.append("/* (non-Javadoc)\n");
         result.append(" * @see org.eclipse.ui.ISizeProvider#computePreferredSize(boolean, int, int, int)\n");
         result.append(" */\n");
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/WorkspaceOperationsTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/WorkspaceOperationsTests.java
index 5aae66c8650..d0eb991d274 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/WorkspaceOperationsTests.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/WorkspaceOperationsTests.java
@@ -481,7 +481,7 @@ public class WorkspaceOperationsTests extends UITestCase {
 		}
 		BufferedReader reader = null;
 		try {
-			StringBuffer buffer = new StringBuffer();
+			StringBuilder buffer = new StringBuilder();
 			char[] part = new char[2048];
 			int read = 0;
 			reader = new BufferedReader(new InputStreamReader(is, encoding));
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetAuto.java
index e786ccd8e3f..87369082864 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetAuto.java
@@ -180,7 +180,7 @@ public class PropertySheetAuto extends UITestCase {
 
         @Override
 		public String toString() {
-            StringBuffer s = new StringBuffer();
+            StringBuilder s = new StringBuilder();
             s.append("<");
             if (modelYear != 0) {
                 s.append(modelYear);
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/ThemeTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/ThemeTest.java
index 3b53e6c8660..d731007a311 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/ThemeTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/ThemeTest.java
@@ -37,7 +37,7 @@ public abstract class ThemeTest extends UITestCase {
     }
 
     protected static String formatArray(Object[] datas) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         if (datas == null) {
 			buffer.append("null");
 		} else {