Small String optimization

Useless toString call in String concatenation Using String.valueOf instead of ""+ Use faster indexof('') version Change-Id: Ifd04bafbccb0b96a854b64b5d0897bb4c82e5e21 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
author: Lars Vogel 2019-06-20 14:29:04 +0000
committer: Lars Vogel 2019-06-25 07:35:25 +0000
commit: 1f1bb537d12b20c17b97c8688c16c57f13996aa7 (patch)
tree: eef896dbb825677ee014c549b969f419c959da07
parent: b642f44e1464643a30a922ac81a0df37087ee5a8 (diff)
download: eclipse.platform.ui-1f1bb537d12b20c17b97c8688c16c57f13996aa7.tar.gz
eclipse.platform.ui-1f1bb537d12b20c17b97c8688c16c57f13996aa7.tar.xz
eclipse.platform.ui-1f1bb537d12b20c17b97c8688c16c57f13996aa7.zip
96 files changed, 136 insertions, 138 deletions
diff --git a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java
index a8e05d06a31..d9fa4a9d211 100644
--- a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java
+++ b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java
@@ -373,7 +373,7 @@ public class KeyAssistDialog extends PopupDialog {
 			} catch (CommandException e) {
 				// WorkbenchPlugin.log(binding.getParameterizedCommand().toString(), e);
 				// TODO we probably need to log something here.
-				System.err.println(binding.getParameterizedCommand().toString() + " : " + e); //$NON-NLS-1$
+				System.err.println(binding.getParameterizedCommand() + " : " + e); //$NON-NLS-1$
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/DOMExceptionImpl.java b/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/DOMExceptionImpl.java
index db12ad7e8fb..ec2bf4774bc 100644
--- a/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/DOMExceptionImpl.java
+++ b/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/DOMExceptionImpl.java
@@ -64,7 +64,7 @@ public class DOMExceptionImpl extends DOMException {
 	}
 
 	private static String keyString(int key) {
-		return "s" + String.valueOf(key);
+		return "s" + key;
 	}
 
 }
diff --git a/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/Measure.java b/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/Measure.java
index 8d89280adee..1cb4a68370d 100644
--- a/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/Measure.java
+++ b/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/Measure.java
@@ -115,7 +115,7 @@ public class Measure extends CSSValueImpl {
 		case LexicalUnit.SAC_POINT:
 		case LexicalUnit.SAC_INCH:
 		case LexicalUnit.SAC_DEGREE:
-			return String.valueOf(value.getFloatValue()) + value.getDimensionUnitText();
+			return value.getFloatValue() + value.getDimensionUnitText();
 		case LexicalUnit.SAC_URI:
 			return "url(" + value.getStringValue() + ")";
 		case LexicalUnit.SAC_OPERATOR_COMMA:
diff --git a/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java b/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java
index d9d97c31c85..5265d6d0096 100644
--- a/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java
+++ b/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java
@@ -453,7 +453,7 @@ public class ThemeEngine implements IThemeEngine {
 				URL url;
 				InputStream stream = null;
 				try {
-					url = FileLocator.resolve(new URL(stylesheet.toString()));
+					url = FileLocator.resolve(new URL(stylesheet));
 					for (CSSEngine engine : cssEngines) {
 						try {
 							stream = url.openStream();
diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressServiceImpl.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressServiceImpl.java
index 268c8065b1b..316bea47bb7 100644
--- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressServiceImpl.java
+++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressServiceImpl.java
@@ -76,7 +76,7 @@ public class ProgressServiceImpl implements IProgressService {
 
 	@Override
 	public void registerIconForFamily(ImageDescriptor icon, Object family) {
-		String key = IMAGE_KEY + String.valueOf(imageKeyTable.size());
+		String key = IMAGE_KEY + imageKeyTable.size();
 		imageKeyTable.put(family, key);
 		ImageRegistry registry = JFaceResources.getImageRegistry();
 
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java
index c20bb62a7f4..31eb848daef 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java
@@ -1338,7 +1338,7 @@ public class PartRenderingEngine implements IPresentationEngine {
 			WidgetElement.setEngine(display, cssEngine);
 			if (cssResourcesURI != null) {
 				cssEngine.getResourcesLocatorManager().registerResourceLocator(
-						new OSGiResourceLocator(cssResourcesURI.toString()));
+						new OSGiResourceLocator(cssResourcesURI));
 			}
 			// FIXME: is this needed?
 			display.setData("org.eclipse.e4.ui.css.context", appContext); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/ResourceUtility.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/ResourceUtility.java
index 1d071323e85..dc17be3e32e 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/ResourceUtility.java
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/ResourceUtility.java
@@ -34,7 +34,7 @@ public class ResourceUtility implements ISWTResourceUtilities {
 		try {
 			return ImageDescriptor.createFromURL(new URL(iconPath.toString()));
 		} catch (MalformedURLException e) {
-			System.err.println("iconURI \"" + iconPath.toString()
+			System.err.println("iconURI \"" + iconPath
 					+ "\" is invalid, no image will be shown");
 			return null;
 		}
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/E4Workbench.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/E4Workbench.java
index 0b361ced497..c49d60335b1 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/E4Workbench.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/E4Workbench.java
@@ -250,7 +250,7 @@ public class E4Workbench implements IWorkbench {
 		}
 		if (Policy.DEBUG_CONTEXTS) {
 			Activator.trace(Policy.DEBUG_CONTEXTS_FLAG, "initializeContext(" //$NON-NLS-1$
-					+ parentContext.toString() + ", " + contextModel + ")", null); //$NON-NLS-1$ //$NON-NLS-2$
+					+ parentContext + ", " + contextModel + ")", null); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		// fill in the interfaces, so MContributedPart.class.getName() will
 		// return the model element, for example.
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelAssembler.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelAssembler.java
index 0914bc57416..8b36e402b85 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelAssembler.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelAssembler.java
@@ -248,7 +248,7 @@ public class ModelAssembler {
 		if (severity == Diagnostic.ERROR) {
 			logger.error(
 					"Fragment from \"{0}\" of \"{1}\" could not be validated and was not merged: " //$NON-NLS-1$
-							+ fragment.toString(), contributorURI, contributorName);
+							+ fragment, contributorURI, contributorName);
 		}
 
 		List<MApplicationElement> merged = processModelFragment(fragment, contributorURI, checkExist);
@@ -293,7 +293,7 @@ public class ModelAssembler {
 		try {
 			resource = resourceSet.getResource(uri, true);
 		} catch (RuntimeException e) {
-			logger.warn(e, "Unable to read model extension from \"" + uri.toString() + "\" of \"" + bundleName + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			logger.warn(e, "Unable to read model extension from \"" + uri + "\" of \"" + bundleName + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			return null;
 		}
 
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java
index 7451ac70cd0..303485d552f 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java
@@ -259,7 +259,7 @@ public class ResourceHandler implements IModelResourceHandler {
 			resource = getResource(uri);
 		} catch (Exception e) {
 			// TODO We could use diagnostics for better analyzing the error
-			logger.error(e, "Unable to load resource " + uri.toString()); //$NON-NLS-1$
+			logger.error(e, "Unable to load resource " + uri); //$NON-NLS-1$
 			return null;
 		}
 
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 e69482640af..2a3b3333494 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
@@ -390,7 +390,7 @@ public class ContentProposalAdapter {
 					// and filter the proposals.
 					if (Character.isDefined(key)) {
 						if (filterStyle == FILTER_CUMULATIVE) {
-							filterText = filterText + String.valueOf(key);
+							filterText = filterText + key;
 						} else if (filterStyle == FILTER_CHARACTER) {
 							filterText = String.valueOf(key);
 						}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/FieldAssistColors.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/FieldAssistColors.java
index 4e60eb9c019..df147cfb086 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/FieldAssistColors.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/FieldAssistColors.java
@@ -159,9 +159,9 @@ public class FieldAssistColors {
 		List<Color> toBeRemoved = new ArrayList<>(1);
 
 		if (DEBUG) {
-			System.out.println("Display map is " + displays.toString()); //$NON-NLS-1$
+			System.out.println("Display map is " + displays); //$NON-NLS-1$
 			System.out
-					.println("Color map is " + requiredFieldColorMap.toString()); //$NON-NLS-1$
+					.println("Color map is " + requiredFieldColorMap); //$NON-NLS-1$
 		}
 
 		// Look for any stored colors that were created on this display
@@ -197,14 +197,14 @@ public class FieldAssistColors {
 			displays.remove(color);
 			// Dispose it
 			if (DEBUG) {
-				System.out.println("Disposing color " + color.toString()); //$NON-NLS-1$
+				System.out.println("Disposing color " + color); //$NON-NLS-1$
 			}
 			color.dispose();
 		}
 		if (DEBUG) {
-			System.out.println("Display map is " + displays.toString()); //$NON-NLS-1$
+			System.out.println("Display map is " + displays); //$NON-NLS-1$
 			System.out
-					.println("Color map is " + requiredFieldColorMap.toString()); //$NON-NLS-1$
+					.println("Color map is " + requiredFieldColorMap); //$NON-NLS-1$
 		}
 	}
 
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/DeviceResourceException.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/DeviceResourceException.java
index 381fe048f88..59780ee2c0c 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/DeviceResourceException.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/DeviceResourceException.java
@@ -36,7 +36,7 @@ public class DeviceResourceException extends RuntimeException {
 	 * @param cause cause of the exception (or null if none)
 	 */
 	public DeviceResourceException(DeviceResourceDescriptor missingResource, Throwable cause) {
-		super("Unable to create resource " + missingResource.toString()); //$NON-NLS-1$
+		super("Unable to create resource " + missingResource); //$NON-NLS-1$
 		// don't pass the cause to super, to allow compilation against JCL Foundation (bug 80059)
 		this.cause = cause;
 	}
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/LocalSelectionTransfer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/LocalSelectionTransfer.java
index bdc30b104c1..ce58c100e31 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/util/LocalSelectionTransfer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/util/LocalSelectionTransfer.java
@@ -38,7 +38,7 @@ public class LocalSelectionTransfer extends ByteArrayTransfer {
 	// First attempt to create a UUID for the type name to make sure that
 	// different Eclipse applications use different "types" of
 	// <code>LocalSelectionTransfer</code>
-	private static final String TYPE_NAME = "local-selection-transfer-format" + Long.valueOf(System.currentTimeMillis()).toString(); //$NON-NLS-1$;
+	private static final String TYPE_NAME = "local-selection-transfer-format" + System.currentTimeMillis(); //$NON-NLS-1$ ;
 
 	private static final int TYPEID = registerType(TYPE_NAME);
 
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerComparator.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerComparator.java
index 266fb2e24db..9277113e190 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerComparator.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ViewerComparator.java
@@ -205,7 +205,7 @@ public class ViewerComparator {
 		try {
 			Arrays.sort(elements, (a, b) -> ViewerComparator.this.compare(viewer, a, b));
 		} catch (IllegalArgumentException e) {
-			String msg = e.toString()
+			String msg = e
 					+ "\nWorkaround for comparator violation:\n\tSet system property -Djava.util.Arrays.useLegacyMergeSort=true" //$NON-NLS-1$
 					+ "\nthis: " + getClass().getName() //$NON-NLS-1$
 					+ "\ncomparator: " + (comparator != null ? comparator.getClass().getName() : null) //$NON-NLS-1$
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserExt.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserExt.java
index a1d8e4a8170..fa9a913aaa3 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserExt.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserExt.java
@@ -102,7 +102,7 @@ public class BrowserExt implements IBrowserExt {
 				Trace
 						.trace(
 								Trace.SEVERE,
-								"Could not create delegate" + toString() + ": " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
+								"Could not create delegate" + this + ": " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 		return delegate;
@@ -127,7 +127,7 @@ public class BrowserExt implements IBrowserExt {
 			Trace
 					.trace(
 							Trace.SEVERE,
-							"Error calling delegate " + toString() + ": " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
+							"Error calling delegate " + this + ": " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
 			return false;
 		}
 	}
@@ -146,7 +146,7 @@ public class BrowserExt implements IBrowserExt {
 			Trace
 					.trace(
 							Trace.SEVERE,
-							"Error calling delegate " + toString() + ": " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
+							"Error calling delegate " + this + ": " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
 			return null;
 		}
 	}
diff --git a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchWindowAdvisor.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchWindowAdvisor.java
index 5c52f30b1c1..08ccf8e3d87 100644
--- a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchWindowAdvisor.java
+++ b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchWindowAdvisor.java
@@ -455,7 +455,7 @@ public class IDEWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
 	}
 
 	private String computeTitlePath(FileStoreEditorInput editorInput) {
-		return editorInput.getURI().getPath().toString();
+		return editorInput.getURI().getPath();
 	}
 
 	private String computeTitlePath(IFileEditorInput editorInput) {
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java
index 3c0f39d6e82..154a1bdbb3e 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java
@@ -1115,7 +1115,7 @@ public class CopyFilesAndFoldersOperation {
 					}
 				};
 
-				final String initial = getAutoNewNameFor(originalName, workspace).lastSegment().toString();
+				final String initial = getAutoNewNameFor(originalName, workspace).lastSegment();
 				InputDialog dialog = new InputDialog(
 						messageShell,
 						IDEWorkbenchMessages.CopyFilesAndFoldersOperation_inputDialogTitle,
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardExportPage.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardExportPage.java
index b3227bd73b5..47af1d2b2bf 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardExportPage.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardExportPage.java
@@ -498,7 +498,7 @@ public abstract class WizardExportPage extends WizardDataTransferPage {
 				IDEWorkbenchMessages.WizardExportPage_selectResourcesToExport);
 		if (containerPath != null) { // null means user cancelled
 			String relativePath = containerPath.makeRelative().toString();
-			if (!relativePath.toString().equals(resourceNameField.getText())) {
+			if (!relativePath.equals(resourceNameField.getText())) {
 				resetSelectedResources();
 				resourceNameField.setText(relativePath);
 			}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/dialogs/ImportTypeDialog.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/dialogs/ImportTypeDialog.java
index 5ac446fa7a2..d98b628122d 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/dialogs/ImportTypeDialog.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/dialogs/ImportTypeDialog.java
@@ -238,7 +238,7 @@ public class ImportTypeDialog extends TrayDialog {
 		if (!found) {
 			if (buffer.length() > 0)
 				buffer.append(":"); //$NON-NLS-1$
-			buffer.append(Integer.toString(operationMask) + "," + value); //$NON-NLS-1$
+			buffer.append(operationMask + "," + value); //$NON-NLS-1$
 		}
 		String newValue = buffer.toString();
 		IDEWorkbenchPlugin.getDefault().getPreferenceStore().setValue(key, newValue);
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java
index d725726edeb..b2d52129281 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/LinkedResourceEditor.java
@@ -655,7 +655,7 @@ public class LinkedResourceEditor {
 
 				Text text = new Text(parent, SWT.BORDER | SWT.MULTI
 						| SWT.V_SCROLL | SWT.H_SCROLL);
-				text.setText(resultMessage.toString());
+				text.setText(resultMessage);
 				GridData data = new GridData(640, 300);
 				text.setLayoutData(data);
 				return parent;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectNaturesPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectNaturesPage.java
index ee86e1f83c7..5757163a7f9 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectNaturesPage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectNaturesPage.java
@@ -228,7 +228,7 @@ public class ProjectNaturesPage extends PropertyPage {
 					return getMissingNatureLabel(natureId);
 				}
 			} else {
-				return "Not a valid nature input " + element.toString(); //$NON-NLS-1$
+				return "Not a valid nature input " + element; //$NON-NLS-1$
 			}
 			return getNatureDescriptorLabel(nature);
 		}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/FileInfoAttributesMatcher.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/FileInfoAttributesMatcher.java
index 9298b971550..d31d0acaaf5 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/FileInfoAttributesMatcher.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/FileInfoAttributesMatcher.java
@@ -134,8 +134,8 @@ public class FileInfoAttributesMatcher extends AbstractFileInfoMatcher {
 		return VERSION_IMPLEMENTATION + DELIMITER +
 				argument.key + DELIMITER +
 				argument.operator + DELIMITER +
-				Boolean.toString(argument.caseSensitive) + DELIMITER +
-				Boolean.toString(argument.regularExpression) + DELIMITER +
+				argument.caseSensitive + DELIMITER +
+				argument.regularExpression + DELIMITER +
 				argument.pattern;
 
 	}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerFieldFilterGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerFieldFilterGroup.java
index bf54b6ecf9a..85754b6f1ab 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerFieldFilterGroup.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerFieldFilterGroup.java
@@ -220,7 +220,7 @@ class MarkerFieldFilterGroup {
 	public String getID() {
 		if (id == null) {
 			if (element == null) {
-				id = USER + String.valueOf(System.currentTimeMillis());
+				id = USER + System.currentTimeMillis();
 			} else {
 				id = element.getAttribute(MarkerSupportInternalUtilities.ATTRIBUTE_ID);
 			}
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java
index 03bb9eaaec7..399a0b790c0 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/NavigatorContentExtension.java
@@ -359,6 +359,6 @@ public class NavigatorContentExtension implements IMementoAware,
 
 	@Override
 	public String toString() {
-		return descriptor.toString() + " Instance"; //$NON-NLS-1$
+		return descriptor + " Instance"; //$NON-NLS-1$
 	}
 }
diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java
index 17eced8a3e5..4d56f1faaea 100644
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonViewer.java
@@ -521,7 +521,7 @@ public class CommonViewer extends TreeViewer {
 
 	@Override
 	public String toString() {
-		return contentService.toString() + " Viewer"; //$NON-NLS-1$
+		return contentService + " Viewer"; //$NON-NLS-1$
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PinPropertySheetAction.java b/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PinPropertySheetAction.java
index ebe642077b8..94e6d79528c 100644
--- a/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PinPropertySheetAction.java
+++ b/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PinPropertySheetAction.java
@@ -36,7 +36,7 @@ public class PinPropertySheetAction extends Action {
 		super(PropertiesMessages.Pin_text, IAction.AS_CHECK_BOX);
 
 		setId(PinPropertySheetAction.class.getName()
-				+ "#" + Long.toString(System.currentTimeMillis())); //$NON-NLS-1$
+				+ "#" + System.currentTimeMillis()); //$NON-NLS-1$
 		setToolTipText(PropertiesMessages.Pin_toolTip);
 		setImageDescriptor(WorkbenchImages
 				.getImageDescriptor(IWorkbenchGraphicConstants.IMG_ETOOL_PIN_EDITOR));
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
index 175e7d7793f..7733428d2d7 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
@@ -1501,7 +1501,7 @@ public abstract class FilteredItemsSelectionDialog extends SelectionStatusDialog
 
 			String str = provider.getText(element);
 			if (selectionDecorator != null && isSelected(element)) {
-				return selectionDecorator.decorateText(str.toString(), element);
+				return selectionDecorator.decorateText(str, element);
 			}
 
 			return str;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSet.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSet.java
index 16464e980f3..43bebe34b4e 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSet.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/AbstractWorkingSet.java
@@ -70,7 +70,7 @@ public abstract class AbstractWorkingSet implements IAdaptable, IWorkingSet, Clo
 		this.name = name;
 		this.label = label;
 		labelBoundToName = Objects.equals(name, label);
-		uniqueId = Long.toString(System.currentTimeMillis()) + "_" + counter++; //$NON-NLS-1$
+		uniqueId = System.currentTimeMillis() + "_" + counter++; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartSite.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartSite.java
index 30794a3799b..075ed08967b 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartSite.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartSite.java
@@ -452,7 +452,7 @@ public abstract class PartSite implements IWorkbenchPartSite {
 		// If someone works with disposed parts, we can't help, it is a bug
 		if (e4Context == null) {
 			WorkbenchPlugin.log(new IllegalStateException(
-					"IWorkbenchSite.getShell() was called after part disposal: " + toString())); //$NON-NLS-1$
+					"IWorkbenchSite.getShell() was called after part disposal: " + this)); //$NON-NLS-1$
 			return PlatformUI.getWorkbench().getDisplay().getActiveShell();
 		}
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginAction.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginAction.java
index 6557bb2993f..ce10535de8b 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginAction.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PluginAction.java
@@ -85,7 +85,7 @@ public abstract class PluginAction extends Action
 			setId(id);
 		} else {
 			// Create unique action id.
-			setId("PluginAction." + Integer.toString(actionCount)); //$NON-NLS-1$
+			setId("PluginAction." + actionCount); //$NON-NLS-1$
 			++actionCount;
 		}
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ConfigurationLogDefaultSection.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ConfigurationLogDefaultSection.java
index cfa931dc5ba..b233000968c 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ConfigurationLogDefaultSection.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/ConfigurationLogDefaultSection.java
@@ -162,7 +162,7 @@ public class ConfigurationLogDefaultSection implements ISystemSummarySection {
 		try {
 			service.exportPreferences(node, stm, null);
 		} catch (CoreException e) {
-			writer.println("Error reading preferences " + e.toString());//$NON-NLS-1$
+			writer.println("Error reading preferences " + e);//$NON-NLS-1$
 		}
 
 		// copy the prefs from the byte array to the writer
@@ -183,7 +183,7 @@ public class ConfigurationLogDefaultSection implements ISystemSummarySection {
 				writer.write(chars, 0, read);
 			}
 		} catch (IOException e) {
-			writer.println("Error reading preferences " + e.toString());//$NON-NLS-1$
+			writer.println("Error reading preferences " + e);//$NON-NLS-1$
 		}
 
 		// ByteArray streams don't need to be closed
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/UIListenerLogging.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/UIListenerLogging.java
index 796b1a5ee14..c4ca5427789 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/UIListenerLogging.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/misc/UIListenerLogging.java
@@ -216,7 +216,7 @@ public class UIListenerLogging {
 		if (isEnabled(PAGE_PROPERTY_EVENTS)) {
 			System.out.println(PAGE_PROPERTY_EVENTS + " page " //$NON-NLS-1$
 					+ Util.safeString(page.getLabel()) + ", " + changeId + " = " + Util.safeString(newValue.toString()) //$NON-NLS-1$ //$NON-NLS-2$
-					+ "( old value = " + newValue.toString() + " )"); //$NON-NLS-1$ //$NON-NLS-2$
+					+ "( old value = " + newValue + " )"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesSettingsTransfer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesSettingsTransfer.java
index 18a038652c0..1f437b4d1ca 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesSettingsTransfer.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesSettingsTransfer.java
@@ -50,8 +50,8 @@ public class PreferencesSettingsTransfer extends WorkbenchSettingsTransfer {
 						"Content from directory '" + srcFolder.getAbsolutePath() + "' can not be listed."); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			for (String file : files) {
-				File srcFile = new File(srcFolder.getPath().toString(), file);
-				File destFile = new File(destFolder.getPath().toString(), file);
+				File srcFile = new File(srcFolder.getPath(), file);
+				File destFile = new File(destFolder.getPath(), file);
 
 				try {
 					copyFiles(srcFile, destFile);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java
index a1d2b19d692..17bae83a5e2 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java
@@ -980,7 +980,7 @@ public class ProgressManager extends ProgressProvider implements IProgressServic
 
 	@Override
 	public void registerIconForFamily(ImageDescriptor icon, Object family) {
-		String key = IMAGE_KEY + String.valueOf(imageKeyTable.size());
+		String key = IMAGE_KEY + imageKeyTable.size();
 		imageKeyTable.put(family, key);
 		ImageRegistry registry = JFaceResources.getImageRegistry();
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/layout/Snippet027TreeLayout.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/layout/Snippet027TreeLayout.java
index a4012079185..ef997928308 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/layout/Snippet027TreeLayout.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/layout/Snippet027TreeLayout.java
@@ -99,7 +99,7 @@ public class Snippet027TreeLayout {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 
 			rv += counter;
@@ -119,7 +119,7 @@ public class Snippet027TreeLayout {
 
 		@Override
 		public String getColumnText(Object element, int columnIndex) {
-			return "Column " + columnIndex + " => " + element.toString();
+			return "Column " + columnIndex + " => " + element;
 		}
 
 		@Override
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet002TreeViewer.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet002TreeViewer.java
index 8823a5afe24..9482b640ce6 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet002TreeViewer.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet002TreeViewer.java
@@ -76,7 +76,7 @@ public class Snippet002TreeViewer {
 		public String toString() {
 			String rv = "Item ";
 			if( parent != null ) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 
 			rv += counter;
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet003TableLabelProvider.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet003TableLabelProvider.java
index 19a36cd52a5..9a9cde21810 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet003TableLabelProvider.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet003TableLabelProvider.java
@@ -61,7 +61,7 @@ public class Snippet003TableLabelProvider {
 
 		@Override
 		public String getColumnText(Object element, int columnIndex) {
-			return "Column " + columnIndex + " => " + element.toString();
+			return "Column " + columnIndex + " => " + element;
 		}
 
 	}
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet005TreeCustomMenu.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet005TreeCustomMenu.java
index c6a07ba974b..5dd1937e6dd 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet005TreeCustomMenu.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet005TreeCustomMenu.java
@@ -93,7 +93,7 @@ public class Snippet005TreeCustomMenu {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 
 			rv += counter;
@@ -120,9 +120,7 @@ public class Snippet005TreeCustomMenu {
 			public void menuAboutToShow(IMenuManager manager) {
 				IStructuredSelection selection = v.getStructuredSelection();
 				if (!selection.isEmpty()) {
-					a.setText("Action for "
-							+ ((MyModel) selection.getFirstElement())
-									.toString());
+					a.setText("Action for " + selection.getFirstElement());
 					mgr.add(a);
 				}
 			}
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet013TableViewerNoMandatoryLabelProvider.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet013TableViewerNoMandatoryLabelProvider.java
index 9ac8dcae0f0..81e3bb1b02f 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet013TableViewerNoMandatoryLabelProvider.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet013TableViewerNoMandatoryLabelProvider.java
@@ -63,7 +63,7 @@ public class Snippet013TableViewerNoMandatoryLabelProvider {
 
 		@Override
 		public String getColumnText(Object element, int columnIndex) {
-			return "Column " + columnIndex + " => " + element.toString();
+			return "Column " + columnIndex + " => " + element;
 		}
 
 		@Override
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet014TreeViewerNoMandatoryLabelProvider.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet014TreeViewerNoMandatoryLabelProvider.java
index 9cf68841ee8..1a021ad87b4 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet014TreeViewerNoMandatoryLabelProvider.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet014TreeViewerNoMandatoryLabelProvider.java
@@ -95,7 +95,7 @@ public class Snippet014TreeViewerNoMandatoryLabelProvider {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 
 			rv += counter;
@@ -115,7 +115,7 @@ public class Snippet014TreeViewerNoMandatoryLabelProvider {
 
 		@Override
 		public String getColumnText(Object element, int columnIndex) {
-			return "Column " + columnIndex + " => " + element.toString();
+			return "Column " + columnIndex + " => " + element;
 		}
 
 		@Override
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet017TableViewerHideShowColumns.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet017TableViewerHideShowColumns.java
index 2bbde31bf73..8841d60cb2a 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet017TableViewerHideShowColumns.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet017TableViewerHideShowColumns.java
@@ -101,7 +101,7 @@ public class Snippet017TableViewerHideShowColumns {
 
 		@Override
 		public String getColumnText(Object element, int columnIndex) {
-			return "Column " + columnIndex + " => " + element.toString();
+			return "Column " + columnIndex + " => " + element;
 		}
 	}
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet026TreeViewerTabEditing.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet026TreeViewerTabEditing.java
index d08b58b445f..28c9607bf0e 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet026TreeViewerTabEditing.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet026TreeViewerTabEditing.java
@@ -107,7 +107,7 @@ public class Snippet026TreeViewerTabEditing {
 
 			@Override
 			public String getText(Object element) {
-				return prefix + element.toString();
+				return prefix + element;
 			}
 
 		};
@@ -221,7 +221,7 @@ public class Snippet026TreeViewerTabEditing {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 			rv += counter;
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet035TableCursorCellHighlighter.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet035TableCursorCellHighlighter.java
index d6f34d32eb1..b8cfdba6f8d 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet035TableCursorCellHighlighter.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet035TableCursorCellHighlighter.java
@@ -83,7 +83,7 @@ public class Snippet035TableCursorCellHighlighter {
 
 		@Override
 		protected Object getValue(Object element) {
-			return "Column " + property + " => " + element.toString();
+			return "Column " + property + " => " + element;
 		}
 
 		@Override
@@ -127,7 +127,7 @@ public class Snippet035TableCursorCellHighlighter {
 
 		@Override
 		public String getText(Object element) {
-			return "Column " + columnIndex + " => " + element.toString();
+			return "Column " + columnIndex + " => " + element;
 		}
 	}
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet036FocusBorderCellHighlighter.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet036FocusBorderCellHighlighter.java
index e8b05060a9a..7942f7b73a4 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet036FocusBorderCellHighlighter.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet036FocusBorderCellHighlighter.java
@@ -82,7 +82,7 @@ public class Snippet036FocusBorderCellHighlighter {
 
 		@Override
 		protected Object getValue(Object element) {
-			return "Column " + property + " => " + element.toString();
+			return "Column " + property + " => " + element;
 		}
 
 		@Override
@@ -104,7 +104,7 @@ public class Snippet036FocusBorderCellHighlighter {
 
 		@Override
 		public String getText(Object element) {
-			return "Column " + table.getColumnOrder()[columnIndex] + " => " + element.toString();
+			return "Column " + table.getColumnOrder()[columnIndex] + " => " + element;
 		}
 	}
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet043TreeViewerKeyboardEditing.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet043TreeViewerKeyboardEditing.java
index d6ac3f9196a..c2828fdd6fb 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet043TreeViewerKeyboardEditing.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet043TreeViewerKeyboardEditing.java
@@ -194,7 +194,7 @@ public class Snippet043TreeViewerKeyboardEditing {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 			rv += counter;
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet044TableViewerKeyboardEditing.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet044TableViewerKeyboardEditing.java
index 9128d33f675..7c0130df69e 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet044TableViewerKeyboardEditing.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet044TableViewerKeyboardEditing.java
@@ -68,7 +68,7 @@ public class Snippet044TableViewerKeyboardEditing {
 
 		@Override
 		public String getText(Object element) {
-			return "Column " + table.getColumnOrder()[columnIndex] + " => " + element.toString();
+			return "Column " + table.getColumnOrder()[columnIndex] + " => " + element;
 		}
 	}
 
@@ -93,7 +93,7 @@ public class Snippet044TableViewerKeyboardEditing {
 
 		@Override
 		protected Object getValue(Object element) {
-			return "Column " + property + " => " + element.toString();
+			return "Column " + property + " => " + element;
 		}
 
 		@Override
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet045TableViewerFillFromBackgroundThread.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet045TableViewerFillFromBackgroundThread.java
index 65d1d2e193f..06b95589a45 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet045TableViewerFillFromBackgroundThread.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet045TableViewerFillFromBackgroundThread.java
@@ -77,7 +77,7 @@ public class Snippet045TableViewerFillFromBackgroundThread {
 			if (m.counter == 0) {
 				return "Column " + columnIndex + " => " + "Initial input";
 			}
-			return "Column " + columnIndex + " => thread added " + element.toString();
+			return "Column " + columnIndex + " => thread added " + element;
 		}
 
 		@Override
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet046UpdateViewerFromBackgroundThread.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet046UpdateViewerFromBackgroundThread.java
index 95df43c1130..3d7991febdd 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet046UpdateViewerFromBackgroundThread.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet046UpdateViewerFromBackgroundThread.java
@@ -71,7 +71,7 @@ public class Snippet046UpdateViewerFromBackgroundThread {
 
 		@Override
 		public String getColumnText(Object element, int columnIndex) {
-			return "Column " + columnIndex + " => " + element.toString();
+			return "Column " + columnIndex + " => " + element;
 		}
 
 	}
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet048TreeViewerTabWithCheckboxFor3_3.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet048TreeViewerTabWithCheckboxFor3_3.java
index 96fd7f534d7..d9943873972 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet048TreeViewerTabWithCheckboxFor3_3.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet048TreeViewerTabWithCheckboxFor3_3.java
@@ -86,7 +86,7 @@ public class Snippet048TreeViewerTabWithCheckboxFor3_3 {
 
 			@Override
 			public String getText(Object element) {
-				return "Column 1 => " + element.toString();
+				return "Column 1 => " + element;
 			}
 
 		});
@@ -122,7 +122,7 @@ public class Snippet048TreeViewerTabWithCheckboxFor3_3 {
 
 			@Override
 			public String getText(Object element) {
-				return "Column 2 => " + element.toString();
+				return "Column 2 => " + element;
 			}
 
 		});
@@ -307,7 +307,7 @@ public class Snippet048TreeViewerTabWithCheckboxFor3_3 {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 			rv += counter;
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet051TableCenteredImage.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet051TableCenteredImage.java
index 19d2d2b19b7..fae35b1bef9 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet051TableCenteredImage.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet051TableCenteredImage.java
@@ -115,7 +115,7 @@ public class Snippet051TableCenteredImage {
 
 			@Override
 			public String getText(Object element) {
-				return "Column 1 => " + element.toString() + ((((MyModel) element).counter % 2 != 0) ? " barcode" : "");
+				return "Column 1 => " + element + ((((MyModel) element).counter % 2 != 0) ? " barcode" : "");
 			}
 		});
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet052DoubleClickCellEditor.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet052DoubleClickCellEditor.java
index b3e99e95372..7c950349834 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet052DoubleClickCellEditor.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet052DoubleClickCellEditor.java
@@ -156,7 +156,7 @@ public class Snippet052DoubleClickCellEditor {
 
 		@Override
 		protected Object getValue(Object element) {
-			return "Column " + property + " => " + element.toString();
+			return "Column " + property + " => " + element;
 		}
 
 		@Override
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet053StartEditorWithContextMenu.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet053StartEditorWithContextMenu.java
index d90bb422478..7988a12e423 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet053StartEditorWithContextMenu.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet053StartEditorWithContextMenu.java
@@ -105,7 +105,7 @@ public class Snippet053StartEditorWithContextMenu extends SelectionAdapter {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 			rv += counter;
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet055HideShowColumn.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet055HideShowColumn.java
index 2ea3e48e037..083a656e6c2 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet055HideShowColumn.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet055HideShowColumn.java
@@ -131,7 +131,7 @@ public class Snippet055HideShowColumn {
 
 		@Override
 		public String getText(Object element) {
-			return prefix + " => " + element.toString();
+			return prefix + " => " + element;
 		}
 
 	}
@@ -229,7 +229,7 @@ public class Snippet055HideShowColumn {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 			rv += counter;
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet056BooleanCellEditor.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet056BooleanCellEditor.java
index e924566a94d..de06afcc409 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet056BooleanCellEditor.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet056BooleanCellEditor.java
@@ -212,7 +212,7 @@ public class Snippet056BooleanCellEditor {
 
 		@Override
 		public String getText(Object element) {
-			return this.prefix + " => " + element.toString();
+			return this.prefix + " => " + element;
 		}
 	}
 
@@ -268,7 +268,7 @@ public class Snippet056BooleanCellEditor {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 
 			rv += counter;
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet061FakedNativeCellEditor.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet061FakedNativeCellEditor.java
index f4ce0331cdb..30d0629bd70 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet061FakedNativeCellEditor.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/Snippet061FakedNativeCellEditor.java
@@ -413,7 +413,7 @@ public class Snippet061FakedNativeCellEditor {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 			rv += counter;
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/TextAndDialogCellEditor.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/TextAndDialogCellEditor.java
index 68d1fa53e45..1733147d651 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/TextAndDialogCellEditor.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/viewers/TextAndDialogCellEditor.java
@@ -91,7 +91,7 @@ public class TextAndDialogCellEditor extends DialogCellEditor {
 			doSetValue(newValue);
 		} else {
 			// try to insert the current value into the error message.
-			setErrorMessage(MessageFormat.format(getErrorMessage(), newValue.toString()));
+			setErrorMessage(MessageFormat.format(getErrorMessage(), newValue));
 		}
 	}
 
diff --git a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/window/Snippet031TableStaticTooltip.java b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/window/Snippet031TableStaticTooltip.java
index 86f730684dc..174e641192a 100644
--- a/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/window/Snippet031TableStaticTooltip.java
+++ b/examples/org.eclipse.jface.snippets/Eclipse JFace Snippets/org/eclipse/jface/snippets/window/Snippet031TableStaticTooltip.java
@@ -71,7 +71,7 @@ public class Snippet031TableStaticTooltip {
 
 		@Override
 		public String getColumnText(Object element, int columnIndex) {
-			return "Column " + columnIndex + " => " + element.toString();
+			return "Column " + columnIndex + " => " + element;
 		}
 
 	}
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 8c887ef7c9c..12b79f4b768 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
@@ -223,7 +223,7 @@ public class NodeImpl extends EObjectImpl implements Node {
 	public void setParent(Node newParent) {
 		if (newParent != eInternalContainer() || (eContainerFeatureID() != XpathtestPackage.NODE__PARENT && newParent != null)) {
 			if (EcoreUtil.isAncestor(this, newParent))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+				throw new IllegalArgumentException("Recursive containment not allowed for " + this);
 			NotificationChain msgs = null;
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/css/core/resources/SWTResourceRegistryKeyFactoryTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/css/core/resources/SWTResourceRegistryKeyFactoryTest.java
index 3462767443e..abb1e3455e5 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/css/core/resources/SWTResourceRegistryKeyFactoryTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/css/core/resources/SWTResourceRegistryKeyFactoryTest.java
@@ -61,7 +61,7 @@ public class SWTResourceRegistryKeyFactoryTest extends CSSSWTHelperTestCase {
 		Object result = factory.createKey(fontProperties);
 
 		assertEquals(ResourceByDefinitionKey.class, result.getClass());
-		assertEquals(CSSResourcesHelpers.getCSSValueKey(fontProperties).toString(), result.toString());
+		assertEquals(CSSResourcesHelpers.getCSSValueKey(fontProperties), result.toString());
 	}
 
 	@Test
@@ -71,7 +71,7 @@ public class SWTResourceRegistryKeyFactoryTest extends CSSSWTHelperTestCase {
 		Object result = factory.createKey(colorValue);
 
 		assertEquals(ResourceByDefinitionKey.class, result.getClass());
-		assertEquals(CSSResourcesHelpers.getCSSValueKey(colorValue).toString(),
+		assertEquals(CSSResourcesHelpers.getCSSValueKey(colorValue),
 				result.toString());
 	}
 }
diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java
index 793c2ca43c8..bd1b85d6658 100644
--- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java
+++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java
@@ -255,7 +255,7 @@ public class CTabItemTest extends CSSSWTTestCase {
 
 	private void testShowClose(boolean showClose) {
 		CTabFolder folder = createTestTabFolder("CTabItem { show-close: "
-				+ Boolean.toString(showClose) + " }");
+				+ showClose + " }");
 		CTabItem[] items = folder.getItems();
 		for (CTabItem item : items) {
 			assertEquals(showClose, item.getShowClose());
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 c4b1b54a43b..6eea8f737cc 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
@@ -858,7 +858,7 @@ public class TestHarnessImpl extends ApplicationElementImpl implements
 	public void setParent(MElementContainer<MUIElement> newParent) {
 		if (newParent != eInternalContainer() || (eContainerFeatureID() != MTestPackage.TEST_HARNESS__PARENT && newParent != null)) {
 			if (EcoreUtil.isAncestor(this, (EObject)newParent))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+				throw new IllegalArgumentException("Recursive containment not allowed for " + this);
 			NotificationChain msgs = null;
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
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 b6029d80ca0..e9c2a0395da 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
@@ -193,7 +193,7 @@ public class UITestHelper {
 		if (preferred.x > size.x) {
 			//close the dialog
 			button.getShell().dispose();
-			Assert.assertTrue(message.toString(), false);
+			Assert.assertTrue(message, false);
 		}
 	}
 
@@ -221,7 +221,7 @@ public class UITestHelper {
 		if (preferred.x > size.x) {
 			//close the dialog
 			label.getShell().dispose();
-			Assert.assertTrue(message.toString(), false);
+			Assert.assertTrue(message, false);
 		}
 	}
 
diff --git a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/ScrolledFormTest.java b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/ScrolledFormTest.java
index ae5bce9ab17..a97e74fb3ea 100644
--- a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/ScrolledFormTest.java
+++ b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/ScrolledFormTest.java
@@ -141,7 +141,7 @@ public class ScrolledFormTest {
 		boolean heightOkay = (Math.abs(expectedHeight - result.y) <= 1);
 		boolean widthOkay = (expectedWidth == result.x);
 		if (!(heightOkay && widthOkay)) {
-			assertEquals("Child control had unexpected size for test case " + testData.toString(),
+			assertEquals("Child control had unexpected size for test case " + testData,
 					new Point(expectedWidth, expectedHeight), result);
 		}
 	}
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 457aa607d15..0c05e23ae8d 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
@@ -211,7 +211,7 @@ public class DialogCheck {
 		if (preferred.x > size.x) {
 			//close the dialog
 			button.getShell().dispose();
-			assertTrue(message.toString(), false);
+			assertTrue(message, false);
 		}
 	}
 
@@ -243,7 +243,7 @@ public class DialogCheck {
 		if (preferred.x > size.x) {
 			//close the dialog
 			label.getShell().dispose();
-			assertTrue(message.toString(), false);
+			assertTrue(message, false);
 		}
 	}
 
diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaProject.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaProject.java
index 63a5795f464..42ad91f2204 100644
--- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaProject.java
+++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/jst/CompressedJavaProject.java
@@ -56,7 +56,7 @@ public class CompressedJavaProject implements ICompressedNode, IAdaptable {
 		if (nonextSourceFolders.size() == 1) {
 			singleRoot = nonextSourceFolders.get(0);
 		}
-		return "Compressed Java resources: " + ((singleRoot != null) ? ": " + singleRoot.toString() : ""); //$NON-NLS-1$ //$NON-NLS-2$
+		return "Compressed Java resources: " + ((singleRoot != null) ? ": " + singleRoot : ""); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	public IProject getProject() {
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/ListPopulationTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/ListPopulationTest.java
index 3cca769a6be..97dcc9ec270 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/ListPopulationTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/ListPopulationTest.java
@@ -131,7 +131,7 @@ public class ListPopulationTest extends BasicPerformanceTest {
 	private String[] getItems(int count) {
 		String[] items = new String[count];
 		for (int j = 0; j < items.length; j++) {
-			items[j] = "Element " + String.valueOf(j);
+			items[j] = "Element " + j;
 
 		}
 		return items;
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/SWTTreeTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/SWTTreeTest.java
index 667a84f702c..427dc853bea 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/SWTTreeTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/SWTTreeTest.java
@@ -54,7 +54,7 @@ public class SWTTreeTest extends BasicPerformanceTest {
 	private void createChildren() {
 		for (int i = 0; i < TreeAddTest.TEST_COUNT; i++) {
 			TreeItem item = new TreeItem(tree, SWT.NONE);
-			item.setText("Element " + String.valueOf(i));
+			item.setText("Element " + i);
 
 		}
 
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TestElement.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TestElement.java
index de22f3d0ac9..cf291487aa5 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TestElement.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TestElement.java
@@ -37,7 +37,7 @@ public class TestElement {
 	 * @param index
 	 */
 	public TestElement(int index) {
-		name = TestTreeElement.generateFirstEntry() + String.valueOf(index);
+		name = TestTreeElement.generateFirstEntry() + index;
 	}
 
 	public String getText() {
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TestTreeElement.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TestTreeElement.java
index 30e6c1d4469..2521b103f55 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TestTreeElement.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/TestTreeElement.java
@@ -33,7 +33,7 @@ public class TestTreeElement extends TestElement {
 	public TestTreeElement(int index, TestTreeElement treeParent) {
 		super();
 		this.parent = treeParent;
-		name = generateFirstEntry() + String.valueOf(index);
+		name = generateFirstEntry() + index;
 	}
 
 	/**
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ObjectContributionTest.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ObjectContributionTest.java
index a58626f5074..781528d068e 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ObjectContributionTest.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/ObjectContributionTest.java
@@ -433,7 +433,7 @@ public final class ObjectContributionTest extends UITestCase {
 		}
 
 		if(existance && ! commands.isEmpty()) {
-			fail(name + " Missing " + commands.toString() + " from context menu.");
+			fail(name + " Missing " + commands + " from context menu.");
 		}
 	}
 }
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 c523e28cd70..6dd16d991fd 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
@@ -81,7 +81,7 @@ public class DynamicTestsElement implements
 		nameBuffer.replace(underscore + 1, underscore + 2, path.substring(
 				underscore + 1, underscore + 2).toUpperCase());
 		nameBuffer.replace(underscore, underscore + 1, " ");//$NON-NLS-1$
-		name = nameBuffer.substring(slash + 1, dot).toString();
+		name = nameBuffer.substring(slash + 1, dot);
 		PropertyDescriptor propertyDescriptor = new PropertyDescriptor(ID_NAME,
 				ID_NAME);
 		propertyDescriptor.setCategory(DEFAULT_CATEGORY);
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug180504TreeViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug180504TreeViewerTest.java
index 5c956898c66..ad2aaab8f48 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug180504TreeViewerTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug180504TreeViewerTest.java
@@ -49,7 +49,7 @@ public class Bug180504TreeViewerTest extends ViewerTestCase {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 
 			rv += counter;
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug201002TreeViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug201002TreeViewerTest.java
index c5eeaed9c11..4daa00665af 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug201002TreeViewerTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug201002TreeViewerTest.java
@@ -48,7 +48,7 @@ public class Bug201002TreeViewerTest extends ViewerTestCase {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 
 			rv += counter;
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug203657TreeViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug203657TreeViewerTest.java
index 0ad76809468..530d188a8ff 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug203657TreeViewerTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/Bug203657TreeViewerTest.java
@@ -51,7 +51,7 @@ public class Bug203657TreeViewerTest extends ViewerTestCase {
 		public String toString() {
 			String rv = "Item ";
 			if (parent != null) {
-				rv = parent.toString() + ".";
+				rv = parent + ".";
 			}
 
 			rv += counter;
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/VirtualTableViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/VirtualTableViewerTest.java
index 6e235ba3d33..da197b77571 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/VirtualTableViewerTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/VirtualTableViewerTest.java
@@ -109,7 +109,7 @@ public class VirtualTableViewerTest extends TableViewerTest {
 
 		for (int i = 0; i < items.length; i++) {
 			TableItem item = items[i];
-			assertTrue("Missing data in item " + String.valueOf(i) + " of " + items.length, item
+			assertTrue("Missing data in item " + i + " of " + items.length, item
 					.getData() instanceof TestElement);
 		}
 	}
@@ -308,8 +308,8 @@ public class VirtualTableViewerTest extends TableViewerTest {
 		StructuredSelection selection = new StructuredSelection(children);
 		fViewer.setSelection(selection);
 		IStructuredSelection result = fViewer.getStructuredSelection();
-		assertTrue("Size was " + String.valueOf(result.size()) + " expected "
-				+ String.valueOf(children.length),
+		assertTrue("Size was " + result.size() + " expected "
+				+ children.length,
 				(result.size() == children.length));
 		Set<TestElement> childrenSet = new HashSet<>(Arrays.asList(children));
 		Set<?> selectedSet = new HashSet<Object>(result.toList());
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/LazyDeferredVirtualTableView.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/LazyDeferredVirtualTableView.java
index 58c26421205..2cd5da3041a 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/LazyDeferredVirtualTableView.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/LazyDeferredVirtualTableView.java
@@ -51,7 +51,7 @@ public class LazyDeferredVirtualTableView extends VirtualTableView {
 					int rangeLength = rangeEnd - rangeStart;
 					for (int i = 0; i <= rangeLength; i++) {
 						int index = i + rangeStart;
-						viewer.replace("Element " + String.valueOf(index),
+						viewer.replace("Element " + index,
 								index);
 					}
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/LazyVirtualTableView.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/LazyVirtualTableView.java
index 6d4a6e1a92a..7050cb07f88 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/LazyVirtualTableView.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/LazyVirtualTableView.java
@@ -42,7 +42,7 @@ public class LazyVirtualTableView extends VirtualTableView {
 	private void initElements() {
 		elements = new ArrayList<>();
 		for (int i = 0; i < itemCount; i++) {
-			elements.add("Element " + String.valueOf(i));
+			elements.add("Element " + i);
 		}
 	}
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTreeLabelProvider.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTreeLabelProvider.java
index 7b49ed2ba7a..db4d10e3ca1 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTreeLabelProvider.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/TestTableTreeLabelProvider.java
@@ -50,7 +50,7 @@ public class TestTableTreeLabelProvider extends TestLabelProvider implements
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
 		if (element != null) {
-			return element.toString() + " column " + columnIndex;
+			return element + " column " + columnIndex;
 		}
 		return null;
 	}
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/VirtualTableView.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/VirtualTableView.java
index 0198f44326f..cc9ce259dc1 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/VirtualTableView.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/interactive/VirtualTableView.java
@@ -97,7 +97,7 @@ public class VirtualTableView extends ViewPart {
 			public Object[] getElements(Object inputElement) {
 				String[] elements = new String[itemCount];
 				for (int i = 0; i < itemCount; i++) {
-					elements[i] = "Element " + String.valueOf(i);
+					elements[i] = "Element " + i;
 				}
 				return elements;
 			}
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/DynamicModelActivityRegistry.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/DynamicModelActivityRegistry.java
index 94ba8414f4c..6653ef77e72 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/DynamicModelActivityRegistry.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/DynamicModelActivityRegistry.java
@@ -100,7 +100,7 @@ public class DynamicModelActivityRegistry extends AbstractActivityRegistry {
 					.add(new ActivityPatternBindingDefinition(
 							((ActivityDefinition) activityDefinitions.toArray()[index])
 									.getId(), "org.eclipse.pattern" //$NON-NLS-1$
-									+ Integer.toString(index + 1), sourceId));
+									+ (index + 1), sourceId));
 		}
 	}
 
@@ -113,20 +113,20 @@ public class DynamicModelActivityRegistry extends AbstractActivityRegistry {
 		for (int index = 1; index <= categoryDefinitions.size(); index++) {
 			categoryActivityBindingDefinitions
 					.add(new CategoryActivityBindingDefinition(
-							"org.eclipse.activity" + Integer.toString(counter), //$NON-NLS-1$
-							"org.eclipse.category" + Integer.toString(index), //$NON-NLS-1$
+							"org.eclipse.activity" + counter, //$NON-NLS-1$
+							"org.eclipse.category" + index, //$NON-NLS-1$
 							sourceId));
 			counter++;
 			categoryActivityBindingDefinitions
 					.add(new CategoryActivityBindingDefinition(
-							"org.eclipse.activity" + Integer.toString(counter), //$NON-NLS-1$
-							"org.eclipse.category" + Integer.toString(index), //$NON-NLS-1$
+							"org.eclipse.activity" + counter, //$NON-NLS-1$
+							"org.eclipse.category" + index, //$NON-NLS-1$
 							sourceId));
 			counter++;
 			categoryActivityBindingDefinitions
 					.add(new CategoryActivityBindingDefinition(
-							"org.eclipse.activity" + Integer.toString(counter), //$NON-NLS-1$
-							"org.eclipse.category" + Integer.toString(index), //$NON-NLS-1$
+							"org.eclipse.activity" + counter, //$NON-NLS-1$
+							"org.eclipse.category" + index, //$NON-NLS-1$
 							sourceId));
 			counter++;
 		}
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/DynamicTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/DynamicTest.java
index 83653479916..a1203ac2e78 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/DynamicTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/DynamicTest.java
@@ -451,7 +451,7 @@ public class DynamicTest extends UITestCase {
 				+ "<categoryActivityBinding categoryId = \"dynamic.category\" activityId = \"dynamic.activity\" />"
 				+ "<activityPatternBinding activityId=\"dynamic.activity\"  pattern=\"dynamic.activity/.*\"/>"
 				+ "<defaultEnablement id=\"dynamic.activity\"/>" + "</extension></plugin>";
-		byte[] bytes = ACTIVITY.toString().getBytes(StandardCharsets.UTF_8);
+		byte[] bytes = ACTIVITY.getBytes(StandardCharsets.UTF_8);
 		InputStream is = new ByteArrayInputStream(bytes);
 		IContributor contrib = ContributorFactoryOSGi.createContributor(TestPlugin.getDefault().getBundle());
 		ExtensionRegistry registry = (ExtensionRegistry) RegistryFactory.getRegistry();
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/StaticTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/StaticTest.java
index 8f96ee03d3c..e081e3a0a04 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/StaticTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/StaticTest.java
@@ -64,12 +64,12 @@ public class StaticTest extends UITestCase {
 		categoryIds = new ArrayList<>();
 		for (index = 1; index <= 6; index++)
 		 {
-			categoryIds.add("org.eclipse.category" + Integer.toString(index)); //$NON-NLS-1$
+			categoryIds.add("org.eclipse.category" + index); //$NON-NLS-1$
 		}
 		activityIds = new ArrayList<>();
 		for (index = 1; index <= 18; index++)
 		 {
-			activityIds.add("org.eclipse.activity" + Integer.toString(index)); //$NON-NLS-1$
+			activityIds.add("org.eclipse.activity" + index); //$NON-NLS-1$
 		}
 		patternActivityIds = new ArrayList<>();
 		for (index = 0; index < 3; index++) {
@@ -91,7 +91,7 @@ public class StaticTest extends UITestCase {
 		// Check enabled activity Ids
 		for (int index = 1; index <= 4; index++) {
 			assertTrue(activityManager.getEnabledActivityIds().contains(
-					"org.eclipse.activity" + Integer.toString(index)));
+					"org.eclipse.activity" + index));
 		}
 		// Check identifier
 		IIdentifier activityIdentifier = activityManager
@@ -114,7 +114,7 @@ public class StaticTest extends UITestCase {
 		for (int index = 2; index <= 7; index++) {
 			assertTrue(activityRequirementBindings
 					.contains(new ActivityRequirementBinding(
-							"org.eclipse.activity" + Integer.toString(index),
+							"org.eclipse.activity" + index,
 							"org.eclipse.activity1")));
 		}
 		// Check activity pattern bindings
@@ -156,7 +156,7 @@ public class StaticTest extends UITestCase {
 		for (int index = 1; index <= 4; index++) {
 			assertTrue(categoryActivityBindings
 					.contains(new CategoryActivityBinding(
-							"org.eclipse.activity" + Integer.toString(index),
+							"org.eclipse.activity" + index,
 							first_category.getId())));
 		}
 		try {
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/UtilTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/UtilTest.java
index 56319e5dd4f..7f5440b332e 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/UtilTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/UtilTest.java
@@ -572,7 +572,7 @@ public class UtilTest extends TestCase {
 		IIdentifier identifier = manager.getIdentifier(IDENTIFIER);
 		Set<String> boundActivities = identifier.getActivityIds();
 		assertTrue(boundActivities.size() == 1);
-		String id = boundActivities.iterator().next().toString();
+		String id = boundActivities.iterator().next();
 		assertTrue(id.equals(ACTIVITY_NON_REG_EXP));
 
 		// Check conversion from normal string to regular expression string
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkingSetManagerTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkingSetManagerTest.java
index 834ca906e8f..ade43b8008a 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkingSetManagerTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkingSetManagerTest.java
@@ -243,7 +243,7 @@ public class IWorkingSetManagerTest extends UITestCase {
 			IWorkingSet[] workingSets = new IWorkingSet[10];
 			for (int i = 0 ; i < 10; i++) {
 				IWorkingSet workingSet = fWorkingSetManager.createWorkingSet(
-						"ws_" + Integer.toString(i + 1), new IAdaptable[] { fWorkspace.getRoot() });
+						"ws_" + (i + 1), new IAdaptable[] { fWorkspace.getRoot() });
 				fWorkingSetManager.addRecentWorkingSet(workingSet);
 				fWorkingSetManager.addWorkingSet(workingSet);
 				workingSets[9 - i] = workingSet;
@@ -261,7 +261,7 @@ public class IWorkingSetManagerTest extends UITestCase {
 
 			for (int i = 7 ; i < 9; i++) {
 				IWorkingSet workingSet = fWorkingSetManager.createWorkingSet(
-						"ws_addded_" + Integer.toString(i + 1), new IAdaptable[] { fWorkspace.getRoot() });
+						"ws_addded_" + (i + 1), new IAdaptable[] { fWorkspace.getRoot() });
 				fWorkingSetManager.addRecentWorkingSet(workingSet);
 				fWorkingSetManager.addWorkingSet(workingSet);
 				workingSets9[8 - i] = workingSet;
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/workbenchpart/MenuContributionHarness.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/workbenchpart/MenuContributionHarness.java
index 2e65f74739f..d3d1302b3dc 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/workbenchpart/MenuContributionHarness.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/workbenchpart/MenuContributionHarness.java
@@ -233,7 +233,7 @@ public class MenuContributionHarness extends ViewPart {
 			public void run() {
 				IStructuredSelection selection = viewer.getStructuredSelection();
 				Object obj = selection.getFirstElement();
-				showMessage("Double-click detected on " + obj.toString());
+				showMessage("Double-click detected on " + obj);
 			}
 		};
 	}
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 bb4d745094c..1f3c1972e3d 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
@@ -1057,7 +1057,7 @@ public class ImportExistingProjectsWizardTest extends UITestCase {
 			}
 		}
 		assertTrue("Files expected but not in workspace for project \"" + project.getName() + "\": "
-				+ filesNotImported.toString(), filesNotImported.length() == 0);
+				+ filesNotImported, filesNotImported.length() == 0);
 	}
 
 	/**
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorAdaptableTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorAdaptableTests.java
index c66dceb0303..ca4132ea4a6 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorAdaptableTests.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorAdaptableTests.java
@@ -59,7 +59,7 @@ public class DecoratorAdaptableTests extends UITestCase {
 					allMatchesFound = false;
 				}
 			}
-			assertTrue("Adaptable test " + testSubName + " has failed for object " + object.toString(), allMatchesFound == shouldHaveMatches);
+			assertTrue("Adaptable test " + testSubName + " has failed for object " + object, allMatchesFound == shouldHaveMatches);
 		}
 	}
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/TableElement.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/TableElement.java
index 7a6c3dfaf43..0afab0cdfa0 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/TableElement.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/TableElement.java
@@ -24,7 +24,7 @@ public class TableElement extends TestElement{
 	public TableElement(int newIndex) {
 		super();
 		index = newIndex;
-		name = "Table Item " + String.valueOf(index);
+		name = "Table Item " + index;
 
 	}
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/TreeElement.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/TreeElement.java
index 64f58e473fb..ff13618c5cc 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/TreeElement.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/TreeElement.java
@@ -33,7 +33,7 @@ public class TreeElement extends TestElement {
 			level = 0;
 		} else {
 			level = parent.level + 1;
-			name = "Level" + String.valueOf(level) + " - " + String.valueOf(index);
+			name = "Level" + level + " - " + index;
 			parent.children.add(this);
 		}
 	}
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/FontFieldEditorTestPreferencePage.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/FontFieldEditorTestPreferencePage.java
index 504d2ab817a..aff27708f9f 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/FontFieldEditorTestPreferencePage.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/FontFieldEditorTestPreferencePage.java
@@ -43,13 +43,13 @@ public class FontFieldEditorTestPreferencePage extends
 
 		for (int i = 0; i < 3; i++) {
 			//Create one with a preview
-			addField(new FontFieldEditor("FontValue" + String.valueOf(i),
-					"Font Test" + String.valueOf(i), "Preview", feParent));
+			addField(new FontFieldEditor("FontValue" + i,
+					"Font Test" + i, "Preview", feParent));
 
 			//Create one without
 			addField(new FontFieldEditor(
-					"FontValueDefault" + String.valueOf(i), "Font Test Default"
-							+ String.valueOf(i), feParent));
+					"FontValueDefault" + i, "Font Test Default"
+							+ i, feParent));
 		}
 
 	}
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/SearchPatternAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/SearchPatternAuto.java
index aa95afbae60..260a2a1ae03 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/SearchPatternAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/SearchPatternAuto.java
@@ -51,7 +51,7 @@ public class SearchPatternAuto extends TestCase {
 	 */
 	private static void generateRescourcesTestCases(char startChar, char endChar, int lenght, String resource){
 		for (char ch = startChar; ch <= endChar; ch++) {
-			String res = resource + String.valueOf(ch);
+			String res = resource + ch;
 			if (lenght == res.length()) {
 				resources.add(res);
 			} else if ((res.trim().length() % 2) == 0) {
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dnd/DragTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dnd/DragTest.java
index d1aec597189..3345e9e0aa2 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dnd/DragTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dnd/DragTest.java
@@ -139,7 +139,7 @@ public class DragTest extends UITestCaseWithResult {
 	static WorkbenchPage page;
 
 	public DragTest(TestDragSource dragSource, TestDropLocation dropTarget, AbstractTestLogger log, String suffix) {
-		super("drag " + dragSource.toString() + " to " + dropTarget.toString() + suffix, log);
+		super("drag " + dragSource + " to " + dropTarget + suffix, log);
 		this.dragSource = dragSource;
 		this.dropTarget = dropTarget;
 	}
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 e02548ed34f..509fedc5b09 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
@@ -153,7 +153,7 @@ public class LayoutConstraintsView extends ViewPart implements ISizeProvider {
 		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() + getSizeFlagsString() + computePreferredSizeString());
+		sampleImplementation.setText(result + getSizeFlagsString() + computePreferredSizeString());
 
 		// Trigger a workbench layout
 		updateLayout();
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/manual/ViewWithSaveables.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/manual/ViewWithSaveables.java
index 3fcdace2cfa..104097d04cb 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/manual/ViewWithSaveables.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/manual/ViewWithSaveables.java
@@ -90,7 +90,7 @@ public class ViewWithSaveables extends ViewPart implements ISaveablesSource,
 			@Override
 			public String getText(Object element) {
 				MySaveable saveable = (MySaveable) element;
-				return (saveable.isDirty() ? "*" : "") + saveable.toString();
+				return (saveable.isDirty() ? "*" : "") + saveable;
 			}
 		});
 		viewer.setInput(saveables);
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/ObjectContributionTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/ObjectContributionTest.java
index 4f6deb2b361..e6e3ad450fe 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/ObjectContributionTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/ObjectContributionTest.java
@@ -391,7 +391,7 @@ public final class ObjectContributionTest extends UITestCase {
 			}
 
 			if (existance && !commands.isEmpty()) {
-				fail(name + " Missing " + commands.toString()
+				fail(name + " Missing " + commands
 						+ " from context menu.");
 			}
 		} finally {
author	Lars Vogel	2019-06-20 14:29:04 +0000
committer	Lars Vogel	2019-06-25 07:35:25 +0000
commit	1f1bb537d12b20c17b97c8688c16c57f13996aa7 (patch)
tree	eef896dbb825677ee014c549b969f419c959da07
parent	b642f44e1464643a30a922ac81a0df37087ee5a8 (diff)
download	eclipse.platform.ui-1f1bb537d12b20c17b97c8688c16c57f13996aa7.tar.gz eclipse.platform.ui-1f1bb537d12b20c17b97c8688c16c57f13996aa7.tar.xz eclipse.platform.ui-1f1bb537d12b20c17b97c8688c16c57f13996aa7.zip