Use StringBuilder instead of StringBuffer where possible.

Change-Id: Ib62a825af23774e09f51c50113aded3e9e2b8695
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/142647
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUFileEntryRule.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUFileEntryRule.java
index 066cb48..78dc113 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUFileEntryRule.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/internal/changelog/core/editors/GNUFileEntryRule.java
@@ -48,7 +48,7 @@
     protected static final int UNDEFINED = -1;
 
     /** Buffer used for pattern detection */
-    private StringBuffer fBuffer = new StringBuffer();
+    private StringBuilder fBuffer = new StringBuilder();
 
     private String fStartingSequence = "* ";
 
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/core/tests/ChangeLogWriterTest.java b/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/core/tests/ChangeLogWriterTest.java
index 7f8ba84..5e0a564 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/core/tests/ChangeLogWriterTest.java
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/src/org/eclipse/linuxtools/changelog/core/tests/ChangeLogWriterTest.java
@@ -205,7 +205,7 @@
         String expectedContent = expectedChangeLogEntry + changeLogContent;
 
         // Read in content written to file
-        StringBuffer actualContent = new StringBuffer();
+        StringBuilder actualContent = new StringBuilder();
         try (BufferedReader br = new BufferedReader(new InputStreamReader(
                 new FileInputStream(changelogFile.getLocation().toFile())))) {
             String line;
@@ -273,7 +273,7 @@
             + defaultContent + "\n";
 
         // Read in content written to file
-        StringBuffer actualContent = new StringBuffer();
+        StringBuilder actualContent = new StringBuilder();
         try (BufferedReader br = new BufferedReader(new InputStreamReader(
                 new FileInputStream(emptyChangeLogFile.getLocation().toFile())))) {
             String line;
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
index 8deef22..471ce40 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
@@ -869,7 +869,7 @@
 				// to do a kludge and put in control chars ourselves and pretend
 				// we have a label with no value.
 				String separator = ""; //$NON-NLS-1$
-				StringBuffer labelString = new StringBuffer();
+				StringBuilder labelString = new StringBuilder();
 				for (Entry<String, String> entry : labels.entrySet()) {
 					labelString.append(separator);
 					if (entry.getValue() == null || "".equals(entry.getValue())) //$NON-NLS-1$
@@ -1776,7 +1776,7 @@
 			return "";
 		}
 		List<String> cmd = info.config().cmd();
-		StringBuffer b = new StringBuffer();
+		StringBuilder b = new StringBuilder();
 		cmd.stream().forEach(s -> b.append(s + " "));
 		b.deleteCharAt(b.length() - 1);
 		return b.toString();
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerConfig.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerConfig.java
index 37ca14a..6030a9c 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerConfig.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerConfig.java
@@ -615,7 +615,7 @@
 			boolean insideQuote1 = false; // single-quote
 			boolean insideQuote2 = false; // double-quote
 			boolean escaped = false;
-			StringBuffer buffer = new StringBuffer();
+			StringBuilder buffer = new StringBuilder();
 			// Parse the string and break it up into chunks that are
 			// separated by white-space or are quoted. Ignore characters
 			// that have been escaped, including the escape character.
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProcessLauncher.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProcessLauncher.java
index b025894..f37aa23 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProcessLauncher.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProcessLauncher.java
@@ -182,7 +182,7 @@
 				}
 				return result.toArray(new String[0]);
 			} else {
-				final StringBuffer errorMessage = new StringBuffer();
+					final StringBuilder errorMessage = new StringBuilder();
 				try (final InputStream errorStream = process.getErrorStream();
 						final BufferedReader buff = new BufferedReader(
 								new InputStreamReader(errorStream))) {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ShellConnectionSettingsProvider.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ShellConnectionSettingsProvider.java
index 8c70a81..a0a00c8 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ShellConnectionSettingsProvider.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ShellConnectionSettingsProvider.java
@@ -146,7 +146,7 @@
 
 	private String streamToString(InputStream stream) {
 		BufferedReader buff = new BufferedReader(new InputStreamReader(stream));
-		StringBuffer res = new StringBuffer();
+		StringBuilder res = new StringBuilder();
 		String line = ""; //$NON-NLS-1$
 		try {
 			while ((line = buff.readLine()) != null) {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java
index 0f834a9..657cc34 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java
@@ -1845,7 +1845,7 @@
 		boolean insideQuote1 = false; // single-quote
 		boolean insideQuote2 = false; // double-quote
 		boolean escaped = false;
-		StringBuffer buffer = new StringBuffer();
+		StringBuilder buffer = new StringBuilder();
 		// Parse the string and break it up into chunks that are
 		// separated by white-space or are quoted. Ignore characters
 		// that have been escaped, including the escape character.
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/SWTImagesFactory.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/SWTImagesFactory.java
index 55b5451..363d410 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/SWTImagesFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/SWTImagesFactory.java
@@ -245,7 +245,7 @@
 	}
 
 	private static URL makeIconFileURL(String prefix, String name) {
-		StringBuffer buffer = new StringBuffer(prefix);
+		StringBuilder buffer = new StringBuilder(prefix);
 		buffer.append(name);
 		try {
 			return new URL(fgIconBaseURL, buffer.toString());
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/TarInputStream.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/TarInputStream.java
index c8bff64..89ee280 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/TarInputStream.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/TarInputStream.java
@@ -119,7 +119,7 @@
 		int pos, i;
 
 		pos = 148;
-		StringBuffer checksumString = new StringBuffer();
+		StringBuilder checksumString = new StringBuilder();
 		for (i = 0; i < 8; i++) {
 			if (header[pos + i] == ' ') {
 				continue;
@@ -232,7 +232,7 @@
 		}
 
 		pos = 100;
-		StringBuffer mode = new StringBuffer();
+		StringBuilder mode = new StringBuilder();
 		for (i = 0; i < 8; i++) {
 			if (header[pos + i] == 0) {
 				break;
@@ -254,7 +254,7 @@
 		}
 
 		pos = 100 + 24;
-		StringBuffer size = new StringBuffer();
+		StringBuilder size = new StringBuilder();
 		for (i = 0; i < 12; i++) {
 			if (header[pos + i] == 0) {
 				break;
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/ConfigureLabelsCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/ConfigureLabelsCommandHandler.java
index e1b6378..3e21df3 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/ConfigureLabelsCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/ConfigureLabelsCommandHandler.java
@@ -37,7 +37,7 @@
 				HandlerUtil.getActiveShell(event));
 		if (configureLabels) {
 			Map<String, String> labels = wizard.getConfigureLabels();
-			StringBuffer buffer = new StringBuffer();
+			StringBuilder buffer = new StringBuilder();
 			for (Entry<String, String> entry : labels.entrySet()) {
 				buffer.append(entry.getKey());
 				buffer.append('='); // $NON-NLS-1$
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageVolumesTab.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageVolumesTab.java
index 9bfd792..4acc32e 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageVolumesTab.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImageVolumesTab.java
@@ -458,7 +458,7 @@
 		Set<String> selectedVolumesSet = new TreeSet<>();
 
 		for (DataVolumeModel volume : volumes) {
-			StringBuffer buffer = new StringBuffer();
+			StringBuilder buffer = new StringBuilder();
 			volumesList.add(volume.toString());
 			switch (volume.getMountType()) {
 			case HOST_FILE_SYSTEM:
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/DataVolumeModel.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/DataVolumeModel.java
index 8b365ef..a1554ed 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/DataVolumeModel.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/DataVolumeModel.java
@@ -276,7 +276,7 @@
 	// FIXME we should have a dedicated method to serialize the bean
 	@Override
 	public String toString() {
-		final StringBuffer buffer = new StringBuffer();
+		final StringBuilder buffer = new StringBuilder();
 		buffer.append(
 				this.containerPath + SEPARATOR + getMountType() + SEPARATOR);
 		switch (getMountType()) {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionModel.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionModel.java
index 8489622..94af1f5 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionModel.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionModel.java
@@ -648,7 +648,7 @@
 		// FIXME we should have a dedicated method to serialize the bean
 		@Override
 		public String toString() {
-			StringBuffer buffer = new StringBuffer();
+			StringBuilder buffer = new StringBuilder();
 			buffer.append(containerPort + CONTAINER_TYPE_SEPARATOR + portType
 					+ SEPARATOR + (hostAddress != null ? hostAddress : "")
 					+ SEPARATOR + hostPort
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/ImageQuery.java b/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/ImageQuery.java
index 0d82479..47a9890 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/ImageQuery.java
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/ImageQuery.java
@@ -64,7 +64,7 @@
 					ExecCreateParam.attachStdout(), ExecCreateParam.attachStderr(), ExecCreateParam.detach(),
 					ExecCreateParam.attachStdin()); // needed to avoid connection reset on unix socket
 			stream = client.execStart(exeCr.id());
-			StringBuffer res = new StringBuffer();
+			StringBuilder res = new StringBuilder();
 			while (stream.hasNext()) {
 				ByteBuffer b = stream.next().content();
 				byte[] buffer = new byte[b.remaining()];
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/GcovStringReader.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/GcovStringReader.java
index 86a2e2a..9e84fde 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/GcovStringReader.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/utils/GcovStringReader.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 STMicroelectronics and others.
- * 
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -24,7 +24,7 @@
             int ln = ((int) length) << 2;
             byte[] name = new byte[ln];
             stream.readFully(name);
-            StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
             for (int j = 0; j < ln; j++) {
                 if (name[j] != 0) {
                     char c = (char) name[j];
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/STJunitUtils.java b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/STJunitUtils.java
index db06534..fe82d83 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/STJunitUtils.java
+++ b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/STJunitUtils.java
@@ -146,7 +146,7 @@
             is1.close();
             is2.close();
             if (!equals) {
-                StringBuffer msg = new StringBuffer(message + ": not correspond ");
+                StringBuilder msg = new StringBuilder(message + ": not correspond ");
                  msg.append("\n========= begin dump file =========\n");
                 try (FileReader fr = new FileReader(dumpFile)) {
                     int c;
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/src/org/eclipse/linuxtools/internal/cdt/libhover/libstdcxx/DoxygenCPPInfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/src/org/eclipse/linuxtools/internal/cdt/libhover/libstdcxx/DoxygenCPPInfo.java
index 687a706..b1cce0b 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/src/org/eclipse/linuxtools/internal/cdt/libhover/libstdcxx/DoxygenCPPInfo.java
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/src/org/eclipse/linuxtools/internal/cdt/libhover/libstdcxx/DoxygenCPPInfo.java
@@ -91,7 +91,7 @@
     }
 
     private String getElementText(Node node) {
-        StringBuffer d = new StringBuffer();
+        StringBuilder d = new StringBuilder();
         NodeList nl = node.getChildNodes();
         for (int x = 0; x < nl.getLength(); ++x) {
             Node text = nl.item(x);
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/utils/CDoxygenLibhoverGen.java b/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/utils/CDoxygenLibhoverGen.java
index 49559e8..a1ab978 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/utils/CDoxygenLibhoverGen.java
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover/src/org/eclipse/linuxtools/internal/cdt/libhover/utils/CDoxygenLibhoverGen.java
@@ -112,7 +112,7 @@
     }
 
     private String getElementText(Node node) {
-        StringBuffer d = new StringBuffer();
+        StringBuilder d = new StringBuilder();
         NodeList nl = node.getChildNodes();
         for (int x = 0; x < nl.getLength(); ++x) {
             Node text = nl.item(x);
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/OprofileSAXHandler.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/OprofileSAXHandler.java
index 7045e42..6f7b977 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/OprofileSAXHandler.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/OprofileSAXHandler.java
@@ -53,7 +53,7 @@
 	// handle this properly, it is needed to accumulate the text returned in each
 	// call
 	// until it recieves a callback that isn't characters.
-	private StringBuffer charactersBuffer;
+	private StringBuilder charactersBuffer;
 
 	// A convenience class for specifying XMLProcessors
 	private static class ProcessorItem {
@@ -147,7 +147,7 @@
 		processor.startElement(qName, attrs, callData);
 
 		// Clean up the characters buffer
-		charactersBuffer = new StringBuffer();
+		charactersBuffer = new StringBuilder();
 	}
 
 	@Override
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/AbstractOprofileLaunchConfigurationDelegate.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/AbstractOprofileLaunchConfigurationDelegate.java
index 8b90884..c77b3bc 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/AbstractOprofileLaunchConfigurationDelegate.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/AbstractOprofileLaunchConfigurationDelegate.java
@@ -240,7 +240,7 @@
                 process.waitFor();
 
                 // Put the OCount data in a separate view
-                StringBuffer buffer = new StringBuffer();
+                StringBuilder buffer = new StringBuilder();
                 // Use remote file proxy to operate resources since the project may be either local or remote
                 IRemoteFileProxy proxy = RemoteProxyManager.getInstance().getFileProxy(OprofileProject.getProject());
 
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/AbstractDataManipulator.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/AbstractDataManipulator.java
index d01a703..90f5a0f 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/AbstractDataManipulator.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/AbstractDataManipulator.java
@@ -80,8 +80,8 @@
             Process proc = null;
             IFileStore workDirStore = getWorkingDirStore();
             proc = RuntimeProcessFactory.getFactory().exec(cmd, null, workDirStore, project);
-            StringBuffer data = new StringBuffer();
-            StringBuffer temp = new StringBuffer();
+            StringBuilder data = new StringBuilder();
+            StringBuilder temp = new StringBuilder();
 
             switch (fd) {
             case 2:
@@ -132,7 +132,7 @@
             DebugPlugin.newProcess(launch, proc, ""); //$NON-NLS-1$
             proc.waitFor();
 
-            StringBuffer data = new StringBuffer();
+            StringBuilder data = new StringBuilder();
             try (BufferedReader buffData = new BufferedReader(
                     new InputStreamReader(
                             fileProxy.getResource(file).openInputStream(EFS.NONE, null)))) {
@@ -148,13 +148,13 @@
     }
 
     /**
-     * Write entire contents of BufferedReader into given StringBuffer.
+     * Write entire contents of BufferedReader into given StringBuilder.
      *
      * @param buff BufferedReader to read from.
-     * @param strBuff StringBuffer to write to.
+     * @param strBuff StringBuilder to write to.
      */
     private void readStream(final BufferedReader buff,
-            final StringBuffer strBuff) {
+            final StringBuilder strBuff) {
         Thread readThread = new Thread(() -> strBuff.append(getBufferContents(buff)));
         readThread.start();
         threads.add(readThread);
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
index 465ff62..10b36a4 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
@@ -53,7 +53,7 @@
 
     private static String spitStream(BufferedReader br, String blockTitle, PrintStream print) {
 
-        StringBuffer strBuf = new StringBuffer();
+        StringBuilder strBuf = new StringBuilder();
         String line = null;
         try {
             while (( line = br.readLine()) != null){
@@ -574,7 +574,7 @@
                                 if(project==null) {
                                     p = Runtime.getRuntime().exec(annotateCmd);
                                 } else {
-                                    StringBuffer sb = new StringBuffer();
+                                    StringBuilder sb = new StringBuilder();
                                     ArrayList<String> al = new ArrayList<>();
                                     /*
                                      *  Wrap the whole Perf annotate line as a single argument of sh command
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/launch/PerfLaunchConfigDelegate.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/launch/PerfLaunchConfigDelegate.java
index b45e518..5bc3e34 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/launch/PerfLaunchConfigDelegate.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/launch/PerfLaunchConfigDelegate.java
@@ -256,7 +256,7 @@
         // Get working directory
         int runCount = config.getAttribute(PerfPlugin.ATTR_StatRunCount,
                 PerfPlugin.ATTR_StatRunCount_default);
-        StringBuffer args = new StringBuffer();
+        StringBuilder args = new StringBuilder();
         for (String arg : arguments) {
             args.append(arg);
             args.append(" "); //$NON-NLS-1$
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java
index a7d257f..ebbaa00 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java
@@ -289,7 +289,7 @@
             public String getText(Object element) {
                 if (element instanceof IBinary) {
                     IBinary bin = (IBinary) element;
-                    StringBuffer name = new StringBuffer();
+                    StringBuilder name = new StringBuilder();
                     name.append(bin.getPath().lastSegment());
                     return name.toString();
                 }
@@ -321,7 +321,7 @@
             public String getText(Object element) {
                 if (element instanceof IBinary) {
                     IBinary bin = (IBinary) element;
-                    StringBuffer name = new StringBuffer();
+                    StringBuilder name = new StringBuilder();
                     name.append(bin.getCPU()
                             + (bin.isLittleEndian() ? "le" : "be")); //$NON-NLS-1$ //$NON-NLS-2$
                     name.append(" - "); //$NON-NLS-1$
diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/internal/profiling/tests/CProjectHelper.java b/profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/internal/profiling/tests/CProjectHelper.java
index c88aa38..3e5a315 100644
--- a/profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/internal/profiling/tests/CProjectHelper.java
+++ b/profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/internal/profiling/tests/CProjectHelper.java
@@ -95,7 +95,7 @@
 
 
     private static String getMessage(IStatus status) {
-        StringBuffer message = new StringBuffer("[");
+        StringBuilder message = new StringBuilder("[");
         message.append(status.getMessage());
         if (status.isMultiStatus()) {
             IStatus children[] = status.getChildren();
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/src/org/eclipse/linuxtools/internal/rdt/proxy/RDTCommandLauncher.java b/profiling/org.eclipse.linuxtools.rdt.proxy/src/org/eclipse/linuxtools/internal/rdt/proxy/RDTCommandLauncher.java
index e28e113..066b843 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy/src/org/eclipse/linuxtools/internal/rdt/proxy/RDTCommandLauncher.java
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy/src/org/eclipse/linuxtools/internal/rdt/proxy/RDTCommandLauncher.java
@@ -209,7 +209,7 @@
     }
 
     private String getCommandLine(String[] commandArgs) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         if (fCommandArgs != null) {
             for (String commandArg : commandArgs) {
                 buf.append(commandArg);
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/LinuxtoolsProcessFactory.java b/profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/LinuxtoolsProcessFactory.java
index ec8bbce..b019789 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/LinuxtoolsProcessFactory.java
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/LinuxtoolsProcessFactory.java
@@ -93,7 +93,7 @@
             systemPath = envMap.get(PATH);
         }
 
-        StringBuffer newPath = new StringBuffer();
+		StringBuilder newPath = new StringBuilder();
         newPath.append(PATH_EQUAL);
 
         if (ltPath != null && !ltPath.isEmpty()) {
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecStructureCreator.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecStructureCreator.java
index c5b0c92..c0cccc8 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecStructureCreator.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/compare/SpecStructureCreator.java
@@ -182,7 +182,7 @@
 		if (is == null) {
 			return null;
 		}
-		StringBuffer buffer = new StringBuffer();
+		StringBuilder buffer = new StringBuilder();
 		char[] part = new char[2048];
 		int read = 0;
 		try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, encoding))) {
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapTextParser.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapTextParser.java
index 691ea59..582ef49 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapTextParser.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapTextParser.java
@@ -36,7 +36,7 @@
     @Override
     public IStatus realTimeParsing() {
         BufferedReader buff = internalData;
-        StringBuffer text = new StringBuffer();
+        StringBuilder text = new StringBuilder();
 
         String line;
         try {
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchStapGraph.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchStapGraph.java
index 6a8f54b..3c83dd8 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchStapGraph.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchStapGraph.java
@@ -127,7 +127,7 @@
             return null;
         }
 
-        StringBuffer output = new StringBuffer();
+        StringBuilder output = new StringBuilder();
 
         for (String func : toWrite.split(" ")) { //$NON-NLS-1$
             if (!func.isEmpty()
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapOptionsTab.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapOptionsTab.java
index dc82f4a..c021510 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapOptionsTab.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapOptionsTab.java
@@ -648,7 +648,7 @@
             public String getText(Object element) {
                 if (element instanceof IBinary) {
                     IBinary bin = (IBinary)element;
-                    StringBuffer name = new StringBuffer();
+                    StringBuilder name = new StringBuilder();
                     name.append(bin.getPath().lastSegment());
                     return name.toString();
                 }
@@ -661,7 +661,7 @@
             public String getText(Object element) {
                 if (element instanceof IBinary) {
                     IBinary bin = (IBinary)element;
-                    StringBuffer name = new StringBuffer();
+                    StringBuilder name = new StringBuilder();
                     name.append(bin.getCPU() + (bin.isLittleEndian() ? "le" : "be")); //$NON-NLS-1$ //$NON-NLS-2$
                     name.append(" - "); //$NON-NLS-1$
                     name.append(bin.getPath().toString());
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPToggleCommentTest.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPToggleCommentTest.java
index 6234a04..a17f75e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPToggleCommentTest.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPToggleCommentTest.java
@@ -45,7 +45,7 @@
 
     @BeforeClass
     public static void setUp() {
-        StringBuffer stpScriptBuff = new StringBuffer();
+        StringBuilder stpScriptBuff = new StringBuilder();
         for (String scriptLine : PARTITIONED_SCRIPT) {
             stpScriptBuff.append(scriptLine);
         }
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/CommentRemover.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/CommentRemover.java
index cd9e01b..5ccd9b4 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/CommentRemover.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/CommentRemover.java
@@ -32,7 +32,7 @@
      */
     public static String execWithFile(String filename) {
         try (BufferedReader br = new BufferedReader(new FileReader(filename))) {
-            StringBuffer buffer = new StringBuffer();
+			StringBuilder buffer = new StringBuilder();
             String line;
             while ((line = br.readLine()) != null) {
                 buffer.append(line.concat("\n")); //$NON-NLS-1$
@@ -66,7 +66,7 @@
         boolean inComment = false;
 
         int c = 0;
-        StringBuffer buffer = new StringBuffer();
+		StringBuilder buffer = new StringBuilder();
 
         do {
             curchar = contents.charAt(c++);
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/StringOutputStream.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/StringOutputStream.java
index bc17b15..7760c2a 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/StringOutputStream.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/StringOutputStream.java
@@ -16,7 +16,7 @@
 import java.io.OutputStream;
 
 public class StringOutputStream extends OutputStream {
-    private StringBuffer str = new StringBuffer();
+	private StringBuilder str = new StringBuilder();
 
     @Override
     public String toString() {
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPEditor.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPEditor.java
index 6a4f6ef..b0721f5 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPEditor.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPEditor.java
@@ -129,7 +129,7 @@
 
         if (selection instanceof ITextSelection) {
             ITextSelection s = (ITextSelection) selection;
-            StringBuffer sb = new StringBuffer(doc.get().substring(0, s.getOffset()));
+			StringBuilder sb = new StringBuilder(doc.get().substring(0, s.getOffset()));
             sb.append(text.trim());
             sb.append(doc.get().substring(s.getOffset() + s.getLength(), doc.get().length()));
             doc.set(sb.toString());
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPReconcilingStrategy.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPReconcilingStrategy.java
index e078201..535b070 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPReconcilingStrategy.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPReconcilingStrategy.java
@@ -216,7 +216,7 @@
     }
 
     private boolean matchKeyWord(String word) throws BadLocationException {
-        StringBuffer keyWord = new StringBuffer();
+		StringBuilder keyWord = new StringBuilder();
         int location = nextCharPosition;
         while (location < endOfDocumentPostion) {
             char ch = currentDocument.getChar(location);
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/AddStapProbeHandler.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/AddStapProbeHandler.java
index 969c74a..8eeab98 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/AddStapProbeHandler.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/handlers/AddStapProbeHandler.java
@@ -128,7 +128,7 @@
                 String filepath = input.getURI().getPath();
                 String kernrelative = filepath.substring(
                         kernroot.length() + 1, filepath.length());
-                StringBuffer sb = new StringBuffer();
+				StringBuilder sb = new StringBuilder();
 
                 sb.append("probe kernel.statement(\"*@" + kernrelative + ":" + (lineno + 1) + "\")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/ListEditor.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/ListEditor.java
index 74e4d6e..4bcdbba 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/ListEditor.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/ListEditor.java
@@ -31,15 +31,15 @@
     }
 
     /**
-     * Creates and populates a StringBuffer with the supplied items.
-     *
-     * @param items An array of strings to make the StringBuffer with.
-     *
-     * @return Returns the StringBuffer.
-     */
+	 * Creates and populates a StringBuilder with the supplied items.
+	 *
+	 * @param items An array of strings to make the StringBuilder with.
+	 *
+	 * @return Returns the StringBuilder.
+	 */
      @Override
     protected String createList(String[] items) {
-        StringBuffer path = new StringBuffer();
+		StringBuilder path = new StringBuilder();
 
         for (String item: items) {
             path.append(item);
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java b/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java
index 436e5c8..bcfdbd1 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java
@@ -288,7 +288,7 @@
 	}
 
 	private String removeFromKeys(String keys, String key) {
-		StringBuffer res = new StringBuffer();
+		StringBuilder res = new StringBuilder();
 		for (String k : keys.split(",")) {
 			if (!key.equals(k)) {
 				res.append(","); //$NON-NLS-1$
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/SWTImagesFactory.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/SWTImagesFactory.java
index 2723e77..4f42c1b 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/SWTImagesFactory.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/SWTImagesFactory.java
@@ -204,7 +204,7 @@
 	}
 
 	private static URL makeIconFileURL(String prefix, String name) {
-		StringBuffer buffer = new StringBuffer(prefix);
+		StringBuilder buffer = new StringBuilder(prefix);
 		buffer.append(name);
 		try {
 			return new URL(fgIconBaseURL, buffer.toString());
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/CreateVmCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/CreateVmCommandHandler.java
index 364ac8b..cdeb54d 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/CreateVmCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/CreateVmCommandHandler.java
@@ -192,7 +192,7 @@
 
 		Path vagrantFilePath = Paths.get(stateLoc, vmName, "Vagrantfile"); //$NON-NLS-1$
 		String defaultContent;
-		StringBuffer bcontent = new StringBuffer();
+		StringBuilder bcontent = new StringBuilder();
 		try {
 			defaultContent = new String(Files.readAllBytes(vagrantFilePath),
 					StandardCharsets.UTF_8);
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java
index 8fc5b92..79063af 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java
@@ -51,7 +51,7 @@
 		Process p = RuntimeProcessFactory.getFactory()
 				.exec(new String[] { getValgrindCommand(), CommandLineConstants.OPT_VERSION }, project);
 		try {
-			StringBuffer out = new StringBuffer();
+			StringBuilder out = new StringBuilder();
 			readIntoBuffer(out, p);
 			return out.toString().trim();
 		} catch (IOException e) {
@@ -94,7 +94,7 @@
      * @return process
      */
     public String getCommandLine() {
-        StringBuffer ret = new StringBuffer();
+    	StringBuilder ret = new StringBuilder();
         for (String arg : args) {
             ret.append(arg).append(" "); //$NON-NLS-1$
         }
@@ -112,7 +112,7 @@
         }
     }
 
-	private void readIntoBuffer(StringBuffer out, Process p) throws IOException {
+	private void readIntoBuffer(StringBuilder out, Process p) throws IOException {
 		if (p == null) {
 			throw new IOException("Null Process object: unabled to read input into buffer"); //$NON-NLS-1$
 		}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifHeapTreeNode.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifHeapTreeNode.java
index 6b3b275..15a6a04 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifHeapTreeNode.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifHeapTreeNode.java
@@ -30,7 +30,7 @@
     public MassifHeapTreeNode(MassifHeapTreeNode parent, double percent, long bytes, String address, String function, String filename, int line) {
         this.parent = parent;
 
-        StringBuffer nodeText = new StringBuffer();
+        StringBuilder nodeText = new StringBuilder();
         formatBytes(percent, bytes, nodeText);
         nodeText.append(address).append(":"); //$NON-NLS-1$
         if (function.length() > 0) {
@@ -57,7 +57,7 @@
     public MassifHeapTreeNode(MassifHeapTreeNode parent, double percent, long bytes, String text) {
         this.parent = parent;
 
-        StringBuffer nodeText = new StringBuffer();
+        StringBuilder nodeText = new StringBuilder();
         formatBytes(percent, bytes, nodeText);
         nodeText.append(text);
         this.percent = percent;
@@ -70,7 +70,7 @@
         children = new ArrayList<>();
     }
 
-    private void formatBytes(double percent, long bytes, StringBuffer buffer) {
+    private void formatBytes(double percent, long bytes, StringBuilder buffer) {
         buffer.append(new DecimalFormat("0.##").format(percent) + "%"); //$NON-NLS-1$ //$NON-NLS-2$
         buffer.append(" ("); //$NON-NLS-1$
         buffer.append(new DecimalFormat("#,##0").format(bytes) + "B"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifParser.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifParser.java
index 9674b7b..6449b2b 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifParser.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifParser.java
@@ -155,7 +155,7 @@
             node = new MassifHeapTreeNode(parent, percentage, numBytes, address, function, filename, lineNo);
         } else {
             // concatenate the rest
-            StringBuffer text = new StringBuffer();
+        	StringBuilder text = new StringBuilder();
             for (int i = 2; i < parts.length; i++) {
                 text.append(parts[i]);
                 text.append(" "); //$NON-NLS-1$
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionKindRule.java b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionKindRule.java
index b50e0bb..1b3fb33 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionKindRule.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionKindRule.java
@@ -68,8 +68,8 @@
     @Override
     public IToken evaluate(ICharacterScanner scanner) {
         IToken result = subrule.evaluate(scanner);
-        StringBuffer tool = new StringBuffer();
-        StringBuffer kind = new StringBuffer();
+        StringBuilder tool = new StringBuilder();
+        StringBuilder kind = new StringBuilder();
 
         if (!result.isUndefined()) {
             boolean match = true;