[releng] Apply auto-clean of save to all files with Eclipse 4.23

This mostly is using diamond operator, but includes adding missing @Override and organizing imports and applying formatting improvements in the JDT formatter. Change-Id: Id91cbff33b0a039cc5121945ffbc407ecba45866
author: Jonah Graham 2022-04-17 19:34:43 +0000
committer: Jonah Graham 2022-04-20 00:13:15 +0000
commit: a1c02e2cce72f98aa1c73324225fc53563a81856 (patch)
tree: dfef033f1eed2f6b46a39700c5c0dddc5a27b405
parent: 148ae40d0f4303d9ee4fcda44a3ef9297f6d3079 (diff)
download: org.eclipse.cdt-a1c02e2cce72f98aa1c73324225fc53563a81856.tar.gz
org.eclipse.cdt-a1c02e2cce72f98aa1c73324225fc53563a81856.tar.xz
org.eclipse.cdt-a1c02e2cce72f98aa1c73324225fc53563a81856.zip
242 files changed, 518 insertions, 452 deletions
diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/LocationAdapter.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/LocationAdapter.java
index bb9e174631e..87addb2ee46 100644
--- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/LocationAdapter.java
+++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/LocationAdapter.java
@@ -36,7 +36,7 @@ abstract class LocationAdapter<T> {
 
 	public abstract T getLocation(IFile file);
 
-	public static final LocationAdapter<IPath> PATH = new LocationAdapter<IPath>() {
+	public static final LocationAdapter<IPath> PATH = new LocationAdapter<>() {
 		@Override
 		public String extractName(IPath location) {
 			String name = location.lastSegment();
@@ -68,7 +68,7 @@ abstract class LocationAdapter<T> {
 		}
 	};
 
-	public static final LocationAdapter<URI> URI = new LocationAdapter<URI>() {
+	public static final LocationAdapter<URI> URI = new LocationAdapter<>() {
 		@Override
 		public String extractName(URI location) {
 			String path = location.getPath();
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCompletionProcessor.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCompletionProcessor.java
index 893142798d6..37cb79ed3fb 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCompletionProcessor.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCompletionProcessor.java
@@ -78,7 +78,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 	protected IEditorPart fEditor;
 	protected IWorkingCopyManager fManager;
 
-	private Comparator<IDirective> directivesComparator = new Comparator<IDirective>() {
+	private Comparator<IDirective> directivesComparator = new Comparator<>() {
 		@Override
 		public int compare(IDirective o1, IDirective o2) {
 			return o1.toString().compareToIgnoreCase(o2.toString());
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java
index be6f23c2921..ebe8d1102ca 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java
@@ -422,7 +422,7 @@ public class MakeContentProvider implements ITreeContentProvider, IMakeTargetLis
 
 	/**
 	 * Check if the resource is in the list of source entries.
-
+	 *
 	 * @param rc - resource to check.
 	 * @return {@code true} if the resource is a source folder, {@code false} otherwise.
 	 *
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java
index 4252f366330..7e643eb814b 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java
@@ -223,7 +223,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase {
 
 		@Override
 		protected List<String> parseOptions(final String line) {
-			return new ArrayList<String>() {
+			return new ArrayList<>() {
 				{
 					add(line);
 				}
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
index aefa5263b7c..7be81a763d1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
@@ -1424,7 +1424,7 @@ public class BuildDescription implements IBuildDescription {
 							depFiles = new IPath[1];
 							depFiles[0] = new Path(
 									buildRc.getLocation().segment(buildRc.getLocation().segmentCount() - 1))
-											.removeFileExtension().addFileExtension("d"); //$NON-NLS-1$
+									.removeFileExtension().addFileExtension("d"); //$NON-NLS-1$
 						}
 
 						if (depFiles != null) {
diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
index 673ec526dc1..4b39dc5a911 100644
--- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
+++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
@@ -31,9 +31,6 @@ import org.eclipse.cdt.cmake.core.properties.CMakeGenerator;
 import org.eclipse.cdt.cmake.core.properties.ICMakeProperties;
 import org.eclipse.cdt.cmake.core.properties.ICMakePropertiesController;
 import org.eclipse.cdt.cmake.core.properties.IOsOverrides;
-import org.eclipse.cdt.jsoncdb.core.CompileCommandsJsonParser;
-import org.eclipse.cdt.jsoncdb.core.ISourceFileInfoConsumer;
-import org.eclipse.cdt.jsoncdb.core.ParseRequest;
 import org.eclipse.cdt.core.CommandLauncherManager;
 import org.eclipse.cdt.core.ConsoleOutputStream;
 import org.eclipse.cdt.core.ErrorParserManager;
@@ -50,6 +47,9 @@ import org.eclipse.cdt.core.model.ICModelMarker;
 import org.eclipse.cdt.core.parser.ExtendedScannerInfo;
 import org.eclipse.cdt.core.parser.IScannerInfo;
 import org.eclipse.cdt.core.resources.IConsole;
+import org.eclipse.cdt.jsoncdb.core.CompileCommandsJsonParser;
+import org.eclipse.cdt.jsoncdb.core.ISourceFileInfoConsumer;
+import org.eclipse.cdt.jsoncdb.core.ParseRequest;
 import org.eclipse.core.resources.IBuildConfiguration;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
index cc49aad7c9b..3290710927f 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
@@ -4716,7 +4716,7 @@ public class AST2CPPTests extends AST2CPPTestBase {
 		IASTTranslationUnit tu = parse(getAboveComment(), CPP);
 		ICPPASTCastExpression dynamic_cast = (ICPPASTCastExpression) ((IASTEqualsInitializer) ((IASTSimpleDeclaration) ((IASTDeclarationStatement) ((IASTCompoundStatement) ((IASTFunctionDefinition) tu
 				.getDeclarations()[2]).getBody()).getStatements()[0]).getDeclaration()).getDeclarators()[0]
-						.getInitializer()).getInitializerClause();
+				.getInitializer()).getInitializerClause();
 
 		assertEquals(dynamic_cast.getOperator(), ICPPASTCastExpression.op_dynamic_cast);
 	}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2KnRTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2KnRTests.java
index 81ca1ccb5c7..0f2aef8f87f 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2KnRTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2KnRTests.java
@@ -595,7 +595,7 @@ public class AST2KnRTests extends AST2TestBase {
 				.getParameterDeclarations()[0]).getDeclarators()[1].getName();
 		IASTName list3 = ((IASTIdExpression) ((IASTArraySubscriptExpression) ((IASTUnaryExpression) ((IASTBinaryExpression) ((IASTExpressionStatement) ((IASTCompoundStatement) getinp
 				.getBody()).getStatements()[0]).getExpression()).getOperand1()).getOperand()).getArrayExpression())
-						.getName();
+				.getName();
 
 		assertEquals(prompt1.resolveBinding(), prompt2.resolveBinding());
 		assertEquals(list1.resolveBinding(), list2.resolveBinding());
@@ -673,10 +673,10 @@ public class AST2KnRTests extends AST2TestBase {
 				.getParameterDeclarations()[0]).getDeclarators()[0].getName();
 		IASTName lemp_name3 = ((IASTIdExpression) ((IASTFieldReference) ((IASTArraySubscriptExpression) ((IASTFieldReference) ((IASTBinaryExpression) ((IASTExpressionStatement) ((IASTCompoundStatement) f_def
 				.getBody()).getStatements()[0]).getExpression()).getOperand1()).getFieldOwner()).getArrayExpression())
-						.getFieldOwner()).getName();
+				.getFieldOwner()).getName();
 		IASTName symbols_name2 = ((IASTFieldReference) ((IASTArraySubscriptExpression) ((IASTFieldReference) ((IASTBinaryExpression) ((IASTExpressionStatement) ((IASTCompoundStatement) f_def
 				.getBody()).getStatements()[0]).getExpression()).getOperand1()).getFieldOwner()).getArrayExpression())
-						.getFieldName();
+				.getFieldName();
 		IASTName lambda_name2 = ((IASTFieldReference) ((IASTBinaryExpression) ((IASTExpressionStatement) ((IASTCompoundStatement) f_def
 				.getBody()).getStatements()[0]).getExpression()).getOperand1()).getFieldName();
 
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java
index 43056df404f..571fa566393 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java
@@ -2533,7 +2533,7 @@ public class AST2Tests extends AST2TestBase {
 	public void testBug80978() throws Exception {
 		ICASTArrayModifier mod = (ICASTArrayModifier) ((IASTArrayDeclarator) ((IASTStandardFunctionDeclarator) ((IASTSimpleDeclaration) parse(
 				getAboveComment(), C).getDeclarations()[0]).getDeclarators()[0]).getParameters()[0].getDeclarator())
-						.getArrayModifiers()[0];
+				.getArrayModifiers()[0];
 		assertTrue(mod.isConst());
 		assertTrue(mod.isVariableSized());
 		assertFalse(mod.isStatic());
@@ -2846,7 +2846,7 @@ public class AST2Tests extends AST2TestBase {
 	public void testBug84250() throws Exception {
 		assertTrue(((IASTDeclarationStatement) ((IASTCompoundStatement) ((IASTFunctionDefinition) parse(
 				"void f() { int (*p) [2]; }", C).getDeclarations()[0]).getBody()).getStatements()[0]) //$NON-NLS-1$
-						.getDeclaration() instanceof IASTSimpleDeclaration);
+				.getDeclaration() instanceof IASTSimpleDeclaration);
 	}
 
 	// struct s1 { struct s2 *s2p; /* ... */ }; // D1
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java
index cb3069e238b..42a6f15461d 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java
@@ -48,7 +48,7 @@ import junit.framework.Test;
  * @author Vivian Kong
  */
 public class PDOMSearchTest extends PDOMTestBase {
-	final Comparator<IBinding> BINDING_COMPARATOR = new Comparator<IBinding>() {
+	final Comparator<IBinding> BINDING_COMPARATOR = new Comparator<>() {
 		@Override
 		public int compare(IBinding b1, IBinding b2) {
 			return b1.getName().compareTo(b2.getName());
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/ReferencedProjectsLanguageSettingsProvider.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/ReferencedProjectsLanguageSettingsProvider.java
index 7a6f688bbc5..1a34db0b7da 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/ReferencedProjectsLanguageSettingsProvider.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/ReferencedProjectsLanguageSettingsProvider.java
@@ -34,7 +34,7 @@ public class ReferencedProjectsLanguageSettingsProvider extends LanguageSettings
 	/** ID of the provider used in extension point from plugin.xml */
 	public static final String ID = "org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider"; //$NON-NLS-1$
 
-	final private ThreadLocal<Boolean> recursiveCallIndicator = new ThreadLocal<Boolean>() {
+	final private ThreadLocal<Boolean> recursiveCallIndicator = new ThreadLocal<>() {
 		@Override
 		protected Boolean initialValue() {
 			return false;
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java
index 0e2acbff464..8cc60070635 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java
@@ -70,7 +70,7 @@ public abstract class AbstractCProjectDescriptionStorage {
 	protected volatile IProject project;
 
 	/** Flag used to detect if setProjectDescription(...) is called by the thread already in a setProjectDescription(...) */
-	final private ThreadLocal<Boolean> setProjectDescriptionOperationRunning = new ThreadLocal<Boolean>() {
+	final private ThreadLocal<Boolean> setProjectDescriptionOperationRunning = new ThreadLocal<>() {
 		@Override
 		protected Boolean initialValue() {
 			return false;
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
index f1d7e921256..c566cb899c3 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
@@ -822,7 +822,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
 	}
 
 	/** ThreadLocal flag to let CDescriptor know whether already in a setProjectDescription */
-	ThreadLocal<Boolean> settingProjectDescription = new ThreadLocal<Boolean>() {
+	ThreadLocal<Boolean> settingProjectDescription = new ThreadLocal<>() {
 		@Override
 		protected Boolean initialValue() {
 			return false;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java
index 60dab642d73..213ea822bb6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java
@@ -89,7 +89,7 @@ public class ASTTypeUtil {
 	// sizes of type strings from getting out of control for certain code patterns.
 	private static final int TYPE_STRING_LENGTH_THRESHOLD = 100000;
 
-	private static final ThreadLocal<Set<IBinding>> fSourceFileOnlyCheckInProgress = new ThreadLocal<Set<IBinding>>() {
+	private static final ThreadLocal<Set<IBinding>> fSourceFileOnlyCheckInProgress = new ThreadLocal<>() {
 		@Override
 		protected Set<IBinding> initialValue() {
 			return new HashSet<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java
index de61b078028..78a91a67d0e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java
@@ -33,7 +33,7 @@ public class CharArrayObjectMap<T> extends CharTable {
 	/**
 	 * An empty immutable {@code CharArrayObjectMap}.
 	 */
-	public static final CharArrayObjectMap<?> EMPTY_MAP = new CharArrayObjectMap<Object>(0) {
+	public static final CharArrayObjectMap<?> EMPTY_MAP = new CharArrayObjectMap<>(0) {
 		@Override
 		public Object clone() {
 			return this;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java
index 634a650a096..a7e968a3197 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java
@@ -41,7 +41,7 @@ public final class CollectionUtils {
 	 * @throws NullPointerException if list is {@code null}
 	 */
 	public static <T> Iterator<T> reverseIterator(final List<T> list) {
-		return new Iterator<T>() {
+		return new Iterator<>() {
 			ListIterator<T> iterator = list.listIterator(list.size());
 
 			@Override
@@ -93,7 +93,7 @@ public final class CollectionUtils {
 		if (iter == null)
 			throw new NullPointerException("iter parameter is null"); //$NON-NLS-1$
 
-		return new Iterable<T>() {
+		return new Iterable<>() {
 			@Override
 			public Iterator<T> iterator() {
 				return iter;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java
index 331aa7ba873..3a2205c28f0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java
@@ -174,7 +174,7 @@ public abstract class ObjectTable<T> extends HashTable implements Iterable<T> {
 	 */
 	@Override
 	public Iterator<T> iterator() {
-		return new Iterator<T>() {
+		return new Iterator<>() {
 			int nextIndex;
 
 			@Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java
index 1e7b1d279b9..158d2b515c3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java
@@ -95,13 +95,13 @@ public abstract class ASTTranslationUnit extends ASTNode implements IASTTranslat
 	private IBuiltinBindingsProvider fBuiltinBindingsProvider;
 
 	// Caches
-	private final ThreadLocal<WeakHashMap<IType, String>> fUnnormalizedTypeStringCache = new ThreadLocal<WeakHashMap<IType, String>>() {
+	private final ThreadLocal<WeakHashMap<IType, String>> fUnnormalizedTypeStringCache = new ThreadLocal<>() {
 		@Override
 		protected WeakHashMap<IType, String> initialValue() {
 			return new WeakHashMap<>();
 		}
 	};
-	private final ThreadLocal<WeakHashMap<IType, String>> fNormalizedTypeStringCache = new ThreadLocal<WeakHashMap<IType, String>>() {
+	private final ThreadLocal<WeakHashMap<IType, String>> fNormalizedTypeStringCache = new ThreadLocal<>() {
 		@Override
 		protected WeakHashMap<IType, String> initialValue() {
 			return new WeakHashMap<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/CompositeValue.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/CompositeValue.java
index c3192b799f6..4c8a1eb6515 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/CompositeValue.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/CompositeValue.java
@@ -160,7 +160,7 @@ public final class CompositeValue implements IValue {
 
 	// The set of class types for which composite value creation is in progress on each thread.
 	// Used to guard against infinite recursion due to a class (illegally) aggregating itself.
-	private static final ThreadLocal<Set<ICPPClassType>> fCreateInProgress = new ThreadLocal<Set<ICPPClassType>>() {
+	private static final ThreadLocal<Set<ICPPClassType>> fCreateInProgress = new ThreadLocal<>() {
 		@Override
 		protected Set<ICPPClassType> initialValue() {
 			return new TreeSet<>((type1, type2) -> {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java
index 576190d1363..6314292ed60 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java
@@ -51,7 +51,7 @@ public class CVariable extends PlatformObject implements ICInternalBinding, IVar
 	 * The set of CVariable objects for which initial value computation is in progress on each thread.
 	 * This is used to guard against recursion during initial value computation.
 	 */
-	private static final ThreadLocal<Set<CVariable>> fInitialValueInProgress = new ThreadLocal<Set<CVariable>>() {
+	private static final ThreadLocal<Set<CVariable>> fInitialValueInProgress = new ThreadLocal<>() {
 		@Override
 		protected Set<CVariable> initialValue() {
 			return new HashSet<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java
index 6119aebacb2..e77cad25114 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java
@@ -54,7 +54,7 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
 	// The following fields are used by the PDOM bindings and need to be volatile.
 	private volatile ICPPBase[] fBases;
 	private volatile ICPPMethod[] ownInheritedConstructors;
-	private final ThreadLocal<Boolean> fComputingBases = new ThreadLocal<Boolean>() {
+	private final ThreadLocal<Boolean> fComputingBases = new ThreadLocal<>() {
 		@Override
 		protected Boolean initialValue() {
 			return false;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
index db1d5b2455d..64271bedd79 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
@@ -190,7 +190,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 	private ICPPClassSpecializationScope specScope;
 	private ObjectMap specializationMap = ObjectMap.EMPTY_MAP;
 	private ICPPBase[] bases;
-	private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<Set<IBinding>>() {
+	private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<>() {
 		@Override
 		protected Set<IBinding> initialValue() {
 			return new HashSet<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java
index b77e1b87038..78099e91259 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java
@@ -69,7 +69,7 @@ public class CPPVariable extends PlatformObject implements ICPPInternalDeclaredV
 	 * The set of CPPVariable objects for which initial value computation is in progress on each thread.
 	 * This is used to guard against recursion during initial value computation.
 	 */
-	private static final ThreadLocal<Set<CPPVariable>> fInitialValueInProgress = new ThreadLocal<Set<CPPVariable>>() {
+	private static final ThreadLocal<Set<CPPVariable>> fInitialValueInProgress = new ThreadLocal<>() {
 		@Override
 		protected Set<CPPVariable> initialValue() {
 			return new HashSet<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
index 77ddf8d212b..45f8fb677b5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
@@ -299,14 +299,14 @@ public class CPPSemantics {
 	// that are not reachable via includes from the file containing the name.
 	// Generally this is not allowed, but certain consumers, such as IncludeOrganizer,
 	// need it (since the whole point of IncludeOrganizer is to find missing headers).
-	private static final ThreadLocal<Boolean> fAllowPromiscuousBindingResolution = new ThreadLocal<Boolean>() {
+	private static final ThreadLocal<Boolean> fAllowPromiscuousBindingResolution = new ThreadLocal<>() {
 		@Override
 		protected Boolean initialValue() {
 			return false;
 		}
 	};
 
-	private static final ThreadLocal<Deque<IASTNode>> fLookupPoints = new ThreadLocal<Deque<IASTNode>>() {
+	private static final ThreadLocal<Deque<IASTNode>> fLookupPoints = new ThreadLocal<>() {
 		@Override
 		protected Deque<IASTNode> initialValue() {
 			return new ArrayDeque<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
index a4a8339066d..ba0378e9f23 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
@@ -239,13 +239,13 @@ public class CPPTemplates {
 
 	// Infrastructure to protect against rogue template metaprograms that don't terminate.
 	private static final int TEMPLATE_INSTANTIATION_DEPTH_LIMIT = 128;
-	private static final ThreadLocal<Integer> fTemplateInstantiationDepth = new ThreadLocal<Integer>() {
+	private static final ThreadLocal<Integer> fTemplateInstantiationDepth = new ThreadLocal<>() {
 		@Override
 		protected Integer initialValue() {
 			return 0;
 		}
 	};
-	private static final ThreadLocal<Set<TypeInstantiationRequest>> instantiationsInProgress = new ThreadLocal<Set<TypeInstantiationRequest>>() {
+	private static final ThreadLocal<Set<TypeInstantiationRequest>> instantiationsInProgress = new ThreadLocal<>() {
 		@Override
 		protected Set<TypeInstantiationRequest> initialValue() {
 			return new HashSet<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
index 80858af908b..6393d9cf453 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
@@ -279,7 +279,7 @@ public class CPPVisitor extends ASTQueries {
 	// Thread-local set of declarators for which auto types are being created.
 	// Used to prevent infinite recursion while processing invalid self-referencing
 	// auto-type declarations.
-	private static final ThreadLocal<Set<IASTDeclarator>> autoTypeDeclarators = new ThreadLocal<Set<IASTDeclarator>>() {
+	private static final ThreadLocal<Set<IASTDeclarator>> autoTypeDeclarators = new ThreadLocal<>() {
 		@Override
 		protected Set<IASTDeclarator> initialValue() {
 			return new HashSet<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUtil.java
index 3e668dce2ef..e41c71d1ca8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUtil.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUtil.java
@@ -39,7 +39,7 @@ public class EvalUtil {
 	 * The set of ICPPVariable objects for which initial value computation is in progress on each thread.
 	 * This is used to guard against recursion during initial value computation.
 	 */
-	private static final ThreadLocal<Set<ICPPVariable>> fInitialValueInProgress = new ThreadLocal<Set<ICPPVariable>>() {
+	private static final ThreadLocal<Set<ICPPVariable>> fInitialValueInProgress = new ThreadLocal<>() {
 		@Override
 		protected Set<ICPPVariable> initialValue() {
 			return new HashSet<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java
index 37f0da7e435..ab8380c065e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java
@@ -45,7 +45,7 @@ import org.eclipse.cdt.internal.core.index.composite.ICompositesFactory;
 
 public class CompositeCPPClassSpecialization extends CompositeCPPClassType implements ICPPClassSpecialization {
 	private ObjectMap specializationMap;
-	private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<Set<IBinding>>() {
+	private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<>() {
 		@Override
 		protected Set<IBinding> initialValue() {
 			return new HashSet<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/SignificantMacros.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/SignificantMacros.java
index 4d9e8a807b8..80e55a89f46 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/SignificantMacros.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/SignificantMacros.java
@@ -33,7 +33,7 @@ import org.eclipse.cdt.core.parser.util.CharArrayUtils;
 public class SignificantMacros implements ISignificantMacros {
 	public static final char[] DEFINED = { 0 };
 	public static final char[] UNDEFINED = { 1 };
-	private static final Comparator<char[]> SORTER = new Comparator<char[]>() {
+	private static final Comparator<char[]> SORTER = new Comparator<>() {
 		@Override
 		public int compare(char[] s1, char[] s2) {
 			return CharArrayUtils.compare(s1, s2);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java
index 5dd2cdafa0d..eb55a4e6cb5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java
@@ -137,7 +137,7 @@ public class Profiler {
 		Profiler profiler = threadProfiler.get();
 		if (profiler != null) {
 			List<Map.Entry<String, Timer>> list = new ArrayList<>(profiler.timers.entrySet());
-			Comparator<Map.Entry<String, Timer>> c = new Comparator<Map.Entry<String, Timer>>() {
+			Comparator<Map.Entry<String, Timer>> c = new Comparator<>() {
 				@Override
 				public int compare(Entry<String, Timer> o1, Entry<String, Timer> o2) {
 					long diff = o2.getValue().getElapsedTime() - o1.getValue().getElapsedTime();
@@ -153,7 +153,7 @@ public class Profiler {
 
 			if (!profiler.counters.isEmpty()) {
 				List<Map.Entry<String, int[]>> keyList = new ArrayList<>(profiler.counters.entrySet());
-				Comparator<Map.Entry<String, int[]>> c2 = new Comparator<Map.Entry<String, int[]>>() {
+				Comparator<Map.Entry<String, int[]>> c2 = new Comparator<>() {
 					@Override
 					public int compare(Entry<String, int[]> o1, Entry<String, int[]> o2) {
 						return o2.getValue()[0] - o1.getValue()[0];
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/CModelListener.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/CModelListener.java
index 5b750f5d232..364b6519edb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/CModelListener.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/CModelListener.java
@@ -42,7 +42,7 @@ public class CModelListener implements IElementChangedListener, IResourceChangeL
 	public static boolean sSuppressUpdateOfLastRecentlyUsed = false;
 
 	private PDOMManager fManager;
-	private final LinkedHashMap<ITranslationUnit, ITranslationUnit> fLRUs = new LinkedHashMap<ITranslationUnit, ITranslationUnit>(
+	private final LinkedHashMap<ITranslationUnit, ITranslationUnit> fLRUs = new LinkedHashMap<>(
 			UPDATE_LR_CHANGED_FILES_COUNT, 0.75f, true) {
 		@Override
 		protected boolean removeEldestEntry(Map.Entry<ITranslationUnit, ITranslationUnit> eldest) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMLinkage.java
index 170f025f470..42615e71cc4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMLinkage.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMLinkage.java
@@ -87,7 +87,7 @@ public abstract class PDOMLinkage extends PDOMNamedNode implements IIndexLinkage
 	 * The set of types currently being loaded from the index on each thread, represented as record numbers.
 	 * This is used to guard against infinite recursion while loading types.
 	 */
-	private static final ThreadLocal<Set<Long>> fLoadTypeInProgress = new ThreadLocal<Set<Long>>() {
+	private static final ThreadLocal<Set<Long>> fLoadTypeInProgress = new ThreadLocal<>() {
 		@Override
 		protected Set<Long> initialValue() {
 			return new HashSet<>();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
index 88e5ea11808..9e9364d6c56 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
@@ -76,7 +76,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization
 
 	private volatile ICPPClassScope fScope;
 	private ObjectMap specializationMap; // Obtained from the synchronized PDOM cache.
-	private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<Set<IBinding>>() {
+	private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<>() {
 		@Override
 		protected Set<IBinding> initialValue() {
 			return new HashSet<>();
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java
index 4ea7a17fb4c..cc454f227a3 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java
@@ -18,10 +18,10 @@ import org.eclipse.cdt.core.cdtvariables.CdtVariable;
 import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/resources/LocationAdapter.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/resources/LocationAdapter.java
index 31f2387dc53..57150aadca8 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/resources/LocationAdapter.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/resources/LocationAdapter.java
@@ -35,7 +35,7 @@ abstract class LocationAdapter<T> {
 
 	public abstract T getLocation(IFile file);
 
-	public static final LocationAdapter<IPath> PATH = new LocationAdapter<IPath>() {
+	public static final LocationAdapter<IPath> PATH = new LocationAdapter<>() {
 		@Override
 		public String extractName(IPath location) {
 			String name = location.lastSegment();
@@ -61,7 +61,7 @@ abstract class LocationAdapter<T> {
 		}
 	};
 
-	public static final LocationAdapter<URI> URI = new LocationAdapter<URI>() {
+	public static final LocationAdapter<URI> URI = new LocationAdapter<>() {
 		@Override
 		public String extractName(URI location) {
 			String path = location.getPath();
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java
index 002853bda88..f6d321a2b60 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java
@@ -46,7 +46,7 @@ public class TemplateCore {
 
 	private static Map<TemplateInfo, TemplateCore> templateCache = new HashMap<>();
 
-	public static final Comparator<TemplateCore> TEMPLATE_ID_CASE_INSENSITIVE_COMPARATOR = new Comparator<TemplateCore>() {
+	public static final Comparator<TemplateCore> TEMPLATE_ID_CASE_INSENSITIVE_COMPARATOR = new Comparator<>() {
 		@Override
 		public int compare(TemplateCore t1, TemplateCore t2) {
 			return String.CASE_INSENSITIVE_ORDER.compare(t1.getTemplateId(), t2.getTemplateId());
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java
index 9f6382f6c8a..a054be77ed4 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java
@@ -563,7 +563,7 @@ public class RemoveUnusedDeclarationsRefactoring extends CRefactoring {
 	 * in the reverse order.
 	 */
 	private static class SortedNodeSet<T extends IASTNode> extends TreeSet<T> {
-		private static final Comparator<IASTNode> COMPARATOR = new Comparator<IASTNode>() {
+		private static final Comparator<IASTNode> COMPARATOR = new Comparator<>() {
 			@Override
 			public int compare(IASTNode node1, IASTNode node2) {
 				int c = Integer.compare(ASTNodes.offset(node1), ASTNodes.offset(node2));
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java
index 087be3a3a59..b15588d664c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java
@@ -49,7 +49,7 @@ public class LinkedProposalModel {
 
 	public Iterator<LinkedProposalPositionGroup> getPositionGroupIterator() {
 		if (fPositionGroups == null) {
-			return new Iterator<LinkedProposalPositionGroup>() {
+			return new Iterator<>() {
 				@Override
 				public boolean hasNext() {
 					return false;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java
index 7f2cd706952..da57db0f6db 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java
@@ -131,7 +131,7 @@ public class CreateParserLogAction implements IObjectActionDelegate {
 		}
 	}
 
-	private static final Comparator<String> COMP_INSENSITIVE = new Comparator<String>() {
+	private static final Comparator<String> COMP_INSENSITIVE = new Comparator<>() {
 		@Override
 		public int compare(String o1, String o2) {
 			return o1.toUpperCase().compareTo(o2.toUpperCase());
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java
index 298d3af4b6b..b1542e510d9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java
@@ -51,7 +51,7 @@ public class CHHistoryListAction extends Action {
 			setTitle(CHMessages.CHHistoryListAction_HistoryDialog_title);
 			String[] buttonLabels = new String[] { CHMessages.CHHistoryListAction_Remove_label, };
 
-			IListAdapter<ICElement> adapter = new IListAdapter<ICElement>() {
+			IListAdapter<ICElement> adapter = new IListAdapter<>() {
 				@Override
 				public void customButtonPressed(ListDialogField<ICElement> field, int index) {
 					doCustomButtonPressed();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHReferenceInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHReferenceInfo.java
index b1f22241918..84ae89a9b55 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHReferenceInfo.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHReferenceInfo.java
@@ -16,7 +16,7 @@ package org.eclipse.cdt.internal.ui.callhierarchy;
 import java.util.Comparator;
 
 public class CHReferenceInfo {
-	public static final Comparator<CHReferenceInfo> COMPARE_OFFSET = new Comparator<CHReferenceInfo>() {
+	public static final Comparator<CHReferenceInfo> COMPARE_OFFSET = new Comparator<>() {
 		@Override
 		public int compare(CHReferenceInfo r1, CHReferenceInfo r2) {
 			return r1.fOffset - r2.fOffset;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java
index 5800b757a28..d74d0851717 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java
@@ -171,7 +171,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage
 		super(CPathEntryMessages.IncludeSymbolEntryPage_title);
 		fContext = context;
 		IncludeSymbolAdapter adapter = new IncludeSymbolAdapter();
-		fIncludeSymPathsList = new TreeListDialogField<CPElementGroup>(adapter, buttonLabel,
+		fIncludeSymPathsList = new TreeListDialogField<>(adapter, buttonLabel,
 				new CPElementLabelProvider(true, false)) {
 
 			@Override
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java
index e7f851ce9fa..d8196638481 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java
@@ -218,7 +218,7 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB
 		super(CPathEntryMessages.IncludeSymbolEntryPage_title);
 		fContext = context;
 		IncludeSymbolAdapter adapter = new IncludeSymbolAdapter();
-		fIncludeSymPathsList = new TreeListDialogField<CPElementGroup>(adapter, buttonLabel,
+		fIncludeSymPathsList = new TreeListDialogField<>(adapter, buttonLabel,
 				new CPElementLabelProvider(true, false)) {
 
 			@Override
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java
index fdb0fcc5b9e..8136b813cc6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java
@@ -52,7 +52,7 @@ public class IBHistoryListAction extends Action {
 			setTitle(IBMessages.IBHistoryListAction_HistoryDialog_title);
 			String[] buttonLabels = new String[] { IBMessages.IBHistoryListAction_Remove_label, };
 
-			IListAdapter<ITranslationUnit> adapter = new IListAdapter<ITranslationUnit>() {
+			IListAdapter<ITranslationUnit> adapter = new IListAdapter<>() {
 				@Override
 				public void customButtonPressed(ListDialogField<ITranslationUnit> field, int index) {
 					doCustomButtonPressed();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
index 23daffbe50f..5649396e724 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
@@ -158,7 +158,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 		}
 	}
 
-	private final Comparator<ModelElement> fCategoryComparator = new Comparator<ModelElement>() {
+	private final Comparator<ModelElement> fCategoryComparator = new Comparator<>() {
 		@Override
 		public int compare(ModelElement o1, ModelElement o2) {
 			return o1.getRank() - o2.getRank();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java
index ea7a495068b..385b8173bff 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java
@@ -80,7 +80,7 @@ public class HeaderSubstitutionMapEditDialog extends ResizableStatusDialog {
 	private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
 	private static final String TAG_HEADER_SUBSTITUTION_MAP = "header_substitution_map"; //$NON-NLS-1$
 	private static final Collator COLLATOR = Collator.getInstance();
-	private static final Comparator<HeaderSubstitutionRule> SOURCE_COMPARATOR = new Comparator<HeaderSubstitutionRule>() {
+	private static final Comparator<HeaderSubstitutionRule> SOURCE_COMPARATOR = new Comparator<>() {
 		@Override
 		public int compare(HeaderSubstitutionRule r1, HeaderSubstitutionRule r2) {
 			return COLLATOR.compare(r1.getSource(), r2.getSource());
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java
index 769d3b1030a..7f2d7e14be0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java
@@ -160,53 +160,50 @@ public class NameStyleBlock extends OptionsConfigurationBlock {
 		Category codeCategory = new Category(PreferencesMessages.NameStyleBlock_code_node);
 		new Category(PreferencesMessages.NameStyleBlock_constant_node,
 				PreferencesMessages.NameStyleBlock_constant_node_description, EXAMPLE_CONSTANT_NAME, codeCategory)
-						.setCapitalizationKey(KEY_CONSTANT_CAPITALIZATION)
-						.setWordDelimiterKey(KEY_CONSTANT_WORD_DELIMITER).setPrefixKey(KEY_CONSTANT_PREFIX)
-						.setSuffixKey(KEY_CONSTANT_SUFFIX).setNameValidator(IDENTIFIER_VALIDATOR);
+				.setCapitalizationKey(KEY_CONSTANT_CAPITALIZATION).setWordDelimiterKey(KEY_CONSTANT_WORD_DELIMITER)
+				.setPrefixKey(KEY_CONSTANT_PREFIX).setSuffixKey(KEY_CONSTANT_SUFFIX)
+				.setNameValidator(IDENTIFIER_VALIDATOR);
 		new Category(PreferencesMessages.NameStyleBlock_variable_node,
 				PreferencesMessages.NameStyleBlock_variable_node_description, EXAMPLE_VARIABLE_NAME, codeCategory)
-						.setCapitalizationKey(KEY_VARIABLE_CAPITALIZATION)
-						.setWordDelimiterKey(KEY_VARIABLE_WORD_DELIMITER).setPrefixKey(KEY_VARIABLE_PREFIX)
-						.setSuffixKey(KEY_VARIABLE_SUFFIX).setNameValidator(IDENTIFIER_VALIDATOR);
+				.setCapitalizationKey(KEY_VARIABLE_CAPITALIZATION).setWordDelimiterKey(KEY_VARIABLE_WORD_DELIMITER)
+				.setPrefixKey(KEY_VARIABLE_PREFIX).setSuffixKey(KEY_VARIABLE_SUFFIX)
+				.setNameValidator(IDENTIFIER_VALIDATOR);
 		Category fieldCategory = new Category(PreferencesMessages.NameStyleBlock_field_node,
 				PreferencesMessages.NameStyleBlock_field_node_description, EXAMPLE_FIELD_NAME, codeCategory)
-						.setCapitalizationKey(KEY_FIELD_CAPITALIZATION).setWordDelimiterKey(KEY_FIELD_WORD_DELIMITER)
-						.setPrefixKey(KEY_FIELD_PREFIX).setSuffixKey(KEY_FIELD_SUFFIX)
-						.setNameValidator(IDENTIFIER_VALIDATOR);
+				.setCapitalizationKey(KEY_FIELD_CAPITALIZATION).setWordDelimiterKey(KEY_FIELD_WORD_DELIMITER)
+				.setPrefixKey(KEY_FIELD_PREFIX).setSuffixKey(KEY_FIELD_SUFFIX).setNameValidator(IDENTIFIER_VALIDATOR);
 		new Category(PreferencesMessages.NameStyleBlock_method_node,
 				PreferencesMessages.NameStyleBlock_method_node_description, EXAMPLE_METHOD_NAME, codeCategory)
-						.setCapitalizationKey(KEY_METHOD_CAPITALIZATION).setWordDelimiterKey(KEY_METHOD_WORD_DELIMITER)
-						.setPrefixKey(KEY_METHOD_PREFIX).setSuffixKey(KEY_METHOD_SUFFIX)
-						.setNameValidator(IDENTIFIER_VALIDATOR);
+				.setCapitalizationKey(KEY_METHOD_CAPITALIZATION).setWordDelimiterKey(KEY_METHOD_WORD_DELIMITER)
+				.setPrefixKey(KEY_METHOD_PREFIX).setSuffixKey(KEY_METHOD_SUFFIX).setNameValidator(IDENTIFIER_VALIDATOR);
 		new Category(PreferencesMessages.NameStyleBlock_getter_node,
 				PreferencesMessages.NameStyleBlock_getter_node_description, EXAMPLE_FIELD_NAME, codeCategory)
-						.setCapitalizationKey(KEY_GETTER_CAPITALIZATION).setWordDelimiterKey(KEY_GETTER_WORD_DELIMITER)
-						.setPrefixKey(KEY_GETTER_PREFIX).setAlternativePrefixKey(KEY_GETTER_PREFIX_FOR_BOOLEAN)
-						.setSuffixKey(KEY_GETTER_SUFFIX).setSeedNameGenerator(fieldCategory)
-						.setNameValidator(IDENTIFIER_VALIDATOR).setTrimFieldName(true);
+				.setCapitalizationKey(KEY_GETTER_CAPITALIZATION).setWordDelimiterKey(KEY_GETTER_WORD_DELIMITER)
+				.setPrefixKey(KEY_GETTER_PREFIX).setAlternativePrefixKey(KEY_GETTER_PREFIX_FOR_BOOLEAN)
+				.setSuffixKey(KEY_GETTER_SUFFIX).setSeedNameGenerator(fieldCategory)
+				.setNameValidator(IDENTIFIER_VALIDATOR).setTrimFieldName(true);
 		new Category(PreferencesMessages.NameStyleBlock_setter_node,
 				PreferencesMessages.NameStyleBlock_setter_node_description, EXAMPLE_FIELD_NAME, codeCategory)
-						.setCapitalizationKey(KEY_SETTER_CAPITALIZATION).setWordDelimiterKey(KEY_SETTER_WORD_DELIMITER)
-						.setPrefixKey(KEY_SETTER_PREFIX).setSuffixKey(KEY_SETTER_SUFFIX)
-						.setSeedNameGenerator(fieldCategory).setNameValidator(IDENTIFIER_VALIDATOR)
-						.setTrimFieldName(true);
+				.setCapitalizationKey(KEY_SETTER_CAPITALIZATION).setWordDelimiterKey(KEY_SETTER_WORD_DELIMITER)
+				.setPrefixKey(KEY_SETTER_PREFIX).setSuffixKey(KEY_SETTER_SUFFIX).setSeedNameGenerator(fieldCategory)
+				.setNameValidator(IDENTIFIER_VALIDATOR).setTrimFieldName(true);
 		new IncludeGuardCategory(codeCategory);
 		Category fileCategory = new Category(PreferencesMessages.NameStyleBlock_files_node);
 		new Category(PreferencesMessages.NameStyleBlock_cpp_header_node,
 				PreferencesMessages.NameStyleBlock_cpp_header_node_description, EXAMPLE_CLASS_NAME, fileCategory)
-						.setCapitalizationKey(KEY_CPP_HEADER_CAPITALIZATION)
-						.setWordDelimiterKey(KEY_CPP_HEADER_WORD_DELIMITER).setPrefixKey(KEY_CPP_HEADER_PREFIX)
-						.setSuffixKey(KEY_CPP_HEADER_SUFFIX).setNameValidator(FILENAME_VALIDATOR);
+				.setCapitalizationKey(KEY_CPP_HEADER_CAPITALIZATION).setWordDelimiterKey(KEY_CPP_HEADER_WORD_DELIMITER)
+				.setPrefixKey(KEY_CPP_HEADER_PREFIX).setSuffixKey(KEY_CPP_HEADER_SUFFIX)
+				.setNameValidator(FILENAME_VALIDATOR);
 		new Category(PreferencesMessages.NameStyleBlock_cpp_source_node,
 				PreferencesMessages.NameStyleBlock_cpp_source_node_description, EXAMPLE_CLASS_NAME, fileCategory)
-						.setCapitalizationKey(KEY_CPP_SOURCE_CAPITALIZATION)
-						.setWordDelimiterKey(KEY_CPP_SOURCE_WORD_DELIMITER).setPrefixKey(KEY_CPP_SOURCE_PREFIX)
-						.setSuffixKey(KEY_CPP_SOURCE_SUFFIX).setNameValidator(FILENAME_VALIDATOR);
+				.setCapitalizationKey(KEY_CPP_SOURCE_CAPITALIZATION).setWordDelimiterKey(KEY_CPP_SOURCE_WORD_DELIMITER)
+				.setPrefixKey(KEY_CPP_SOURCE_PREFIX).setSuffixKey(KEY_CPP_SOURCE_SUFFIX)
+				.setNameValidator(FILENAME_VALIDATOR);
 		new Category(PreferencesMessages.NameStyleBlock_cpp_test_node,
 				PreferencesMessages.NameStyleBlock_cpp_test_node_description, EXAMPLE_CLASS_NAME, fileCategory)
-						.setCapitalizationKey(KEY_CPP_TEST_CAPITALIZATION)
-						.setWordDelimiterKey(KEY_CPP_TEST_WORD_DELIMITER).setPrefixKey(KEY_CPP_TEST_PREFIX)
-						.setSuffixKey(KEY_CPP_TEST_SUFFIX).setNameValidator(FILENAME_VALIDATOR);
+				.setCapitalizationKey(KEY_CPP_TEST_CAPITALIZATION).setWordDelimiterKey(KEY_CPP_TEST_WORD_DELIMITER)
+				.setPrefixKey(KEY_CPP_TEST_PREFIX).setSuffixKey(KEY_CPP_TEST_SUFFIX)
+				.setNameValidator(FILENAME_VALIDATOR);
 		return new Category[] { codeCategory, fileCategory };
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringMatchStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringMatchStore.java
index 1354b6a8f6c..0078b977827 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringMatchStore.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringMatchStore.java
@@ -34,7 +34,7 @@ public class CRefactoringMatchStore {
 	private Comparator<CRefactoringMatch> fOffsetComparator;
 
 	public CRefactoringMatchStore() {
-		fOffsetComparator = new Comparator<CRefactoringMatch>() {
+		fOffsetComparator = new Comparator<>() {
 			@Override
 			public int compare(CRefactoringMatch o1, CRefactoringMatch o2) {
 				return o1.getOffset() - o2.getOffset();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java
index b490d065351..f6d90648a9b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java
@@ -310,7 +310,7 @@ public class TextSearchWrapper {
 		}
 	}
 
-	final static Comparator<int[]> COMPARE_FIRST_INTEGER = new Comparator<int[]>() {
+	final static Comparator<int[]> COMPARE_FIRST_INTEGER = new Comparator<>() {
 		@Override
 		public int compare(int[] o1, int[] o2) {
 			return (o1)[0] - (o2)[0];
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java
index 50f0609adcc..2d6555195ef 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java
@@ -74,7 +74,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 	// may need a corresponding adjustment, and this stores the adjusted offset.
 	private int fAdjustedParseOffset = -1;
 
-	private Lazy<Integer> fContextInfoPosition = new Lazy<Integer>() {
+	private Lazy<Integer> fContextInfoPosition = new Lazy<>() {
 		@Override
 		protected Integer calculateValue() {
 			return guessContextInformationPosition();
@@ -83,7 +83,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 
 	private final Lazy<ITranslationUnit> fTU;
 
-	private final Lazy<Integer> fParseOffset = new Lazy<Integer>() {
+	private final Lazy<Integer> fParseOffset = new Lazy<>() {
 		@Override
 		protected Integer calculateValue() {
 			int result = doCalculate();
@@ -196,7 +196,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 		return null;
 	}
 
-	private final Lazy<IASTCompletionNode> fCN = new Lazy<IASTCompletionNode>() {
+	private final Lazy<IASTCompletionNode> fCN = new Lazy<>() {
 		@Override
 		protected IASTCompletionNode calculateValue() {
 			int offset = getParseOffset();
@@ -253,7 +253,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 		}
 	};
 
-	private final Lazy<Boolean> afterOpeningAngleBracket = new Lazy<Boolean>() {
+	private final Lazy<Boolean> afterOpeningAngleBracket = new Lazy<>() {
 		@Override
 		protected Boolean calculateValue() {
 			final int parseOffset = getParseOffset();
@@ -264,7 +264,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 		}
 	};
 
-	private final Lazy<Boolean> afterOpeningParenthesisOrBrace = new Lazy<Boolean>() {
+	private final Lazy<Boolean> afterOpeningParenthesisOrBrace = new Lazy<>() {
 		@Override
 		protected Boolean calculateValue() {
 			final int invocationOffset = getInvocationOffset();
@@ -295,7 +295,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 		}
 	};
 
-	private final Lazy<Boolean> inUsingDeclaration = new Lazy<Boolean>() {
+	private final Lazy<Boolean> inUsingDeclaration = new Lazy<>() {
 		/**
 		 * Checks whether the invocation offset is inside a using-declaration.
 		 *
@@ -331,7 +331,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 		}
 	};
 
-	private final Lazy<Boolean> followedBySemicolon = new Lazy<Boolean>() {
+	private final Lazy<Boolean> followedBySemicolon = new Lazy<>() {
 		@Override
 		protected Boolean calculateValue() {
 			final IDocument doc = getDocument();
@@ -342,7 +342,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 		}
 	};
 
-	private final Lazy<Boolean> followedByOpeningParen = new Lazy<Boolean>() {
+	private final Lazy<Boolean> followedByOpeningParen = new Lazy<>() {
 		@Override
 		protected Boolean calculateValue() {
 			final IDocument doc = getDocument();
@@ -353,7 +353,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 		}
 	};
 
-	private final Lazy<String> functionParameterDelimiter = new Lazy<String>() {
+	private final Lazy<String> functionParameterDelimiter = new Lazy<>() {
 		@Override
 		protected String calculateValue() {
 			String propertyKey = DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_METHOD_DECLARATION_PARAMETERS;
@@ -362,7 +362,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 		}
 	};
 
-	private final Lazy<String> templateParameterDelimiter = new Lazy<String>() {
+	private final Lazy<String> templateParameterDelimiter = new Lazy<>() {
 		@Override
 		protected String calculateValue() {
 			String propertyKey = DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_TEMPLATE_PARAMETERS;
@@ -387,7 +387,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 		fIsCompletion = isCompletion;
 		fIsContextInformationStyle = !isCompletion;
 		fIsAutoActivated = isAutoActivated;
-		fTU = new Lazy<ITranslationUnit>() {
+		fTU = new Lazy<>() {
 			@Override
 			protected ITranslationUnit calculateValue() {
 				return CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(fEditor.getEditorInput());
@@ -402,7 +402,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
 	 */
 	public CContentAssistInvocationContext(final ITranslationUnit unit, boolean isCompletion) {
 		super();
-		fTU = new Lazy<ITranslationUnit>() {
+		fTU = new Lazy<>() {
 			@Override
 			protected ITranslationUnit calculateValue() {
 				return unit;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java
index f21a081ec23..b3117214923 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java
@@ -92,7 +92,7 @@ public class ContentAssistProcessor implements IContentAssistProcessor {
 	 */
 	private static final String PREF_WARN_ABOUT_EMPTY_ASSIST_CATEGORY = "EmptyDefaultAssistCategory"; //$NON-NLS-1$
 
-	private static final Comparator<CompletionProposalCategory> ORDER_COMPARATOR = new Comparator<CompletionProposalCategory>() {
+	private static final Comparator<CompletionProposalCategory> ORDER_COMPARATOR = new Comparator<>() {
 		@Override
 		public int compare(CompletionProposalCategory d1, CompletionProposalCategory d2) {
 			return d1.getSortOrder() - d2.getSortOrder();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java
index 3ae0660a9f4..e1df83dc445 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java
@@ -51,7 +51,7 @@ public class CSelectAnnotationRulerAction extends SelectMarkerRulerAction {
 	private ResourceBundle fBundle;
 	// Annotations at the ruler's current line of activity, keyed by their presentation layer,
 	// in decreasing order (i.e. top to bottom).
-	private static Comparator<Integer> decreasingOrder = new Comparator<Integer>() {
+	private static Comparator<Integer> decreasingOrder = new Comparator<>() {
 		@Override
 		public int compare(Integer a, Integer b) {
 			return b - a;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
index 8e826eb549a..c1d416f8706 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
@@ -1312,7 +1312,7 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
 			}
 		}
 
-		Comparator<Tuple> comparator = new Comparator<Tuple>() {
+		Comparator<Tuple> comparator = new Comparator<>() {
 			@Override
 			public int compare(Tuple t1, Tuple t2) {
 				return t1.position.getOffset() - t2.position.getOffset();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java
index bbf956e0aaf..ac21585835c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java
@@ -30,7 +30,7 @@ import org.eclipse.jface.text.templates.TemplateVariableResolver;
 
 public class TemplateVariableProcessor implements IContentAssistProcessor {
 
-	private static Comparator<TemplateVariableProposal> fgTemplateVariableProposalComparator = new Comparator<TemplateVariableProposal>() {
+	private static Comparator<TemplateVariableProposal> fgTemplateVariableProposalComparator = new Comparator<>() {
 		@Override
 		public int compare(TemplateVariableProposal arg0, TemplateVariableProposal arg1) {
 			return arg0.getDisplayString().compareTo(arg1.getDisplayString());
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java
index 4a45321a7a4..c519861c770 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java
@@ -51,7 +51,7 @@ public class THHistoryListAction extends Action {
 			setTitle(Messages.THHistoryListAction_HistoryList_title);
 			String[] buttonLabels = new String[] { Messages.THHistoryListAction_Remove, };
 
-			IListAdapter<ICElement> adapter = new IListAdapter<ICElement>() {
+			IListAdapter<ICElement> adapter = new IListAdapter<>() {
 				@Override
 				public void customButtonPressed(ListDialogField<ICElement> field, int index) {
 					doCustomButtonPressed();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java
index e8ddb79e824..27a8ba4b190 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java
@@ -38,7 +38,7 @@ abstract class AbstractWorkingSetConfigsContribution extends CompoundContributio
 
 	private IWorkingSetProxy workingSet;
 
-	private Comparator<IWorkingSetConfiguration> configOrdering = new Comparator<IWorkingSetConfiguration>() {
+	private Comparator<IWorkingSetConfiguration> configOrdering = new Comparator<>() {
 		private Collator collator = Collator.getInstance();
 
 		@Override
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java
index 768c24923ec..5f4a0b12ef6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java
@@ -115,7 +115,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
 		String[] buttonLabels = new String[] { CUIMessages.BinaryParserBlock_button_up,
 				CUIMessages.BinaryParserBlock_button_down };
 
-		IListAdapter<BinaryParserConfiguration> listAdapter = new IListAdapter<BinaryParserConfiguration>() {
+		IListAdapter<BinaryParserConfiguration> listAdapter = new IListAdapter<>() {
 
 			@Override
 			public void customButtonPressed(ListDialogField<BinaryParserConfiguration> field, int index) {
@@ -131,8 +131,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
 			}
 		};
 
-		binaryList = new CheckedListDialogField<BinaryParserConfiguration>(listAdapter, buttonLabels,
-				new BinaryParserLabelProvider()) {
+		binaryList = new CheckedListDialogField<>(listAdapter, buttonLabels, new BinaryParserLabelProvider()) {
 
 			@Override
 			protected int getListStyle() {
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java
index 780163d9392..6ed3d6278e5 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java
@@ -971,7 +971,8 @@ public class ExecutablesManager extends PlatformObject
 			synchronized (executablesMap) {
 				for (Executable executableRemoved : executablesRemoved) {
 					List<Executable> execs = executablesMap.get(executableRemoved.getProject());
-					assert execs != null : "considering the list was used in populating 'executablesRemoved', how could it be gone now?"; //$NON-NLS-1$
+					assert execs != null
+							: "considering the list was used in populating 'executablesRemoved', how could it be gone now?"; //$NON-NLS-1$
 					if (execs != null) {
 						execs.remove(executableRemoved);
 					}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AddWatchpointOnVariableActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AddWatchpointOnVariableActionDelegate.java
index 5e417546247..0bbfe02ef00 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AddWatchpointOnVariableActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AddWatchpointOnVariableActionDelegate.java
@@ -86,8 +86,8 @@ public class AddWatchpointOnVariableActionDelegate extends AddWatchpointActionDe
 			assert false : "action should not have been available for object " + obj; //$NON-NLS-1$
 		} else if (selection instanceof StructuredSelection) {
 			// Not sure why, but sometimes we get an extraneous empty StructuredSelection. Seems harmless enough
-			assert ((StructuredSelection) selection)
-					.getFirstElement() == null : "action installed in unexpected type of view/part"; //$NON-NLS-1$
+			assert ((StructuredSelection) selection).getFirstElement() == null
+					: "action installed in unexpected type of view/part"; //$NON-NLS-1$
 		} else {
 			assert false : "action installed in unexpected type of view/part"; //$NON-NLS-1$
 		}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewUtils.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewUtils.java
index 100ea8841ea..5d24739af47 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewUtils.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewUtils.java
@@ -49,7 +49,7 @@ public class DebugViewUtils {
 	/** Gets workbench view (if any) with specified ID. */
 	public static IViewPart getViewWithID(String viewID) {
 		final String viewID_f = viewID;
-		RunnableWithResult<IViewPart> runnable = new RunnableWithResult<IViewPart>() {
+		RunnableWithResult<IViewPart> runnable = new RunnableWithResult<>() {
 			@Override
 			public IViewPart call() {
 				IViewPart view = null;
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbPinProvider.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbPinProvider.java
index e979d05e960..fb1c11fdfa4 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbPinProvider.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbPinProvider.java
@@ -133,7 +133,7 @@ public class GdbPinProvider implements IPinProvider {
 		IThreadDMData data = null;
 		final DsfServicesTracker tracker = new DsfServicesTracker(GdbUIPlugin.getBundleContext(), fSession.getId());
 		try {
-			Query<IThreadDMData> query = new Query<IThreadDMData>() {
+			Query<IThreadDMData> query = new Query<>() {
 				@Override
 				protected void execute(final DataRequestMonitor<IThreadDMData> rm) {
 					final IProcesses processes = tracker.getService(IProcesses.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbSteppingModeTarget.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbSteppingModeTarget.java
index d279ba86875..3e2d4274200 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbSteppingModeTarget.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbSteppingModeTarget.java
@@ -46,7 +46,7 @@ public class GdbSteppingModeTarget extends DsfSteppingModeTarget {
 
 	@Override
 	public boolean supportsInstructionStepping() {
-		Query<Boolean> supportInstructionStepping = new Query<Boolean>() {
+		Query<Boolean> supportInstructionStepping = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				IGDBBackend backend = fTracker.getService(IGDBBackend.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbAbstractReverseStepCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbAbstractReverseStepCommand.java
index eacb2c268f5..0c3b7bf5210 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbAbstractReverseStepCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbAbstractReverseStepCommand.java
@@ -75,7 +75,7 @@ public abstract class GdbAbstractReverseStepCommand extends AbstractDebugCommand
 		}
 
 		final StepType stepType = getStepType();
-		Query<Object> reverseStepQuery = new Query<Object>() {
+		Query<Object> reverseStepQuery = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Object> rm) {
 				IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);
@@ -111,7 +111,7 @@ public abstract class GdbAbstractReverseStepCommand extends AbstractDebugCommand
 		}
 
 		final StepType stepType = getStepType();
-		Query<Boolean> canReverseQuery = new Query<Boolean>() {
+		Query<Boolean> canReverseQuery = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Boolean> rm) {
 				IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java
index 759a1fd48dc..538bc46e8d9 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java
@@ -115,7 +115,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
 	 */
 	@Override
 	public boolean canConnect() {
-		Query<Boolean> canConnectQuery = new Query<Boolean>() {
+		Query<Boolean> canConnectQuery = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Boolean> rm) {
 				IProcesses procService = fTracker.getService(IProcesses.class);
@@ -271,7 +271,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
 
 	@Override
 	protected void doExecute(Object[] targets, IProgressMonitor monitor, final IRequest request) throws CoreException {
-		Query<Boolean> connectQuery = new Query<Boolean>() {
+		Query<Boolean> connectQuery = new Query<>() {
 			@Override
 			public void execute(final DataRequestMonitor<Boolean> rm) {
 				connect(new RequestMonitor(fExecutor, rm) {
@@ -521,7 +521,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
 		// Prompt the user to choose one or more processes
 		new PromptForPidJob(LaunchUIMessages.getString("ProcessPrompter.PromptJob"), //$NON-NLS-1$
 				processes.toArray(new IProcessExtendedInfo[processes.size()]), debuggedProcesses,
-				new DataRequestMonitor<Object>(fExecutor, rm) {
+				new DataRequestMonitor<>(fExecutor, rm) {
 					@Override
 					protected void handleCancel() {
 						rm.cancel();
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java
index d4948f90740..19d36b8032c 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java
@@ -95,7 +95,7 @@ public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implem
 
 	public boolean canDebugNewExecutable() {
 
-		Query<Boolean> canDebugQuery = new Query<Boolean>() {
+		Query<Boolean> canDebugQuery = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Boolean> rm) {
 				IProcesses procService = fTracker.getService(IProcesses.class);
@@ -157,7 +157,7 @@ public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implem
 
 	@Override
 	protected void doExecute(Object[] targets, IProgressMonitor monitor, IRequest request) throws CoreException {
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbResumeWithoutSignalCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbResumeWithoutSignalCommand.java
index 80f2c0e05a5..77e1f445da4 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbResumeWithoutSignalCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbResumeWithoutSignalCommand.java
@@ -64,7 +64,7 @@ public class GdbResumeWithoutSignalCommand extends AbstractDebugCommand implemen
 			return;
 		}
 
-		Query<Object> query = new Query<Object>() {
+		Query<Object> query = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Object> rm) {
 				IRunControl runControl = fTracker.getService(IRunControl.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseResumeCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseResumeCommand.java
index 3a1a57092f8..b1593edf026 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseResumeCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseResumeCommand.java
@@ -64,7 +64,7 @@ public class GdbReverseResumeCommand extends AbstractDebugCommand implements IRe
 			return;
 		}
 
-		Query<Object> reverseResume = new Query<Object>() {
+		Query<Object> reverseResume = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Object> rm) {
 				IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);
@@ -99,7 +99,7 @@ public class GdbReverseResumeCommand extends AbstractDebugCommand implements IRe
 			return false;
 		}
 
-		Query<Boolean> canReverseResume = new Query<Boolean>() {
+		Query<Boolean> canReverseResume = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Boolean> rm) {
 				IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseToggleCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseToggleCommand.java
index c69d5105bae..7270f44707a 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseToggleCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseToggleCommand.java
@@ -118,7 +118,7 @@ public class GdbReverseToggleCommand extends AbstractDebugCommand implements ICh
 			return;
 		}
 
-		Query<Object> setReverseMode = new Query<Object>() {
+		Query<Object> setReverseMode = new Query<>() {
 			@Override
 			public void execute(final DataRequestMonitor<Object> rm) {
 				final IReverseRunControl2 runControl = fTracker.getService(IReverseRunControl2.class);
@@ -209,7 +209,7 @@ public class GdbReverseToggleCommand extends AbstractDebugCommand implements ICh
 			return false;
 		}
 
-		Query<Boolean> canSetReverseMode = new Query<Boolean>() {
+		Query<Boolean> canSetReverseMode = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Boolean> rm) {
 				IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);
@@ -273,7 +273,7 @@ public class GdbReverseToggleCommand extends AbstractDebugCommand implements ICh
 			return false;
 		}
 
-		Query<Boolean> isToggledQuery = new Query<Boolean>() {
+		Query<Boolean> isToggledQuery = new Query<>() {
 			@Override
 			public void execute(final DataRequestMonitor<Boolean> rm) {
 				final IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);
@@ -349,7 +349,7 @@ public class GdbReverseToggleCommand extends AbstractDebugCommand implements ICh
 			return ReverseDebugMethod.OFF;
 		}
 
-		Query<ReverseDebugMethod> reverseMethodQuery = new Query<ReverseDebugMethod>() {
+		Query<ReverseDebugMethod> reverseMethodQuery = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<ReverseDebugMethod> rm) {
 				IReverseRunControl2 runControl = fTracker.getService(IReverseRunControl2.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java
index ed908246f2b..05155e7eae5 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java
@@ -74,7 +74,7 @@ public class GdbSaveTraceDataCommand extends AbstractDebugCommand implements ISa
 		PlatformUI.getWorkbench().getDisplay().syncExec(() -> fileName[0] = promptForFileName());
 
 		if (fileName[0] != null) {
-			Query<Object> saveTraceDataQuery = new Query<Object>() {
+			Query<Object> saveTraceDataQuery = new Query<>() {
 				@Override
 				public void execute(final DataRequestMonitor<Object> rm) {
 					IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
@@ -110,7 +110,7 @@ public class GdbSaveTraceDataCommand extends AbstractDebugCommand implements ISa
 			return false;
 		}
 
-		Query<Boolean> canSaveQuery = new Query<Boolean>() {
+		Query<Boolean> canSaveQuery = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Boolean> rm) {
 				IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java
index e5192e19f80..ea62787ef37 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java
@@ -71,7 +71,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem
 			return;
 		}
 
-		Query<Object> selectRecordQuery = new Query<Object>() {
+		Query<Object> selectRecordQuery = new Query<>() {
 			@Override
 			public void execute(final DataRequestMonitor<Object> rm) {
 				final IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
@@ -129,7 +129,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem
 			return false;
 		}
 
-		Query<Boolean> canSelectRecordQuery = new Query<Boolean>() {
+		Query<Boolean> canSelectRecordQuery = new Query<>() {
 			@Override
 			public void execute(final DataRequestMonitor<Boolean> rm) {
 				IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java
index 2fb085dcb5b..37c9deff147 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java
@@ -73,7 +73,7 @@ public class GdbSelectPrevTraceRecordCommand extends AbstractDebugCommand implem
 			return;
 		}
 
-		Query<Object> selectRecordQuery = new Query<Object>() {
+		Query<Object> selectRecordQuery = new Query<>() {
 			@Override
 			public void execute(final DataRequestMonitor<Object> rm) {
 				final IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
@@ -123,7 +123,7 @@ public class GdbSelectPrevTraceRecordCommand extends AbstractDebugCommand implem
 			return false;
 		}
 
-		Query<Boolean> canSelectRecordQuery = new Query<Boolean>() {
+		Query<Boolean> canSelectRecordQuery = new Query<>() {
 			@Override
 			public void execute(final DataRequestMonitor<Boolean> rm) {
 				final IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java
index f52ade7deb0..78c36635f71 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java
@@ -66,7 +66,7 @@ public class GdbStartTracingCommand extends AbstractDebugCommand implements ISta
 			return;
 		}
 
-		Query<Object> startTracingQuery = new Query<Object>() {
+		Query<Object> startTracingQuery = new Query<>() {
 			@Override
 			public void execute(final DataRequestMonitor<Object> rm) {
 				final IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
@@ -110,7 +110,7 @@ public class GdbStartTracingCommand extends AbstractDebugCommand implements ISta
 			return false;
 		}
 
-		Query<Boolean> canStartTracingQuery = new Query<Boolean>() {
+		Query<Boolean> canStartTracingQuery = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Boolean> rm) {
 				IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStopTracingCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStopTracingCommand.java
index b6c2de62f74..1a21cd7ac89 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStopTracingCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStopTracingCommand.java
@@ -64,7 +64,7 @@ public class GdbStopTracingCommand extends AbstractDebugCommand implements IStop
 			return;
 		}
 
-		Query<Object> stopTracingQuery = new Query<Object>() {
+		Query<Object> stopTracingQuery = new Query<>() {
 			@Override
 			public void execute(final DataRequestMonitor<Object> rm) {
 				IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
@@ -99,7 +99,7 @@ public class GdbStopTracingCommand extends AbstractDebugCommand implements IStop
 			return false;
 		}
 
-		Query<Boolean> canStopTracingQuery = new Query<Boolean>() {
+		Query<Boolean> canStopTracingQuery = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Boolean> rm) {
 				IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java
index 25d08102ae2..d9260565a74 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java
@@ -91,7 +91,7 @@ public class AttachProcessHandler extends AbstractHandler {
 			return false;
 		}
 
-		Query<Boolean> canConnectQuery = new Query<Boolean>() {
+		Query<Boolean> canConnectQuery = new Query<>() {
 			@Override
 			public void execute(DataRequestMonitor<Boolean> rm) {
 				BundleContext c = GdbUIPlugin.getDefault().getBundle().getBundleContext();
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java
index 36040994a26..36a6c379f8f 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java
@@ -297,7 +297,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded
 			GdbLaunch l = (GdbLaunch) obj;
 			final DsfServicesTracker tracker = new DsfServicesTracker(GdbPlugin.getBundleContext(),
 					l.getSession().getId());
-			Query<IDMContext> contextQuery = new Query<IDMContext>() {
+			Query<IDMContext> contextQuery = new Query<>() {
 				@Override
 				protected void execute(DataRequestMonitor<IDMContext> rm) {
 					ICommandControlService commandControl = tracker.getService(ICommandControlService.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java
index 3d034d61c69..cd8cc64b224 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java
@@ -245,7 +245,7 @@ public class TraceControlModel {
 			return null;
 		}
 
-		Query<ITraceVariableDMData[]> query = new Query<ITraceVariableDMData[]>() {
+		Query<ITraceVariableDMData[]> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<ITraceVariableDMData[]> rm) {
 
@@ -292,7 +292,7 @@ public class TraceControlModel {
 					TracepointsMessages.TraceControlView_create_variable_error);
 		}
 
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java
index eb3b2750882..02cedc97d19 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java
@@ -122,7 +122,7 @@ public class GdbVariableVMNode extends VariableVMNode {
 				getSession().getExecutor().execute(() -> {
 					final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
 					if (expressionService != null) {
-						final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<IExpressionDMAddress>(
+						final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<>(
 								getSession().getExecutor(), null) {
 							@Override
 							public void handleCompleted() {
@@ -161,7 +161,7 @@ public class GdbVariableVMNode extends VariableVMNode {
 				getSession().getExecutor().execute(() -> {
 					final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
 					if (expressionService != null) {
-						final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<IExpressionDMAddress>(
+						final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<>(
 								getSession().getExecutor(), null) {
 							@Override
 							public void handleCompleted() {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/GdbPlugin.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/GdbPlugin.java
index 9b79416996b..8f1e49ce66e 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/GdbPlugin.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/GdbPlugin.java
@@ -114,7 +114,7 @@ public class GdbPlugin extends Plugin {
 			if (launch instanceof GdbLaunch && ((GdbLaunch) launch).getSession().isActive()) {
 				final GdbLaunch gdbLaunch = (GdbLaunch) launch;
 
-				Query<Object> launchShutdownQuery = new Query<Object>() {
+				Query<Object> launchShutdownQuery = new Query<>() {
 					@Override
 					protected void execute(DataRequestMonitor<Object> rm) {
 						gdbLaunch.shutdownSession(rm);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java
index aee3a460ec5..24877b3c275 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java
@@ -104,7 +104,7 @@ public class CoreBuildLocalDebugLaunchDelegate extends CoreBuildLaunchConfigDele
 
 		gdbLaunch.addCLIProcess(gdbLaunch.getGDBPath().toOSString() + " (" + gdbVersion + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 
-		Query<Object> ready = new Query<Object>() {
+		Query<Object> ready = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Object> rm) {
 				DsfServicesTracker tracker = new DsfServicesTracker(
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java
index 71d46a6f22d..5aa1e3045e2 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java
@@ -235,7 +235,7 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses {
 			final DataRequestMonitor<IDMContext> rm) {
 		final IMIContainerDMContext containerDmc = createContainerContext(procCtx, MIProcesses.UNIQUE_GROUP_ID);
 
-		DataRequestMonitor<MIInfo> attachRm = new ImmediateDataRequestMonitor<MIInfo>(rm) {
+		DataRequestMonitor<MIInfo> attachRm = new ImmediateDataRequestMonitor<>(rm) {
 			@Override
 			protected void handleSuccess() {
 				GDBProcesses.super.attachDebuggerToProcess(procCtx, new ImmediateDataRequestMonitor<IDMContext>(rm) {
@@ -602,8 +602,7 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses {
 		createConsole(containerDmc, restart, new ImmediateRequestMonitor(requestMonitor) {
 			@Override
 			protected void handleSuccess() {
-				final DataRequestMonitor<MIInfo> execMonitor = new DataRequestMonitor<MIInfo>(getExecutor(),
-						requestMonitor) {
+				final DataRequestMonitor<MIInfo> execMonitor = new DataRequestMonitor<>(getExecutor(), requestMonitor) {
 					@Override
 					protected void handleSuccess() {
 						if (fBackend.getSessionType() != SessionType.REMOTE) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
index a53634e9013..8bca1e10eef 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
@@ -1473,8 +1473,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse
 					});
 		} else {
 
-			final DataRequestMonitor<IMIContainerDMContext[]> addExitedDRM = new ImmediateDataRequestMonitor<IMIContainerDMContext[]>(
-					rm) {
+			final DataRequestMonitor<IMIContainerDMContext[]> addExitedDRM = new ImmediateDataRequestMonitor<>(rm) {
 				@Override
 				protected void handleCompleted() {
 					List<IMIContainerDMContext> containerDmcs = new ArrayList<>(Arrays.asList(getData()));
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
index 7d529843175..53002bdd736 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
@@ -1588,8 +1588,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService
 
 			// It is important to use an ImmediateExecutor for this RM, to make sure we don't risk getting a new
 			// call to ExecuteWithTargetAvailable() when we just finished executing the steps.
-			fExecuteQueuedOpsStepMonitor = new MultiRequestMonitor<RequestMonitor>(ImmediateExecutor.getInstance(),
-					rm) {
+			fExecuteQueuedOpsStepMonitor = new MultiRequestMonitor<>(ImmediateExecutor.getInstance(), rm) {
 				@Override
 				protected void handleCompleted() {
 					assert fOperationsPending.size() == 0;
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java
index 5b539f2aca5..1ee5724f045 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java
@@ -809,8 +809,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpointsExt
 		expression = adjustWatchPointExpression(attributes, expression);
 
 		// The DataRequestMonitor for the add request
-		DataRequestMonitor<MIBreakInsertInfo> addWatchpointDRM = new DataRequestMonitor<MIBreakInsertInfo>(
-				getExecutor(), drm) {
+		DataRequestMonitor<MIBreakInsertInfo> addWatchpointDRM = new DataRequestMonitor<>(getExecutor(), drm) {
 			@Override
 			protected void handleSuccess() {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
index d846f3c1369..635600a00f6 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
@@ -1383,8 +1383,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I
 
 			// It is important to use an ImmediateExecutor for this RM, to make sure we don't risk getting a new
 			// call to ExecuteWithTargetAvailable() when we just finished executing the steps.
-			fExecuteQueuedOpsStepMonitor = new MultiRequestMonitor<RequestMonitor>(ImmediateExecutor.getInstance(),
-					rm) {
+			fExecuteQueuedOpsStepMonitor = new MultiRequestMonitor<>(ImmediateExecutor.getInstance(), rm) {
 				@Override
 				protected void handleCompleted() {
 					assert fOperationsPending.size() == 0;
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java
index 8b4e90f51e0..6da3f467708 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java
@@ -1525,7 +1525,7 @@ public class MIVariableManager implements ICommandControl {
 									}
 								}
 
-								final DataRequestMonitor<ChildFullExpressionInfo> childPathRm = new DataRequestMonitor<ChildFullExpressionInfo>(
+								final DataRequestMonitor<ChildFullExpressionInfo> childPathRm = new DataRequestMonitor<>(
 										fSession.getExecutor(), countingRm) {
 									@Override
 									protected void handleSuccess() {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java
index b0ccfdb0bee..f71e1af45a8 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java
@@ -46,7 +46,7 @@ public class MILogActionEnabler implements ILogActionEnabler {
 	@Override
 	public String evaluateExpression(final String expression) throws Exception {
 		// Use a Query to synchronize the call
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> drm) {
 				final IExpressions expressionService = fServiceTracker.getService(IExpressions.class);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIBackendCLIProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIBackendCLIProcess.java
index b896dd5ce7e..b341e976eae 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIBackendCLIProcess.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIBackendCLIProcess.java
@@ -99,7 +99,7 @@ public class MIBackendCLIProcess extends AbstractCLIProcess {
 		}
 
 		try {
-			Query<Object> query = new Query<Object>() {
+			Query<Object> query = new Query<>() {
 				@Override
 				protected void execute(final DataRequestMonitor<Object> rm) {
 					if (!DsfSession.isSessionActive(getSession().getId()) || isDisposed()
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java
index ff10903d7b8..7061cba1ada 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java
@@ -295,7 +295,7 @@ public class MIInferiorProcess extends Process implements IEventListener, IComma
 		// with multi-process (it is re-used by the different processes).
 		// We use it still for GDB 7.2, since the single-process case is the most common.
 		try {
-			Query<Integer> exitCodeQuery = new Query<Integer>() {
+			Query<Integer> exitCodeQuery = new Query<>() {
 				@Override
 				protected void execute(final DataRequestMonitor<Integer> rm) {
 					// Guard against session disposed.
diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/actions/GdbShowVersionHandler.java b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/actions/GdbShowVersionHandler.java
index 25bc40b2be4..9c4ef1d1cb0 100644
--- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/actions/GdbShowVersionHandler.java
+++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/actions/GdbShowVersionHandler.java
@@ -114,7 +114,7 @@ public class GdbShowVersionHandler implements IShowVersionHandler {
 								str = "======= GDB version: " + getData() + " ======="; //$NON-NLS-1$ //$NON-NLS-2$
 							} else {
 								str = "Could not obtain GDB version.  Error: " + //$NON-NLS-1$
-								getStatus();
+										getStatus();
 							}
 							funcService.notify(context.get(), str, new RequestMonitor(fExecutor, null) {
 								@Override
diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/launch/GdbExtendedFinalLaunchSequence.java b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/launch/GdbExtendedFinalLaunchSequence.java
index e2e41250ee0..28b508ac201 100644
--- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/launch/GdbExtendedFinalLaunchSequence.java
+++ b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/src/org/eclipse/cdt/examples/dsf/gdb/launch/GdbExtendedFinalLaunchSequence.java
@@ -99,7 +99,7 @@ public class GdbExtendedFinalLaunchSequence extends FinalLaunchSequence_7_12 {
 					str = "======= GDB version: " + getData() + " ======="; //$NON-NLS-1$ //$NON-NLS-2$
 				} else {
 					str = "Could not obtain GDB version.  Error: " + //$NON-NLS-1$
-					getStatus();
+							getStatus();
 				}
 				funcService.notify(fControl.getContext(), str, rm);
 			}
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdb.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdb.java
index 76ebe71e9f3..c03ecd44b7b 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdb.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/SuiteGdb.java
@@ -47,7 +47,7 @@ import org.junit.runners.Suite;
 		GDBRemoteTracepointsTest.class, TraceFileTest.class, GDBConsoleSynchronizingTest.class, MIMemoryTest.class,
 		MIDisassemblyTest.class, GDBProcessesTest.class, PostMortemCoreTest.class, CommandTimeoutTest.class,
 		ThreadStackFrameSyncTest.class, CommandLineArgsTest.class, MIAsyncErrorProcessorTests.class
-		/* Add your test class here */
+/* Add your test class here */
 })
 public class SuiteGdb {
 
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java
index 1962e073b61..d82d1ad47e4 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/TraceFileTest.java
@@ -325,7 +325,7 @@ public class TraceFileTest extends BaseParametrizedTestCase {
 				|| getLineForTag("INCR_X") == tracepoint.getLineNumber());
 		String[] actionNames = ((String) tracepoint.getMarker()
 				.getAttribute(BreakpointActionManager.BREAKPOINT_ACTION_ATTRIBUTE))
-						.split(TracepointActionManager.TRACEPOINT_ACTION_DELIMITER);
+				.split(TracepointActionManager.TRACEPOINT_ACTION_DELIMITER);
 		for (String name : actionNames) {
 			ITracepointAction a = tam.findAction(name);
 			assertNotNull(a);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
index c6a4a5f84ac..868939de060 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
@@ -47,7 +47,7 @@ public class CSourceNotFoundDescriptionFactory implements IAdapterFactory {
 	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (adapterType.equals(ICSourceNotFoundDescription.class) && adaptableObject instanceof IFrameDMContext) {
 			final IFrameDMContext frameDMC = (IFrameDMContext) adaptableObject;
-			Query<IStack.IFrameDMData> query = new Query<IStack.IFrameDMData>() {
+			Query<IStack.IFrameDMData> query = new Query<>() {
 				@Override
 				protected void execute(DataRequestMonitor<IStack.IFrameDMData> rm) {
 					DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java
index 7ed3bb22309..5a2f11438cb 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java
@@ -202,7 +202,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
 	protected boolean canAddRegisterGroup(IWorkbenchPart part, IStructuredSelection selection) {
 		try {
 			final SelectionDMContext selectionContext = new SelectionDMContext(selection);
-			Query<Boolean> query = new Query<Boolean>() {
+			Query<Boolean> query = new Query<>() {
 				@Override
 				protected void execute(DataRequestMonitor<Boolean> rm) {
 					IRegisters2 registersService;
@@ -267,7 +267,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
 				return false;
 			}
 
-			Query<Boolean> query = new Query<Boolean>() {
+			Query<Boolean> query = new Query<>() {
 				@Override
 				protected void execute(final DataRequestMonitor<Boolean> rm) {
 					IRegisters2 registersService;
@@ -346,7 +346,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
 		}
 
 		//Prepare to Query the service and check if the selected groups can be removed
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				IRegisters2 regService;
@@ -422,7 +422,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
 		}
 
 		//Prepare to Query the service
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				IRegisters2 regService;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java
index cb55025b976..511e1dc64f3 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java
@@ -51,7 +51,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
 		DsfSession session = DsfSession.getSession(fContext.getSessionId());
 		if (session != null && session.isActive()) {
 			try {
-				Query<Boolean> query = new Query<Boolean>() {
+				Query<Boolean> query = new Query<>() {
 					@Override
 					protected void execute(DataRequestMonitor<Boolean> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@@ -84,7 +84,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
 		if (session != null && session.isActive()) {
 			Throwable exception = null;
 			try {
-				Query<Object> query = new Query<Object>() {
+				Query<Object> query = new Query<>() {
 					@Override
 					protected void execute(final DataRequestMonitor<Object> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@@ -125,7 +125,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
 		DsfSession session = DsfSession.getSession(fContext.getSessionId());
 		if (session != null && session.isActive()) {
 			try {
-				Query<Boolean> query = new Query<Boolean>() {
+				Query<Boolean> query = new Query<>() {
 					@Override
 					protected void execute(DataRequestMonitor<Boolean> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@@ -158,7 +158,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
 		if (session != null && session.isActive()) {
 			Throwable exception = null;
 			try {
-				Query<Object> query = new Query<Object>() {
+				Query<Object> query = new Query<>() {
 					@Override
 					protected void execute(final DataRequestMonitor<Object> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java
index 9f388774a1a..68fa7f274ac 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java
@@ -57,7 +57,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
 		DsfSession session = DsfSession.getSession(fContext.getSessionId());
 		if (session != null && session.isActive()) {
 			try {
-				Query<Boolean> query = new Query<Boolean>() {
+				Query<Boolean> query = new Query<>() {
 					@Override
 					protected void execute(DataRequestMonitor<Boolean> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@@ -95,7 +95,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
 		if (session != null && session.isActive()) {
 			Throwable exception = null;
 			try {
-				Query<Object> query = new Query<Object>() {
+				Query<Object> query = new Query<>() {
 					@Override
 					protected void execute(final DataRequestMonitor<Object> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@@ -136,7 +136,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
 		DsfSession session = DsfSession.getSession(fContext.getSessionId());
 		if (session != null && session.isActive()) {
 			try {
-				Query<Boolean> query = new Query<Boolean>() {
+				Query<Boolean> query = new Query<>() {
 					@Override
 					protected void execute(DataRequestMonitor<Boolean> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@@ -169,7 +169,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
 		if (session != null && session.isActive()) {
 			Throwable exception = null;
 			try {
-				Query<Object> query = new Query<Object>() {
+				Query<Object> query = new Query<>() {
 					@Override
 					protected void execute(final DataRequestMonitor<Object> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java
index f40fa3b7bb6..a734c6d2679 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java
@@ -60,7 +60,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
 		DsfSession session = DsfSession.getSession(fContext.getSessionId());
 		if (session != null && session.isActive()) {
 			try {
-				Query<Boolean> query = new Query<Boolean>() {
+				Query<Boolean> query = new Query<>() {
 					@Override
 					protected void execute(DataRequestMonitor<Boolean> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@@ -99,7 +99,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
 		if (session != null && session.isActive()) {
 			Throwable exception = null;
 			try {
-				Query<Object> query = new Query<Object>() {
+				Query<Object> query = new Query<>() {
 					@Override
 					protected void execute(final DataRequestMonitor<Object> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@@ -140,7 +140,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
 		DsfSession session = DsfSession.getSession(fContext.getSessionId());
 		if (session != null && session.isActive()) {
 			try {
-				Query<Boolean> query = new Query<Boolean>() {
+				Query<Boolean> query = new Query<>() {
 					@Override
 					protected void execute(DataRequestMonitor<Boolean> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@@ -173,7 +173,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
 		if (session != null && session.isActive()) {
 			Throwable exception = null;
 			try {
-				Query<Object> query = new Query<Object>() {
+				Query<Object> query = new Query<>() {
 					@Override
 					protected void execute(final DataRequestMonitor<Object> rm) {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java
index b8fbf964aa2..9fbcafff3a6 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java
@@ -230,7 +230,7 @@ abstract public class AbstractDsfDebugTextHover extends AbstractDebugTextHover i
 			if (frameDmc != null) {
 				final DsfSession dsfSession = DsfSession.getSession(frameDmc.getSessionId());
 				if (dsfSession != null) {
-					Callable<IExpressionDMContext> callable = new Callable<IExpressionDMContext>() {
+					Callable<IExpressionDMContext> callable = new Callable<>() {
 						@Override
 						public IExpressionDMContext call() throws Exception {
 							DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionCommand.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionCommand.java
index 38693c6db1a..b3a4f03d8fc 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionCommand.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionCommand.java
@@ -118,7 +118,7 @@ public class DsfStepIntoSelectionCommand extends AbstractDebugCommand
 
 		if (fSession != null && fSession.isActive()) {
 			try {
-				Query<Boolean> query = new Query<Boolean>() {
+				Query<Boolean> query = new Query<>() {
 					@Override
 					protected void execute(DataRequestMonitor<Boolean> rm) {
 						IRunControl3 runControl = fTracker.getService(IRunControl3.class);
@@ -149,7 +149,7 @@ public class DsfStepIntoSelectionCommand extends AbstractDebugCommand
 		if (fSession != null && fSession.isActive()) {
 			Throwable exception = null;
 			try {
-				Query<Object> query = new Query<Object>() {
+				Query<Object> query = new Query<>() {
 					@Override
 					protected void execute(final DataRequestMonitor<Object> rm) {
 						IRunControl3 runControl = fTracker.getService(IRunControl3.class);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java
index 41bef3ced22..62c26174917 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java
@@ -166,7 +166,7 @@ public class BreakpointVMProvider extends AbstractCachingVMProvider {
 
 	private final Map<TreePath, ContainerBreakpointsCache> fContainerBreakpointsCacheMap = new HashMap<>();
 
-	private DataCache<IBreakpoint[]> fFilteredBreakpointsCache = new DataCache<IBreakpoint[]>(getExecutor()) {
+	private DataCache<IBreakpoint[]> fFilteredBreakpointsCache = new DataCache<>(getExecutor()) {
 		@Override
 		protected void retrieve(org.eclipse.cdt.dsf.concurrent.DataRequestMonitor<IBreakpoint[]> rm) {
 			calcFileteredBreakpoints(rm);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/DataCache.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/DataCache.java
index aa199baa743..92cc9f49dd4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/DataCache.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/DataCache.java
@@ -110,7 +110,7 @@ abstract class DataCache<V> {
 			boolean first = fWaitingList.isEmpty();
 			fWaitingList.add(rm);
 			if (first) {
-				fRm = new DataRequestMonitor<V>(fExecutor, null) {
+				fRm = new DataRequestMonitor<>(fExecutor, null) {
 					@Override
 					protected void handleCompleted() {
 						if (!isCanceled()) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java
index dc953cceef6..a2f7e8a561f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java
@@ -80,7 +80,7 @@ public abstract class AbstractExpressionVMNode extends AbstractDMVMNode implemen
 						} else {
 							final List<Object> elements = getData();
 
-							final MultiRequestMonitor<DataRequestMonitor<Boolean>> multiRm = new MultiRequestMonitor<DataRequestMonitor<Boolean>>(
+							final MultiRequestMonitor<DataRequestMonitor<Boolean>> multiRm = new MultiRequestMonitor<>(
 									getExecutor(), null) {
 								@Override
 								protected void handleCompleted() {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java
index 58fa493b258..15d5ae00482 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java
@@ -197,7 +197,7 @@ public class ExpressionManagerVMNode extends AbstractVMNode implements IElementL
 				// the request monitor when it is finished.  The request monitor
 				// will in turn set the element in the update argument in this method.
 				((ExpressionVMProvider) getVMProvider()).update(new VMExpressionUpdate(update, expression,
-						new DataRequestMonitor<Object>(getVMProvider().getExecutor(), multiRm) {
+						new DataRequestMonitor<>(getVMProvider().getExecutor(), multiRm) {
 							@Override
 							protected void handleSuccess() {
 								update.setChild(getData(), childIndex);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java
index 3d264891909..e6a2c345c43 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java
@@ -51,7 +51,7 @@ public class ExpressionVMProviderContentStragegy extends DefaultVMContentProvide
 	private void updateExpressionWithNode(final IExpressionVMNode node, final IExpressionUpdate update) {
 		// Call the expression node to parse the expression and fill in the value.
 		node.update(new VMExpressionUpdate(update, update.getExpression(),
-				new ViewerDataRequestMonitor<Object>(getVMProvider().getExecutor(), update) {
+				new ViewerDataRequestMonitor<>(getVMProvider().getExecutor(), update) {
 					@Override
 					protected void handleSuccess() {
 						// Check if the evaluated node has child expression nodes.
@@ -63,17 +63,18 @@ public class ExpressionVMProviderContentStragegy extends DefaultVMContentProvide
 								update.getExpression());
 
 						if (matchingNode != null && !matchingNode.equals(node)) {
-							updateExpressionWithNode(matchingNode, new VMExpressionUpdate(
-									update.getElementPath().createChildPath(getData()), update.getViewerInput(),
-									update.getPresentationContext(), update.getExpression(),
-									new ViewerDataRequestMonitor<Object>(getVMProvider().getExecutor(), update) {
+							updateExpressionWithNode(matchingNode,
+									new VMExpressionUpdate(update.getElementPath().createChildPath(getData()),
+											update.getViewerInput(), update.getPresentationContext(),
+											update.getExpression(),
+											new ViewerDataRequestMonitor<>(getVMProvider().getExecutor(), update) {
 
-										@Override
-										protected void handleSuccess() {
-											update.setExpressionElement(getData());
-											update.done();
-										}
-									}));
+												@Override
+												protected void handleSuccess() {
+													update.setExpressionElement(getData());
+													update.done();
+												}
+											}));
 						} else {
 							update.setExpressionElement(getData());
 							update.done();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java
index 48d1f80c96b..a8d76d4516a 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java
@@ -97,22 +97,22 @@ public class ExpressionVMProviderModelProxyStrategy extends DefaultVMModelProxyS
 							buildNodeDeltaForExpression(matchingNode, expression, expressionElementIdx, event,
 									parentDelta, path, rm);
 						} else {
-							getExpressionVMProvider().update(new VMExpressionUpdate(parentDelta,
-									getVMProvider().getPresentationContext(), expression,
-									new DataRequestMonitor<Object>(getVMProvider().getExecutor(), rm) {
-										@Override
-										protected void handleSuccess() {
-											buildDeltaForExpressionElement(node, expression, getData(),
-													expressionElementIdx, event, parentDelta, path, rm);
-										}
-
-										@Override
-										protected void handleErrorOrWarning() {
-											// Avoid propagating the error to avoid processing the delta by
-											// all nodes.
-											rm.done();
-										}
-									}));
+							getExpressionVMProvider().update(
+									new VMExpressionUpdate(parentDelta, getVMProvider().getPresentationContext(),
+											expression, new DataRequestMonitor<>(getVMProvider().getExecutor(), rm) {
+												@Override
+												protected void handleSuccess() {
+													buildDeltaForExpressionElement(node, expression, getData(),
+															expressionElementIdx, event, parentDelta, path, rm);
+												}
+
+												@Override
+												protected void handleErrorOrWarning() {
+													// Avoid propagating the error to avoid processing the delta by
+													// all nodes.
+													rm.done();
+												}
+											}));
 						}
 					}
 				});
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java
index 0af115c765f..9c51a4fe6b6 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java
@@ -219,7 +219,7 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
 		// the request monitor when it is finished.  The request monitor
 		// will in turn set the element in the update argument in this method.
 		((ExpressionVMProvider) getVMProvider()).update(new VMExpressionUpdate(update, expression,
-				new ViewerDataRequestMonitor<Object>(getVMProvider().getExecutor(), update) {
+				new ViewerDataRequestMonitor<>(getVMProvider().getExecutor(), update) {
 					@Override
 					protected void handleSuccess() {
 						update.setChild(getData(), 0);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java
index 8d96619db13..5320a0ea20e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java
@@ -126,7 +126,7 @@ public class WatchExpressionCellModifier implements ICellModifier {
 		if (session == null) {
 			return null;
 		}
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				// Since cell modifier does not provide the fully qualified
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java
index cfce1eb28d3..25694859256 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java
@@ -100,7 +100,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy {
 				final IExecutionDMContext execContext = DMContexts.getAncestorOfType(dmContext,
 						IExecutionDMContext.class);
 				if (execContext != null) {
-					Query<Boolean> query = new Query<Boolean>() {
+					Query<Boolean> query = new Query<>() {
 						@Override
 						protected void execute(DataRequestMonitor<Boolean> rm) {
 							DsfServicesTracker servicesTracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@@ -197,7 +197,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy {
 			return false;
 		}
 
-		Query<Boolean> query = new Query<Boolean>() {
+		Query<Boolean> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Boolean> rm) {
 				DsfServicesTracker servicesTracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
index 9ac123bc867..f3234e3b89c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
@@ -190,7 +190,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
 						String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION);
 						String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE);
 						return function != null && !function.isEmpty() && function.contains(")") && //$NON-NLS-1$
-						module != null && !module.isEmpty();
+								module != null && !module.isEmpty();
 					}
 				}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_line__add_parens__text_format,
 						new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_FUNCTION,
@@ -200,7 +200,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
 						String function = (String) properties.get(ILaunchVMConstants.PROP_FRAME_FUNCTION);
 						String module = (String) properties.get(ILaunchVMConstants.PROP_FRAME_MODULE);
 						return function != null && !function.isEmpty() && !function.contains(")") && //$NON-NLS-1$
-						module != null && !module.isEmpty();
+								module != null && !module.isEmpty();
 					}
 				}, new LabelText(MessagesForLaunchVM.StackFramesVMNode_No_columns__No_function__text_format,
 						new String[] { ILaunchVMConstants.PROP_FRAME_ADDRESS, ILaunchVMConstants.PROP_FRAME_MODULE }) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java
index 2f3507146e4..c57b7e435cf 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java
@@ -437,7 +437,8 @@ public class FormattedValueRetriever {
 					elementFormatMap);
 
 			if (update.getProperties().contains(PROP_ACTIVE_FORMAT)) {
-				assert activeFormat != null : "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$
+				assert activeFormat != null
+						: "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$
 				update.setProperty(PROP_ACTIVE_FORMAT, activeFormat);
 			}
 			List<String> requestedFormats = calcRequestedFormats(update, activeFormat, availableFormatsMap.get(update));
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java
index d08ae709890..c600a63b8b4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueVMUtil.java
@@ -364,7 +364,8 @@ public class FormattedValueVMUtil {
 			final String activeFormat = _activeFormat; // null means we don't need to know what the active format is
 
 			if (update.getProperties().contains(IDebugVMConstants.PROP_FORMATTED_VALUE_ACTIVE_FORMAT)) {
-				assert activeFormat != null : "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$
+				assert activeFormat != null
+						: "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$
 				update.setProperty(IDebugVMConstants.PROP_FORMATTED_VALUE_ACTIVE_FORMAT, activeFormat);
 			}
 
@@ -376,7 +377,8 @@ public class FormattedValueVMUtil {
 			boolean activeFormatValueRequested = false; // does the update object ask for PROP_FORMATTED_VALUE_ACTIVE_FORMAT_VALUE?
 			boolean activeFormatValueHandled = false; // have we come across a specific format request that is the active format?
 			if (update.getProperties().contains(IDebugVMConstants.PROP_FORMATTED_VALUE_ACTIVE_FORMAT_VALUE)) {
-				assert activeFormat != null : "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$
+				assert activeFormat != null
+						: "Our caller should have provided the available formats if this property was specified; given available formats, an 'active' nomination is guaranteed."; //$NON-NLS-1$
 				activeFormatValueRequested = true; // we may end up making an additional run
 			}
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java
index 79f2443d29b..3ae1bb979b9 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java
@@ -1016,8 +1016,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
 			// Call IExpressions.getSubExpressions() to get an Iterable of IExpressionDMContext objects representing
 			// the sub-expressions of the expression represented by the current expression node.
 
-			final DataRequestMonitor<IExpressionDMContext[]> rm = new ViewerDataRequestMonitor<IExpressionDMContext[]>(
-					dsfExecutor, update) {
+			final DataRequestMonitor<IExpressionDMContext[]> rm = new ViewerDataRequestMonitor<>(dsfExecutor, update) {
 				@Override
 				public void handleCompleted() {
 					if (!isSuccess()) {
@@ -1077,8 +1076,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
 		// Call IStack.getLocals() to get an array of IVariableDMContext objects representing the local
 		// variables in the stack frame represented by frameDmc.
 
-		final DataRequestMonitor<IVariableDMContext[]> rm = new ViewerDataRequestMonitor<IVariableDMContext[]>(
-				dsfExecutor, update) {
+		final DataRequestMonitor<IVariableDMContext[]> rm = new ViewerDataRequestMonitor<>(dsfExecutor, update) {
 			@Override
 			public void handleCompleted() {
 				if (!isSuccess()) {
@@ -1147,7 +1145,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
 				// IVariableDMData object to the localsDMData List for later processing (see above).
 
 				for (IVariableDMContext localDMC : localsDMCs) {
-					DataRequestMonitor<IVariableDMData> rm = new DataRequestMonitor<IVariableDMData>(dsfExecutor, crm) {
+					DataRequestMonitor<IVariableDMData> rm = new DataRequestMonitor<>(dsfExecutor, crm) {
 						@Override
 						public void handleSuccess() {
 							localsDMData.add(getData());
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java
index 1be706b500c..09a12eabb14 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java
@@ -107,7 +107,7 @@ public class DisplayDsfExecutor extends DefaultDsfExecutor {
 			((DsfExecutable) callable).setSubmitted();
 		}
 
-		return new Callable<V>() {
+		return new Callable<>() {
 			@Override
 			@SuppressWarnings("unchecked")
 			public V call() throws Exception {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java
index df0b8a9a40b..9113c824c35 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java
@@ -141,7 +141,7 @@ public class DefaultVMContentProviderStrategy implements IElementContentProvider
 			for (int i = 0; i < updates.length; i++) {
 				final IHasChildrenUpdate update = updates[i];
 
-				final MultiRequestMonitor<DataRequestMonitor<Boolean>> hasChildrenMultiRequestMon = new MultiRequestMonitor<DataRequestMonitor<Boolean>>(
+				final MultiRequestMonitor<DataRequestMonitor<Boolean>> hasChildrenMultiRequestMon = new MultiRequestMonitor<>(
 						getVMProvider().getExecutor(), null) {
 					@Override
 					protected void handleCompleted() {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java
index 930035664d2..0ac8e4b992b 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java
@@ -123,8 +123,8 @@ public class VMPropertiesUpdate extends VMViewerUpdate implements IPropertiesUpd
 		} else if ((getStatus() instanceof PropertiesUpdateStatus)) {
 			((PropertiesUpdateStatus) getStatus()).add(status);
 		} else {
-			assert getStatus()
-					.getSeverity() == IStatus.CANCEL : "VMPropertiesUpdate status should always be a PropertiesUpdateStatus unless update is canceled."; //$NON-NLS-1$
+			assert getStatus().getSeverity() == IStatus.CANCEL
+					: "VMPropertiesUpdate status should always be a PropertiesUpdateStatus unless update is canceled."; //$NON-NLS-1$
 		}
 	}
 
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java
index 13bb598ff50..80531741e0b 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java
@@ -162,7 +162,7 @@ abstract public class RangeCache<V> {
 
 		List<Request> requests = getRequests(offset, count);
 
-		RequestCache<List<V>> range = new RequestCache<List<V>>(fExecutor) {
+		RequestCache<List<V>> range = new RequestCache<>(fExecutor) {
 			@Override
 			protected void retrieve(DataRequestMonitor<List<V>> rm) {
 				new RangeTransaction(offset, count).request(rm);
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java
index 3755a20cdfe..a95e1d1c9b3 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestCache.java
@@ -44,7 +44,7 @@ public abstract class RequestCache<V> extends AbstractCache<V> {
 			fRm.cancel();
 		}
 
-		fRm = new DataRequestMonitor<V>(getImmediateInDsfExecutor(), null) {
+		fRm = new DataRequestMonitor<>(getImmediateInDsfExecutor(), null) {
 
 			@Override
 			protected void handleCompleted() {
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java
index 7d2488024c3..034086a22df 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java
@@ -478,7 +478,7 @@ public class DsfMemoryBlockRetrieval extends PlatformObject implements IMemoryBl
 	protected BigInteger resolveMemoryAddress(final IDMContext dmc, final String expression) throws DebugException {
 
 		// Use a Query to "synchronize" the downstream calls
-		Query<BigInteger> query = new Query<BigInteger>() {
+		Query<BigInteger> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<BigInteger> drm) {
 				// Lookup for the ExpressionService
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java
index e078b8d3bdd..77b0ab0808e 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java
@@ -153,7 +153,7 @@ public class DsfSourceLookupParticipant extends AbstractSourceLookupParticipant
 		}
 
 		final IDMContext dmc = (IDMContext) object;
-		Query<String> query = new Query<String>() {
+		Query<String> query = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<String> rm) {
 				getSourceNameOnDispatchThread(dmc, rm);
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java
index 65cf4066799..cc23aea5811 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java
@@ -542,7 +542,8 @@ public class DsfSession {
 				} catch (IllegalAccessException e) {
 					DsfPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, DsfPlugin.PLUGIN_ID, -1,
 							"Security exception when calling a service event handler method", e)); //$NON-NLS-1$
-					assert false : "IServiceEventListener.ServiceHandlerMethod method not accessible, is listener declared public?"; //$NON-NLS-1$
+					assert false
+							: "IServiceEventListener.ServiceHandlerMethod method not accessible, is listener declared public?"; //$NON-NLS-1$
 				} catch (InvocationTargetException e) {
 					DsfPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, DsfPlugin.PLUGIN_ID, -1,
 							"Invocation exception when calling a service event handler method", e)); //$NON-NLS-1$
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java
index d545b74d59f..2f86c777754 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/PDAPlugin.java
@@ -176,7 +176,7 @@ public class PDAPlugin extends Plugin {
 			if (launch instanceof PDALaunch && !((PDALaunch) launch).isShutDown()) {
 				final PDALaunch pdaLaunch = (PDALaunch) launch;
 
-				Query<Object> launchShutdownQuery = new Query<Object>() {
+				Query<Object> launchShutdownQuery = new Query<>() {
 					@Override
 					protected void execute(DataRequestMonitor<Object> rm) {
 						pdaLaunch.shutdownServices(rm);
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java
index ce67c99d3e6..25240ca26e1 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java
@@ -102,7 +102,7 @@ public class PDALaunchDelegate extends LaunchConfigurationDelegate {
 	 */
 	private void initServices(final PDALaunch pdaLaunch, final String program) throws CoreException {
 		// Synchronization object to use when waiting for the services initialization.
-		Query<Object> initQuery = new Query<Object>() {
+		Query<Object> initQuery = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				pdaLaunch.initializeServices(program, rm);
@@ -125,7 +125,7 @@ public class PDALaunchDelegate extends LaunchConfigurationDelegate {
 
 	private void createProcess(final PDALaunch pdaLaunch) throws CoreException {
 		// Synchronization object to use when waiting for the services initialization.
-		Query<Object[]> initQuery = new Query<Object[]>() {
+		Query<Object[]> initQuery = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object[]> rm) {
 				DsfServicesTracker tracker = new DsfServicesTracker(PDAPlugin.getBundleContext(),
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java
index e441e1d573e..0b87f7b665a 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java
@@ -94,7 +94,7 @@ public class BreakpointMediatorTests {
 						},
 
 						// Initialize breakpoints service
-						new InitializeServiceStep<DsfTestBreakpoints>(DsfTestBreakpoints.class) {
+						new InitializeServiceStep<>(DsfTestBreakpoints.class) {
 							@Override
 							protected void setService(DsfTestBreakpoints service) {
 								fBreakpoints = service;
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java
index 65ef583c423..102cda2a744 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java
@@ -556,7 +556,7 @@ public class CacheTests {
 		};
 
 		// Request data from cache
-		Query<Integer> q = new Query<Integer>() {
+		Query<Integer> q = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Integer> rm) {
 
@@ -625,7 +625,7 @@ public class CacheTests {
 		// Create a client request with a badly behaved cancel implementation.
 		final RequestMonitor[] rmBad = new RequestMonitor[1];
 		final boolean qBadCanceled[] = new boolean[] { false };
-		Query<Integer> qBad = new Query<Integer>() {
+		Query<Integer> qBad = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Integer> rm) {
 				rmBad[0] = new RequestMonitor(ImmediateExecutor.getInstance(), rm) {
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java
index 79ad3a95487..046f6c29f39 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java
@@ -65,7 +65,7 @@ public class DsfQueryTests {
 
 	@Test
 	public void simpleGetTest() throws InterruptedException, ExecutionException {
-		Query<Integer> q = new Query<Integer>() {
+		Query<Integer> q = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Integer> rm) {
 				rm.setData(1);
@@ -89,7 +89,7 @@ public class DsfQueryTests {
 	public void getErrorTest() throws InterruptedException, ExecutionException {
 		final String error_message = "Test Error";
 
-		Query<Integer> q = new Query<Integer>() {
+		Query<Integer> q = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Integer> rm) {
 				rm.setStatus(new Status(IStatus.ERROR, DsfTestPlugin.PLUGIN_ID, IDsfStatusConstants.INTERNAL_ERROR,
@@ -119,7 +119,7 @@ public class DsfQueryTests {
 
 	@Test
 	public void doneExceptionTest() throws InterruptedException, ExecutionException {
-		Query<Integer> q = new Query<Integer>() {
+		Query<Integer> q = new Query<>() {
 			@SuppressWarnings("deprecation")
 			@Override
 			protected void execute(DataRequestMonitor<Integer> rm) {
@@ -147,7 +147,7 @@ public class DsfQueryTests {
 
 	@Test
 	public void getWithMultipleDispatchesTest() throws InterruptedException, ExecutionException {
-		Query<Integer> q = new Query<Integer>() {
+		Query<Integer> q = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Integer> rm) {
 				fExecutor.execute(new DsfRunnable() {
@@ -175,7 +175,7 @@ public class DsfQueryTests {
 
 	@Test(expected = ExecutionException.class)
 	public void exceptionOnGetTest() throws InterruptedException, ExecutionException {
-		Query<Integer> q = new Query<Integer>() {
+		Query<Integer> q = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Integer> rm) {
 				rm.setStatus(new Status(IStatus.ERROR, DsfTestPlugin.PLUGIN_ID, -1, "", null)); //$NON-NLS-1$
@@ -195,7 +195,7 @@ public class DsfQueryTests {
 
 	@Test
 	public void cancelBeforeWaitingTest() throws InterruptedException, ExecutionException {
-		final Query<Integer> q = new Query<Integer>() {
+		final Query<Integer> q = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Integer> rm) {
 				fail("Query was cancelled, it should not be called."); //$NON-NLS-1$
@@ -229,7 +229,7 @@ public class DsfQueryTests {
 		final DataRequestMonitor<?>[] rmHolder = new DataRequestMonitor<?>[1];
 		final Boolean[] cancelCalled = new Boolean[] { Boolean.FALSE };
 
-		final Query<Integer> q = new Query<Integer>() {
+		final Query<Integer> q = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Integer> rm) {
 				synchronized (rmHolder) {
@@ -298,7 +298,7 @@ public class DsfQueryTests {
 
 	@Test
 	public void getTimeoutTest() throws InterruptedException, ExecutionException {
-		final Query<Integer> q = new Query<Integer>() {
+		final Query<Integer> q = new Query<>() {
 			@Override
 			protected void execute(final DataRequestMonitor<Integer> rm) {
 				// Call done with a delay of 1 second, to avoid stalling the tests.
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java
index b6cc4739ac8..80b44ebec13 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java
@@ -137,7 +137,7 @@ public class TransactionTests {
 	public void singleTransactionTest() throws InterruptedException, ExecutionException {
 		final TestSingleTransaction testTransaction = new TestSingleTransaction();
 		// Request data from cache
-		Query<Integer> q = new Query<Integer>() {
+		Query<Integer> q = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Integer> rm) {
 				testTransaction.request(rm);
@@ -160,7 +160,7 @@ public class TransactionTests {
 
 		final TestSumTransaction testTransaction = new TestSumTransaction();
 		// Request data from cache
-		Query<Integer> q = new Query<Integer>() {
+		Query<Integer> q = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Integer> rm) {
 				testTransaction.request(rm);
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java
index eac07d119c4..7856757e8b6 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java
@@ -122,7 +122,7 @@ public class VMTest1 extends VMTestBase implements IViewerUpdatesListenerConstan
 		Assert.assertNotNull(containerPropProvider);
 
 		// Check if container is suspended.
-		Query<Map<String, Object>> suspendedQuery = new Query<Map<String, Object>>() {
+		Query<Map<String, Object>> suspendedQuery = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Map<String, Object>> rm) {
 				Set<String> properties = new HashSet<>();
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java
index d34814e66ab..0308d97b87c 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java
@@ -105,7 +105,7 @@ public class BasicTests extends CommandControlTestsBase {
 		final PDATestCommand testCommand = new PDATestCommand(fCommandControl.getContext(), "data 1");
 
 		// Test sending the command and checking all listeners were called.
-		Query<PDACommandResult> sendCommandQuery = new Query<PDACommandResult>() {
+		Query<PDACommandResult> sendCommandQuery = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<PDACommandResult> rm) {
 				fCommandControl.queueCommand(testCommand, rm);
@@ -124,7 +124,7 @@ public class BasicTests extends CommandControlTestsBase {
 
 		// Test queuing then removing command
 		listener.reset();
-		Query<Object> queueRemoveCommandQuery = new Query<Object>() {
+		Query<Object> queueRemoveCommandQuery = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				ICommandToken token = fCommandControl.queueCommand(testCommand,
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java
index 0e9ce935a0b..103089dba10 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java
@@ -133,7 +133,7 @@ public class CommandControlTestsBase {
 		final PDATestCommand testCommand = new PDATestCommand(fCommandControl.getContext(), command);
 
 		// Test sending the command and checking all listeners were called.
-		Query<PDACommandResult> sendCommandQuery = new Query<PDACommandResult>() {
+		Query<PDACommandResult> sendCommandQuery = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<PDACommandResult> rm) {
 				fCommandControl.queueCommand(testCommand, rm);
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java
index de0a07630c4..8331ba09456 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java
@@ -185,7 +185,7 @@ abstract public class FormattedValueTests extends TestCase
 	}
 
 	private void initializeService(final IDsfService service) throws InterruptedException, ExecutionException {
-		Query<Object> initQuery = new Query<Object>() {
+		Query<Object> initQuery = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				rm.setData(new Object());
@@ -227,7 +227,7 @@ abstract public class FormattedValueTests extends TestCase
 	}
 
 	private void shutdownService(final IDsfService service) throws InterruptedException, ExecutionException {
-		Query<Object> shutdownQuery = new Query<Object>() {
+		Query<Object> shutdownQuery = new Query<>() {
 			@Override
 			protected void execute(DataRequestMonitor<Object> rm) {
 				rm.setData(new Object());
diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java
index d28c4ead9cc..2b4cf36b215 100644
--- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java
+++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java
@@ -30,7 +30,7 @@ import org.eclipse.jface.viewers.TreePath;
  */
 public class TestModelUpdatesListener extends ViewerUpdatesListener {
 
-	private final static Comparator<String> fStringComparator = new Comparator<String>() {
+	private final static Comparator<String> fStringComparator = new Comparator<>() {
 
 		@Override
 		public int compare(String s1, String s2) {
@@ -63,7 +63,7 @@ public class TestModelUpdatesListener extends ViewerUpdatesListener {
 		};
 	};
 
-	private final static Comparator<TreePath> fTestElementVMCComparator = new Comparator<TreePath>() {
+	private final static Comparator<TreePath> fTestElementVMCComparator = new Comparator<>() {
 		@Override
 		public int compare(TreePath p1, TreePath p2) {
 			int l1 = p1.getSegmentCount();
diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java
index 02b386346b9..818fcf36247 100644
--- a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java
+++ b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java
@@ -17,6 +17,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.ICommandLauncher;
+import org.eclipse.cdt.core.resources.IConsole;
 import org.eclipse.cdt.jsoncdb.core.IParserPreferences;
 import org.eclipse.cdt.jsoncdb.core.IParserPreferencesAccess;
 import org.eclipse.cdt.jsoncdb.core.internal.Plugin;
@@ -24,9 +27,6 @@ import org.eclipse.cdt.jsoncdb.core.participant.IRawSourceFileInfo;
 import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsDetectionBehavior;
 import org.eclipse.cdt.jsoncdb.core.participant.builtins.IBuiltinsOutputProcessor;
 import org.eclipse.cdt.jsoncdb.core.participant.builtins.OutputSniffer;
-import org.eclipse.cdt.core.ConsoleOutputStream;
-import org.eclipse.cdt.core.ICommandLauncher;
-import org.eclipse.cdt.core.resources.IConsole;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java
index ba34ef028d2..e30d555fb2e 100644
--- a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java
+++ b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java
@@ -13,10 +13,10 @@ import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.cdt.jsoncdb.core.participant.IRawSourceFileInfoCollector;
 import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 import org.eclipse.cdt.core.settings.model.util.CDataUtil;
+import org.eclipse.cdt.jsoncdb.core.participant.IRawSourceFileInfoCollector;
 
 /**
  * A {link IBuiltinsOutputProcessor} for the GNU C and GNU C++ compiler and derivatives.
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/Rendering.java b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/Rendering.java
index 90eec95d7f1..222d0cf82b7 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/Rendering.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/src/org/eclipse/cdt/debug/ui/memory/floatingpoint/Rendering.java
@@ -700,8 +700,8 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		@Override
 		public void refresh() {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : FPRenderingMessages
-					.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: FPRenderingMessages.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			if (fCache != null) {
 				queueRequest(fViewportAddress, getViewportEndAddress());
@@ -710,8 +710,8 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		@Override
 		public void archiveDeltas() {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : FPRenderingMessages
-					.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: FPRenderingMessages.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			if (fCache != null) {
 				queueRequestArchiveDeltas();
@@ -1055,8 +1055,8 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		@Override
 		public FPMemoryByte[] getBytes(BigInteger address, int bytesRequested) throws DebugException {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : FPRenderingMessages
-					.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: FPRenderingMessages.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			if (containsEditedCell(address)) // Cell size cannot be switched during an edit
 				return getEditedMemory(address);
@@ -1096,29 +1096,29 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		@Override
 		public boolean containsEditedCell(BigInteger address) {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : FPRenderingMessages
-					.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: FPRenderingMessages.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 			return fEditBuffer.containsKey(address);
 		}
 
 		public FPMemoryByte[] getEditedMemory(BigInteger address) {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : FPRenderingMessages
-					.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: FPRenderingMessages.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 			return fEditBuffer.get(address);
 		}
 
 		@Override
 		public void clearEditBuffer() {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : FPRenderingMessages
-					.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: FPRenderingMessages.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 			fEditBuffer.clear();
 			Rendering.this.redrawPanes();
 		}
 
 		@Override
 		public void writeEditBuffer() {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : FPRenderingMessages
-					.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: FPRenderingMessages.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			Set<BigInteger> keySet = fEditBuffer.keySet();
 			Iterator<BigInteger> iterator = keySet.iterator();
@@ -1147,8 +1147,8 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		@Override
 		public void setEditedValue(BigInteger address, FPMemoryByte[] bytes) {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : FPRenderingMessages
-					.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: FPRenderingMessages.getString("CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 			fEditBuffer.put(address, bytes);
 			Rendering.this.redrawPanes();
 		}
@@ -2009,7 +2009,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 					// Construct the edit mode message
 					statusLineMessage = NLS.bind(FPRenderingMessages.getString("FPRendering.EDIT_MODE"), //$NON-NLS-1$
 							(insertMode() ? FPRenderingMessages.getString("FPRendering.EDIT_MODE_INSERT") : //$NON-NLS-1$
-					FPRenderingMessages.getString("FPRendering.EDIT_MODE_OVERWRITE"))); //$NON-NLS-1$
+									FPRenderingMessages.getString("FPRendering.EDIT_MODE_OVERWRITE"))); //$NON-NLS-1$
 				} else {
 					// 'null' = clear the message
 					statusLineMessage = null;
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
index 4392a17797d..fb05287646d 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
@@ -533,8 +533,8 @@ public class MemoryBrowser extends ViewPart
 				// out the rendering in the tab with either a new one or an
 				// existing one already associated with that memory space.
 				String oldMemorySpaceId = (String) activeFolder.getSelection().getData(KEY_MEMORY_SPACE);
-				assert oldMemorySpaceId == null || !oldMemorySpaceId.equals(
-						NA_MEMORY_SPACE_ID) : "should be null reference or an explicit, valid memory space ID (not including '----')"; //$NON-NLS-1$
+				assert oldMemorySpaceId == null || !oldMemorySpaceId.equals(NA_MEMORY_SPACE_ID)
+						: "should be null reference or an explicit, valid memory space ID (not including '----')"; //$NON-NLS-1$
 				if ((oldMemorySpaceId != null && !oldMemorySpaceId.equals(memorySpaceId))
 						|| (oldMemorySpaceId == null && memorySpaceId != null)) {
 					try {
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java
index 5002e45db92..76ad327000c 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java
@@ -715,8 +715,8 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		@Override
 		public void refresh() {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
-					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: TraditionalRenderingMessages.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			if (fCache != null) {
 				queueRequest(fViewportAddress, getViewportEndAddress());
@@ -725,8 +725,8 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		@Override
 		public void archiveDeltas() {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
-					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: TraditionalRenderingMessages.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			if (fCache != null) {
 				queueRequestArchiveDeltas();
@@ -900,8 +900,8 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 		// bytes will be fetched from cache
 		@Override
 		public TraditionalMemoryByte[] getBytes(BigInteger address, int bytesRequested) throws DebugException {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
-					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: TraditionalRenderingMessages.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			//calculate the number of units needed for the number of requested bytes
 			int rem = (bytesRequested % getAddressableSize()) > 0 ? 1 : 0;
@@ -944,23 +944,23 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		@Override
 		public boolean containsEditedCell(BigInteger address) {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
-					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: TraditionalRenderingMessages.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			return fEditBuffer.containsKey(address);
 		}
 
 		private TraditionalMemoryByte[] getEditedMemory(BigInteger address) {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
-					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: TraditionalRenderingMessages.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			return fEditBuffer.get(address);
 		}
 
 		@Override
 		public void clearEditBuffer() {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
-					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: TraditionalRenderingMessages.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			fEditBuffer.clear();
 			Rendering.this.redrawPanes();
@@ -968,8 +968,8 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		@Override
 		public void writeEditBuffer() {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
-					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: TraditionalRenderingMessages.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			Set<BigInteger> keySet = fEditBuffer.keySet();
 			Iterator<BigInteger> iterator = keySet.iterator();
@@ -999,8 +999,8 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		@Override
 		public void setEditedValue(BigInteger address, TraditionalMemoryByte[] bytes) {
-			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
-					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
+			assert Thread.currentThread().equals(Display.getDefault().getThread())
+					: TraditionalRenderingMessages.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
 
 			fEditBuffer.put(address, bytes);
 			Rendering.this.redrawPanes();
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QtFactory.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QtFactory.java
index 25431cb8eb5..0b7b02cf557 100644
--- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QtFactory.java
+++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QtFactory.java
@@ -104,7 +104,7 @@ public class QtFactory {
 		}
 	}
 
-	private static final CDTIndex.Accessor<QtVersion> QtVersionAccessor = new CDTIndex.Accessor<QtVersion>() {
+	private static final CDTIndex.Accessor<QtVersion> QtVersionAccessor = new CDTIndex.Accessor<>() {
 		@Override
 		public QtVersion access(IIndex index) throws CoreException {
 			// Multiple macros might be found, sort the values and choose the highest version.
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTVisitor.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTVisitor.java
index 5e5221fe8b7..05a898d93d6 100644
--- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTVisitor.java
+++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtASTVisitor.java
@@ -307,8 +307,8 @@ public class QtASTVisitor extends ASTVisitor {
 
 		IASTName refName = expansion.getMacroReference();
 		String param = m.group(1);
-		for (int offset = m.start(1), end = param.length(); !param.isEmpty(); offset += end, param = param
-				.substring(end)) {
+		for (int offset = m.start(1),
+				end = param.length(); !param.isEmpty(); offset += end, param = param.substring(end)) {
 			m = qualNameRegex.matcher(param);
 			if (!m.matches())
 				break;
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMProperty.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMProperty.java
index a893e8efdb0..05bd422b058 100644
--- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMProperty.java
+++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMProperty.java
@@ -129,7 +129,7 @@ public class QtPDOMProperty extends QtPDOMBinding {
 			this.cppRecord = cppRecord;
 		}
 
-		private static final IQtPDOMCodec<Attribute> Codec = new IQtPDOMCodec<Attribute>() {
+		private static final IQtPDOMCodec<Attribute> Codec = new IQtPDOMCodec<>() {
 			@Override
 			public int getElementSize() {
 				return 1 + Database.PTR_SIZE + Database.PTR_SIZE;
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQObject.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQObject.java
index 433699c0097..043487b09d5 100644
--- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQObject.java
+++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/pdom/QtPDOMQObject.java
@@ -149,7 +149,7 @@ public class QtPDOMQObject extends AbstractQtPDOMClass {
 			this.value = value;
 		}
 
-		public static final IQtPDOMCodec<ClassInfo> Codec = new IQtPDOMCodec<ClassInfo>() {
+		public static final IQtPDOMCodec<ClassInfo> Codec = new IQtPDOMCodec<>() {
 			@Override
 			public int getElementSize() {
 				return 2 * Database.PTR_SIZE;
diff --git a/releng/scripts/do_format_code.sh b/releng/scripts/do_format_code.sh
index 77fac9f3136..ec3930c7c07 100755
--- a/releng/scripts/do_format_code.sh
+++ b/releng/scripts/do_format_code.sh
@@ -21,7 +21,7 @@ set -e
 ##
 # Format code
 ##
-: ${ECLIPSE:=~/buildtools/eclipse-SDK-4.13/eclipse}
+: ${ECLIPSE:=~/buildtools/eclipse-SDK-4.23/eclipse}
 if test -e check_code_cleanliness_workspace; then
     echo check_code_cleanliness_workspace needs to be deleted
     exit 1
diff --git a/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/Activator.java b/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/Activator.java
index 07dca56ca23..909b1ab12ad 100644
--- a/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/Activator.java
+++ b/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/Activator.java
@@ -24,11 +24,13 @@ public class Activator extends AbstractUIPlugin {
 	// The shared instance
 	private static Activator plugin;
 
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
 	}
 
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsole.java b/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsole.java
index 299d656bbfb..4e9cb8a89bb 100644
--- a/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsole.java
+++ b/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsole.java
@@ -69,6 +69,7 @@ public class TerminalConsole extends AbstractConsole implements ITerminalConsole
 		final String name = nameBuff.toString();
 		if (!name.equals(getName())) {
 			UIJob job = new UIJob("updating name") { //$NON-NLS-1$
+				@Override
 				public IStatus runInUIThread(IProgressMonitor monitor) {
 					TerminalConsole.this.setName(name);
 					return Status.OK_STATUS;
@@ -79,6 +80,7 @@ public class TerminalConsole extends AbstractConsole implements ITerminalConsole
 		}
 	}
 
+	@Override
 	public IPageBookViewPage createPage(IConsoleView view) {
 		view.setFocus();
 		return new TerminalConsolePage(this, encoding);
diff --git a/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleExtensionManager.java b/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleExtensionManager.java
index 0f769fc8907..7bb0eec5568 100644
--- a/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleExtensionManager.java
+++ b/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleExtensionManager.java
@@ -46,7 +46,7 @@ public class TerminalConsoleExtensionManager {
 	public List<String> getActionsForType(String id) {
 		initialize();
 		List<String> list = actions.get(id);
-		return list == null ? new ArrayList<String>() : list;
+		return list == null ? new ArrayList<>() : list;
 	}
 
 	public IConsoleActionFactory getFactory(String id) {
diff --git a/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleFactory.java b/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleFactory.java
index 4450e24cb49..96882b69be3 100644
--- a/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleFactory.java
+++ b/remote/org.eclipse.remote.console/src/org/eclipse/remote/internal/console/TerminalConsoleFactory.java
@@ -103,7 +103,7 @@ public class TerminalConsoleFactory implements IConsoleFactory {
 	}
 
 	public static List<IConsole> findConsole(IRemoteConnection connection) {
-		ArrayList<IConsole> ret = new ArrayList<IConsole>();
+		ArrayList<IConsole> ret = new ArrayList<>();
 		IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
 		IConsole[] consoles = consoleManager.getConsoles();
 		for (IConsole console : consoles) {
diff --git a/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionType.java b/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionType.java
index 5169d7db8ba..3bfe570ea18 100644
--- a/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionType.java
+++ b/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionType.java
@@ -320,7 +320,7 @@ public class RemoteConnectionType implements IRemoteConnectionType {
 	@Override
 	public List<IRemoteConnection> getConnections() {
 		synchronized (connections) {
-			return new ArrayList<IRemoteConnection>(connections.values());
+			return new ArrayList<>(connections.values());
 		}
 	}
 
diff --git a/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteDebugOptions.java b/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteDebugOptions.java
index 641dd21c1c9..9fa9cda9e85 100644
--- a/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteDebugOptions.java
+++ b/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteDebugOptions.java
@@ -48,7 +48,7 @@ public class RemoteDebugOptions implements DebugOptionsListener {
 	}
 
 	private RemoteDebugOptions(BundleContext context) {
-		Hashtable<String, String> props = new Hashtable<String, String>(2);
+		Hashtable<String, String> props = new Hashtable<>(2);
 		props.put(DebugOptions.LISTENER_SYMBOLICNAME, RemoteCorePlugin.getUniqueIdentifier());
 		context.registerService(DebugOptionsListener.class.getName(), this, props);
 	}
diff --git a/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteResourceAdapterFactory.java b/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteResourceAdapterFactory.java
index ae89c18bd84..4af892e7891 100644
--- a/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteResourceAdapterFactory.java
+++ b/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteResourceAdapterFactory.java
@@ -35,6 +35,7 @@ public class RemoteResourceAdapterFactory implements IAdapterFactory {
 
 	private Map<String, RemoteResourceFactory> fResourceFactory;
 
+	@Override
 	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (adapterType == IRemoteResource.class) {
 			if (adaptableObject instanceof IResource) {
@@ -58,13 +59,14 @@ public class RemoteResourceAdapterFactory implements IAdapterFactory {
 		return null;
 	}
 
+	@Override
 	public Class<?>[] getAdapterList() {
 		return new Class[] { IRemoteResource.class };
 	}
 
 	private synchronized void loadExtensions() {
 		if (fResourceFactory == null) {
-			fResourceFactory = new HashMap<String, RemoteResourceFactory>();
+			fResourceFactory = new HashMap<>();
 
 			IExtensionRegistry registry = Platform.getExtensionRegistry();
 			IExtensionPoint extensionPoint = registry.getExtensionPoint(RemoteCorePlugin.getUniqueIdentifier(),
diff --git a/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteServicesManager.java b/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteServicesManager.java
index d0bfd1f642d..828a10abc4d 100644
--- a/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteServicesManager.java
+++ b/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteServicesManager.java
@@ -135,14 +135,14 @@ public class RemoteServicesManager implements IRemoteServicesManager {
 	@Override
 	public List<IRemoteConnectionType> getAllConnectionTypes() {
 		init();
-		return new ArrayList<IRemoteConnectionType>(connectionTypeMap.values());
+		return new ArrayList<>(connectionTypeMap.values());
 	}
 
 	@Override
 	@SafeVarargs
 	public final List<IRemoteConnectionType> getConnectionTypesSupporting(
 			Class<? extends IRemoteConnection.Service>... services) {
-		List<IRemoteConnectionType> connTypes = new ArrayList<IRemoteConnectionType>();
+		List<IRemoteConnectionType> connTypes = new ArrayList<>();
 		for (IRemoteConnectionType connType : getAllConnectionTypes()) {
 			for (Class<? extends IRemoteConnection.Service> service : services) {
 				if (connType.hasConnectionService(service)) {
@@ -158,7 +158,7 @@ public class RemoteServicesManager implements IRemoteServicesManager {
 	@SafeVarargs
 	public final List<IRemoteConnectionType> getConnectionTypesByService(
 			Class<? extends IRemoteConnectionType.Service>... services) {
-		List<IRemoteConnectionType> connTypes = new ArrayList<IRemoteConnectionType>();
+		List<IRemoteConnectionType> connTypes = new ArrayList<>();
 		for (IRemoteConnectionType connType : getAllConnectionTypes()) {
 			for (Class<? extends IRemoteConnectionType.Service> service : services) {
 				if (!connType.hasService(service)) {
diff --git a/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalProcessBuilder.java b/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalProcessBuilder.java
index b1800153b99..3f7a4a3a2f4 100644
--- a/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalProcessBuilder.java
+++ b/remote/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/services/local/LocalProcessBuilder.java
@@ -47,7 +47,7 @@ public class LocalProcessBuilder extends AbstractRemoteProcessBuilder {
 	private static final String ATTR_CLASS = "class"; //$NON-NLS-1$
 
 	private final IProcessFactory fProcessFactory;
-	private final Map<String, String> fRemoteEnv = new HashMap<String, String>();
+	private final Map<String, String> fRemoteEnv = new HashMap<>();
 
 	private Process localProcess;
 	private PTY pty;
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/ArgumentParser.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/ArgumentParser.java
index a54a849f2eb..3649730a553 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/ArgumentParser.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/ArgumentParser.java
@@ -26,7 +26,7 @@ import java.util.List;
  */
 public class ArgumentParser {
 	private static List<String> parseCommandline(String commandline) {
-		ArrayList<String> result = new ArrayList<String>();
+		ArrayList<String> result = new ArrayList<>();
 		StringCharacterIterator iterator = new StringCharacterIterator(commandline);
 
 		for (iterator.first(); iterator.current() != CharacterIterator.DONE; iterator.next()) {
@@ -136,7 +136,7 @@ public class ArgumentParser {
 	 *
 	 */
 	public ArgumentParser(List<String> tokenList) {
-		this.tokens = new ArrayList<String>(tokenList);
+		this.tokens = new ArrayList<>(tokenList);
 	}
 
 	/**
@@ -167,7 +167,7 @@ public class ArgumentParser {
 	 *
 	 */
 	public ArgumentParser(String command, List<String> parameterList) {
-		this.tokens = new ArrayList<String>();
+		this.tokens = new ArrayList<>();
 		this.tokens.add(command);
 		this.tokens.addAll(parameterList);
 	}
@@ -317,7 +317,7 @@ public class ArgumentParser {
 		if (this.tokens.size() == 0) {
 			return null;
 		}
-		return new ArrayList<String>(this.tokens.subList(1, this.tokens.size()));
+		return new ArrayList<>(this.tokens.subList(1, this.tokens.size()));
 	}
 
 	/**
@@ -344,7 +344,7 @@ public class ArgumentParser {
 	 * @return The List
 	 */
 	public List<String> getTokenList() {
-		return new ArrayList<String>(this.tokens);
+		return new ArrayList<>(this.tokens);
 	}
 
 	/**
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
index 90464e2fc56..49378fe3466 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
@@ -369,10 +369,12 @@ public class JSchConnection
 		}
 	}
 
+	@Override
 	public String getPassphrase() {
 		return fRemoteConnection.getSecureAttribute(PASSPHRASE_ATTR);
 	}
 
+	@Override
 	public String getPassword() {
 		return fRemoteConnection.getSecureAttribute(PASSWORD_ATTR);
 	}
@@ -538,6 +540,7 @@ public class JSchConnection
 		return hasOpenSession() && isFullySetup;
 	}
 
+	@Override
 	public boolean usePassword() {
 		String str = fRemoteConnection.getAttribute(IS_PASSWORD_ATTR);
 		return !str.isEmpty() ? Boolean.parseBoolean(str) : DEFAULT_IS_PASSWORD;
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionProxyFactory.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionProxyFactory.java
index 8af5d6fbf0a..041da3314b5 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionProxyFactory.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnectionProxyFactory.java
@@ -156,7 +156,7 @@ public class JSchConnectionProxyFactory {
 					} catch (IOException e) {
 						Activator.log(e);
 					}
-				};
+				}
 			}.start();
 		}
 
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java
index 792167e0478..5b45981762f 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchProcessBuilder.java
@@ -42,8 +42,8 @@ import com.jcraft.jsch.JSchException;
 public class JSchProcessBuilder extends AbstractRemoteProcessBuilder {
 
 	private final JSchConnection fConnection;
-	private final Map<String, String> fRemoteEnv = new HashMap<String, String>();
-	private final Set<Character> charSet = new HashSet<Character>();
+	private final Map<String, String> fRemoteEnv = new HashMap<>();
+	private final Set<Character> charSet = new HashSet<>();
 
 	private Channel fChannel;
 	private Map<String, String> fNewRemoteEnv;
@@ -88,7 +88,7 @@ public class JSchProcessBuilder extends AbstractRemoteProcessBuilder {
 	@Override
 	public Map<String, String> environment() {
 		if (fNewRemoteEnv == null) {
-			fNewRemoteEnv = new HashMap<String, String>();
+			fNewRemoteEnv = new HashMap<>();
 			fNewRemoteEnv.putAll(fRemoteEnv);
 		}
 		return fNewRemoteEnv;
@@ -129,7 +129,7 @@ public class JSchProcessBuilder extends AbstractRemoteProcessBuilder {
 		 * list.
 		 */
 
-		final List<String> env = new ArrayList<String>();
+		final List<String> env = new ArrayList<>();
 		boolean clearEnv = false;
 
 		if (fNewRemoteEnv != null) {
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JschFileStore.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JschFileStore.java
index c5912ac3a14..14461a4df78 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JschFileStore.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JschFileStore.java
@@ -65,7 +65,7 @@ public class JschFileStore extends FileStore {
 		}
 	}
 
-	private static Map<String, JschFileStore> instanceMap = new HashMap<String, JschFileStore>();
+	private static Map<String, JschFileStore> instanceMap = new HashMap<>();
 
 	private final IPath fRemotePath;
 	private final URI fURI;
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/AbstractRemoteCommand.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/AbstractRemoteCommand.java
index d955a7ab149..31cd158af04 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/AbstractRemoteCommand.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/AbstractRemoteCommand.java
@@ -321,7 +321,7 @@ public abstract class AbstractRemoteCommand<T> {
 		fileInfo.setAttribute(EFS.ATTRIBUTE_OTHER_READ, (attrs.getPermissions() & 0004) != 0);
 		fileInfo.setAttribute(EFS.ATTRIBUTE_SYMLINK, attrs.isLink());
 		if (attrs.isLink()) {
-			SftpCallable<String> c2 = new SftpCallable<String>() {
+			SftpCallable<String> c2 = new SftpCallable<>() {
 				@Override
 				public String call() throws JSchException, SftpException {
 					return getChannel().readlink(parentPath.append(name).toString());
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ChildInfosCommand.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ChildInfosCommand.java
index 4438765ea8b..99ae42e0531 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ChildInfosCommand.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ChildInfosCommand.java
@@ -31,7 +31,7 @@ public class ChildInfosCommand extends AbstractRemoteCommand<IFileInfo[]> {
 
 		Vector<LsEntry> files = getResult(fRemotePath.toString(), subMon.newChild(10));
 
-		List<IFileInfo> result = new ArrayList<IFileInfo>();
+		List<IFileInfo> result = new ArrayList<>();
 
 		if (files != null && !subMon.isCanceled()) {
 			Enumeration<LsEntry> enumeration = files.elements();
@@ -51,7 +51,7 @@ public class ChildInfosCommand extends AbstractRemoteCommand<IFileInfo[]> {
 
 	private Vector<LsEntry> getResult(String path, IProgressMonitor monitor) throws RemoteConnectionException {
 		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		SftpCallable<Vector<LsEntry>> c = new SftpCallable<Vector<LsEntry>>() {
+		SftpCallable<Vector<LsEntry>> c = new SftpCallable<>() {
 			@SuppressWarnings("unchecked")
 			@Override
 			public Vector<LsEntry> call() throws JSchException, SftpException {
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java
index d0922e048c4..19801e04aa9 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/ExecCommand.java
@@ -27,7 +27,7 @@ public class ExecCommand extends AbstractRemoteCommand<String> {
 	@Override
 	public String getResult(IProgressMonitor monitor) throws RemoteConnectionException {
 		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		ExecCallable<String> c = new ExecCallable<String>() {
+		ExecCallable<String> c = new ExecCallable<>() {
 			@Override
 			public String call() throws JSchException, RemoteConnectionException {
 				getChannel().setCommand(fCommand);
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/FetchInfoCommand.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/FetchInfoCommand.java
index 039159bc8fd..93494f6bb1f 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/FetchInfoCommand.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/FetchInfoCommand.java
@@ -25,7 +25,7 @@ public class FetchInfoCommand extends AbstractRemoteCommand<IFileInfo> {
 	@Override
 	public IFileInfo getResult(IProgressMonitor monitor) throws RemoteConnectionException {
 		SubMonitor subMon = SubMonitor.convert(monitor, 20);
-		SftpCallable<SftpATTRS> c = new SftpCallable<SftpATTRS>() {
+		SftpCallable<SftpATTRS> c = new SftpCallable<>() {
 			@Override
 			public SftpATTRS call() throws JSchException, SftpException {
 				return getChannel().lstat(fRemotePath.toString());
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetInputStreamCommand.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetInputStreamCommand.java
index a0dfe385cbc..e1636dc2ca6 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetInputStreamCommand.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetInputStreamCommand.java
@@ -38,7 +38,7 @@ public class GetInputStreamCommand extends AbstractRemoteCommand<InputStream> {
 	public InputStream getResult(IProgressMonitor monitor) throws RemoteConnectionException {
 		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
 
-		final SftpCallable<InputStream> c = new SftpCallable<InputStream>() {
+		final SftpCallable<InputStream> c = new SftpCallable<>() {
 			private ChannelSftp newChannel() throws IOException {
 				synchronized (GetInputStreamCommand.class) {
 					if (commandChannel != null) {
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetOutputStreamCommand.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetOutputStreamCommand.java
index c5431796d9f..91030313e6a 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetOutputStreamCommand.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/GetOutputStreamCommand.java
@@ -42,7 +42,7 @@ public class GetOutputStreamCommand extends AbstractRemoteCommand<OutputStream>
 					super.close();
 					final InputStream input = new ByteArrayInputStream(this.toByteArray());
 					try {
-						SftpCallable<Integer> c = new SftpCallable<Integer>() {
+						SftpCallable<Integer> c = new SftpCallable<>() {
 							@Override
 							public Integer call() throws JSchException, SftpException, IOException {
 								try {
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/MkdirCommand.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/MkdirCommand.java
index 2f2b35f93a2..888c2ebe6d2 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/MkdirCommand.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/MkdirCommand.java
@@ -36,7 +36,7 @@ public class MkdirCommand extends AbstractRemoteCommand<Void> {
 		/*
 		 * Now create directory
 		 */
-		SftpCallable<Void> c = new SftpCallable<Void>() {
+		SftpCallable<Void> c = new SftpCallable<>() {
 			@Override
 			public Void call() throws JSchException, SftpException {
 				getChannel().mkdir(fRemotePath.toString());
diff --git a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/PutInfoCommand.java b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/PutInfoCommand.java
index 97f6f49122c..711a035e9f4 100644
--- a/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/PutInfoCommand.java
+++ b/remote/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/commands/PutInfoCommand.java
@@ -56,7 +56,7 @@ public class PutInfoCommand extends AbstractRemoteCommand<Void> {
 	private void chmod(final int permissions, final String path, IProgressMonitor monitor)
 			throws RemoteConnectionException {
 		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		SftpCallable<Void> c = new SftpCallable<Void>() {
+		SftpCallable<Void> c = new SftpCallable<>() {
 			@Override
 			public Void call() throws JSchException, SftpException {
 				getChannel().chmod(permissions, path);
@@ -73,7 +73,7 @@ public class PutInfoCommand extends AbstractRemoteCommand<Void> {
 	private void setMTime(final int mtime, final String path, IProgressMonitor monitor)
 			throws RemoteConnectionException {
 		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		SftpCallable<Void> c = new SftpCallable<Void>() {
+		SftpCallable<Void> c = new SftpCallable<>() {
 			@Override
 			public Void call() throws JSchException, SftpException {
 				getChannel().setMtime(path, mtime);
diff --git a/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/Activator.java b/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/Activator.java
index 6e3e9c35f75..58f564dc35a 100644
--- a/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/Activator.java
+++ b/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/Activator.java
@@ -21,11 +21,13 @@ public class Activator extends AbstractUIPlugin {
 	public Activator() {
 	}
 
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
 	}
 
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/ConnectionTests.java b/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/ConnectionTests.java
index 63d2a749e15..b3fcbd1e672 100644
--- a/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/ConnectionTests.java
+++ b/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/ConnectionTests.java
@@ -4,8 +4,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteConnectionType;
@@ -17,6 +15,8 @@ import org.eclipse.remote.core.IRemoteProcessService;
 import org.eclipse.remote.core.IRemoteServicesManager;
 import org.eclipse.remote.internal.jsch.core.JSchConnection;
 
+import junit.framework.TestCase;
+
 public class ConnectionTests extends TestCase {
 	private static final String USERNAME = "test"; //$NON-NLS-1$
 	private static final String PASSWORD = ""; //$NON-NLS-1$
diff --git a/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/ProcessTests.java b/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/ProcessTests.java
index e0f59c211d1..477fd286c27 100644
--- a/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/ProcessTests.java
+++ b/remote/org.eclipse.remote.jsch.tests/src/org/eclipse/remote/jsch/tests/ProcessTests.java
@@ -9,8 +9,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.remote.core.IRemoteConnection;
 import org.eclipse.remote.core.IRemoteConnectionType;
@@ -22,6 +20,8 @@ import org.eclipse.remote.core.IRemoteServicesManager;
 import org.eclipse.remote.core.RemoteProcessAdapter;
 import org.eclipse.remote.internal.jsch.core.JSchConnection;
 
+import junit.framework.TestCase;
+
 public class ProcessTests extends TestCase {
 	private static final String USERNAME = "test"; //$NON-NLS-1$
 	private static final String PASSWORD = ""; //$NON-NLS-1$
diff --git a/remote/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java b/remote/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java
index 74c5291edbe..5fb5c2c1a82 100644
--- a/remote/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java
+++ b/remote/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java
@@ -79,7 +79,7 @@ public class JSchConnectionPage extends WizardPage {
 
 	private String fInitialName = "Remote Host"; //$NON-NLS-1$
 	private Set<String> fInvalidConnectionNames;
-	private final Map<String, String> fInitialAttributes = new HashMap<String, String>();
+	private final Map<String, String> fInitialAttributes = new HashMap<>();
 	private IRemoteConnectionWorkingCopy fConnection;
 
 	private final IRemoteConnectionType fConnectionType;
diff --git a/remote/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionWizard.java b/remote/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionWizard.java
index e6fbb065aaa..93f6f9fbc0a 100644
--- a/remote/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionWizard.java
+++ b/remote/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionWizard.java
@@ -39,6 +39,7 @@ public class JSchConnectionWizard extends Wizard implements IRemoteUIConnectionW
 		addPage(fPage);
 	}
 
+	@Override
 	public IRemoteConnectionWorkingCopy open() {
 		WizardDialog dialog = new WizardDialog(fShell, this);
 		dialog.setBlockOnOpen(true);
@@ -63,14 +64,17 @@ public class JSchConnectionWizard extends Wizard implements IRemoteUIConnectionW
 		return true;
 	}
 
+	@Override
 	public void setConnection(IRemoteConnectionWorkingCopy connection) {
 		fPage.setConnection(connection);
 	}
 
+	@Override
 	public void setConnectionName(String name) {
 		fPage.setConnectionName(name);
 	}
 
+	@Override
 	public void setInvalidConnectionNames(Set<String> names) {
 		fPage.setInvalidConnectionNames(names);
 	}
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyConnection.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyConnection.java
index 4f0bbe22b25..f1d5e32b769 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyConnection.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyConnection.java
@@ -214,6 +214,7 @@ public class ProxyConnection
 		}
 	}
 
+	@Override
 	public Map<String, String> getEnv() {
 		return Collections.unmodifiableMap(fEnv);
 	}
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyFileStore.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyFileStore.java
index 450f263c7de..91df470fd8b 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyFileStore.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyFileStore.java
@@ -61,7 +61,7 @@ public class ProxyFileStore extends FileStore {
 		}
 	}
 
-	private static Map<String, ProxyFileStore> instanceMap = new HashMap<String, ProxyFileStore>();
+	private static Map<String, ProxyFileStore> instanceMap = new HashMap<>();
 
 	private final IPath fRemotePath;
 	private final URI fURI;
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyProcessBuilder.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyProcessBuilder.java
index 506c6d9c7f0..f37985e8259 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyProcessBuilder.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/ProxyProcessBuilder.java
@@ -62,7 +62,7 @@ public class ProxyProcessBuilder extends AbstractRemoteProcessBuilder {
 	@Override
 	public Map<String, String> environment() {
 		if (remoteEnv == null) {
-			remoteEnv = new HashMap<String, String>(proxyConnection.getEnv());
+			remoteEnv = new HashMap<>(proxyConnection.getEnv());
 		}
 		return remoteEnv;
 	}
@@ -89,7 +89,7 @@ public class ProxyProcessBuilder extends AbstractRemoteProcessBuilder {
 			/*
 			 * If environment has not been touched, then don't send anything
 			 */
-			final Map<String, String> env = new HashMap<String, String>();
+			final Map<String, String> env = new HashMap<>();
 			if (remoteEnv != null) {
 				env.putAll(remoteEnv);
 			}
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ChildInfosCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ChildInfosCommand.java
index d22fb3ba42d..7f6bdaf0d61 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ChildInfosCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ChildInfosCommand.java
@@ -34,6 +34,7 @@ public class ChildInfosCommand extends AbstractCommand<IFileInfo[]> {
 		this.path = path;
 	}
 
+	@Override
 	public IFileInfo[] call() throws ProxyException {
 		try {
 			final StreamChannel chan = openChannel();
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/DeleteCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/DeleteCommand.java
index 608ee9268de..a4a7adfaea8 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/DeleteCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/DeleteCommand.java
@@ -33,6 +33,7 @@ public class DeleteCommand extends AbstractCommand<Void> {
 		this.path = path;
 	}
 
+	@Override
 	public Void call() throws ProxyException {
 		try {
 			out.writeByte(Protocol.PROTO_COMMAND);
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ExecCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ExecCommand.java
index c9e57fb1fd7..9cd6d04d4b4 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ExecCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ExecCommand.java
@@ -48,6 +48,7 @@ public class ExecCommand extends AbstractCommand<Void> {
 		this.errChan = errChan;
 	}
 
+	@Override
 	public Void call() throws ProxyException {
 		try {
 			out.writeByte(Protocol.PROTO_COMMAND);
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/FetchInfoCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/FetchInfoCommand.java
index b949b11b63c..b17fdfa0664 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/FetchInfoCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/FetchInfoCommand.java
@@ -34,6 +34,7 @@ public class FetchInfoCommand extends AbstractCommand<IFileInfo> {
 		this.path = path;
 	}
 
+	@Override
 	public IFileInfo call() throws ProxyException {
 		try {
 			final StreamChannel chan = openChannel();
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetCwdCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetCwdCommand.java
index 255fc333245..d10956d2f3f 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetCwdCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetCwdCommand.java
@@ -30,6 +30,7 @@ public class GetCwdCommand extends AbstractCommand<String> {
 		this.in = new DataInputStream(conn.getCommandChannel().getInputStream());
 	}
 
+	@Override
 	public String call() throws ProxyException {
 		try {
 			final StreamChannel chan = openChannel();
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetEnvCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetEnvCommand.java
index 3f3db40c4be..ec245d2aa28 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetEnvCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetEnvCommand.java
@@ -32,6 +32,7 @@ public class GetEnvCommand extends AbstractCommand<Map<String, String>> {
 		this.in = new DataInputStream(conn.getCommandChannel().getInputStream());
 	}
 
+	@Override
 	public Map<String, String> call() throws ProxyException {
 		try {
 			final StreamChannel chan = openChannel();
@@ -49,7 +50,7 @@ public class GetEnvCommand extends AbstractCommand<Map<String, String>> {
 			}
 
 			int len = resultStream.readInt();
-			Map<String, String> env = new HashMap<String, String>(len);
+			Map<String, String> env = new HashMap<>(len);
 			for (int i = 0; i < len; i++) {
 				String key = resultStream.readUTF();
 				String value = resultStream.readUTF();
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetInputStreamCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetInputStreamCommand.java
index 3074abe5b50..6bd9dfdf54f 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetInputStreamCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetInputStreamCommand.java
@@ -36,6 +36,7 @@ public class GetInputStreamCommand extends AbstractCommand<InputStream> {
 		this.path = path;
 	}
 
+	@Override
 	public InputStream call() throws ProxyException {
 		try {
 			StreamChannel chan = openChannel();
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetOutputStreamCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetOutputStreamCommand.java
index 4ad31a65956..f50515b62c0 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetOutputStreamCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetOutputStreamCommand.java
@@ -36,6 +36,7 @@ public class GetOutputStreamCommand extends AbstractCommand<OutputStream> {
 		this.path = path;
 	}
 
+	@Override
 	public OutputStream call() throws ProxyException {
 		try {
 			StreamChannel chan = openChannel();
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetPropertiesCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetPropertiesCommand.java
index e1ad4c4d4ee..f7e416b4f9b 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetPropertiesCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/GetPropertiesCommand.java
@@ -32,6 +32,7 @@ public class GetPropertiesCommand extends AbstractCommand<Map<String, String>> {
 		this.in = new DataInputStream(conn.getCommandChannel().getInputStream());
 	}
 
+	@Override
 	public Map<String, String> call() throws ProxyException {
 		try {
 			final StreamChannel chan = openChannel();
@@ -49,7 +50,7 @@ public class GetPropertiesCommand extends AbstractCommand<Map<String, String>> {
 			}
 
 			int len = resultStream.readInt();
-			Map<String, String> props = new HashMap<String, String>(len);
+			Map<String, String> props = new HashMap<>(len);
 			for (int i = 0; i < len; i++) {
 				String key = resultStream.readUTF();
 				String value = resultStream.readUTF();
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/MkdirCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/MkdirCommand.java
index f821533168f..6fcffd6ec78 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/MkdirCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/MkdirCommand.java
@@ -33,6 +33,7 @@ public class MkdirCommand extends AbstractCommand<Void> {
 		this.path = path;
 	}
 
+	@Override
 	public Void call() throws ProxyException {
 		try {
 			out.writeByte(Protocol.PROTO_COMMAND);
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/PutInfoCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/PutInfoCommand.java
index 60bbfd7464c..1e87466054b 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/PutInfoCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/PutInfoCommand.java
@@ -37,6 +37,7 @@ public class PutInfoCommand extends AbstractCommand<Void> {
 		this.path = path;
 	}
 
+	@Override
 	public Void call() throws ProxyException {
 		try {
 			out.writeByte(Protocol.PROTO_COMMAND);
diff --git a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ShellCommand.java b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ShellCommand.java
index 9ba5fd1ff2c..a47039d6987 100644
--- a/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ShellCommand.java
+++ b/remote/org.eclipse.remote.proxy.core/src/org/eclipse/remote/internal/proxy/core/commands/ShellCommand.java
@@ -33,6 +33,7 @@ public class ShellCommand extends AbstractCommand<Void> {
 		this.ioChan = ioChan;
 	}
 
+	@Override
 	public Void call() throws ProxyException {
 		try {
 			out.writeByte(Protocol.PROTO_COMMAND);
diff --git a/remote/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannel.java b/remote/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannel.java
index d9d09adde4b..09de286f9a7 100644
--- a/remote/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannel.java
+++ b/remote/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannel.java
@@ -55,6 +55,7 @@ public class StreamChannel {
 			}
 		}
 
+		@Override
 		public synchronized int read(byte b[], int off, int len) throws IOException {
 			if (len <= 0) {
 				return 0;
diff --git a/remote/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannelManager.java b/remote/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannelManager.java
index 21605d81fff..854972e0e45 100644
--- a/remote/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannelManager.java
+++ b/remote/org.eclipse.remote.proxy.protocol.core/src/org/eclipse/remote/proxy/protocol/core/StreamChannelManager.java
@@ -39,7 +39,7 @@ public class StreamChannelManager implements Runnable {
 
 	private class Sender implements Runnable {
 		private OutputStream out;
-		private BlockingQueue<ByteArrayOutputStream> queue = new LinkedBlockingQueue<ByteArrayOutputStream>();
+		private BlockingQueue<ByteArrayOutputStream> queue = new LinkedBlockingQueue<>();
 		private boolean running = true;
 
 		public Sender(OutputStream out) {
@@ -344,10 +344,9 @@ public class StreamChannelManager implements Runnable {
 	private final static int SERVER_ID_MASK = 1 << 15;
 	private final static int MAX_CHANNELS = SERVER_ID_MASK >> 1;
 
-	private final Map<Integer, StreamChannel> channels = (Map<Integer, StreamChannel>) Collections
+	private final Map<Integer, StreamChannel> channels = Collections
 			.synchronizedMap(new HashMap<Integer, StreamChannel>());
-	private final List<IChannelListener> listeners = (List<IChannelListener>) Collections
-			.synchronizedList(new ArrayList<IChannelListener>());
+	private final List<IChannelListener> listeners = Collections.synchronizedList(new ArrayList<IChannelListener>());
 
 	private Set<Short> usedIds = new HashSet<>();
 	private int nextUnusedChannelId;
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/Application.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/Application.java
index 8ad790fe57a..7fb9defe377 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/Application.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/Application.java
@@ -22,6 +22,7 @@ import org.eclipse.remote.proxy.protocol.core.Protocol;
 public class Application implements IApplication {
 	private Server server = new Server();
 
+	@Override
 	public Object start(IApplicationContext context) throws Exception {
 		String[] args = (String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS);
 		for (String arg : args) {
@@ -30,13 +31,13 @@ public class Application implements IApplication {
 				b.putInt(Protocol.MAGIC);
 				System.out.write(b.array());
 			}
-			;
 		}
 		server.start();
 		server.waitFor();
 		return IApplication.EXIT_OK;
 	}
 
+	@Override
 	public void stop() {
 		// Nothing
 	}
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/CommandServer.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/CommandServer.java
index 32de904173e..56f7d38ee07 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/CommandServer.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/CommandServer.java
@@ -51,6 +51,7 @@ public class CommandServer implements Runnable {
 		this.cmdOut = new DataOutputStream(chan.getOutputStream());
 	}
 
+	@Override
 	public void run() {
 		new Thread("cmd reader") { //$NON-NLS-1$
 			@Override
@@ -169,12 +170,12 @@ public class CommandServer implements Runnable {
 		int ioChanId = in.readByte();
 		int errChanId = in.readByte();
 		int length = in.readInt();
-		List<String> command = new ArrayList<String>(length);
+		List<String> command = new ArrayList<>(length);
 		for (int i = 0; i < length; i++) {
 			command.add(in.readUTF());
 		}
 		length = in.readInt();
-		Map<String, String> env = new HashMap<String, String>(length);
+		Map<String, String> env = new HashMap<>(length);
 		for (int i = 0; i < length; i++) {
 			String key = in.readUTF();
 			String val = in.readUTF();
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/Server.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/Server.java
index c60e3e0e9d9..1a2c679b36e 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/Server.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/Server.java
@@ -14,9 +14,9 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.remote.proxy.protocol.core.StreamChannel;
 import org.eclipse.remote.proxy.protocol.core.StreamChannelManager;
 import org.eclipse.remote.proxy.protocol.core.StreamChannelManager.IChannelListener;
-import org.eclipse.remote.proxy.protocol.core.StreamChannel;
 
 public class Server {
 	private volatile boolean running;
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/AbstractServerExecCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/AbstractServerExecCommand.java
index 269a50a0f35..1a80ad718c7 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/AbstractServerExecCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/AbstractServerExecCommand.java
@@ -224,6 +224,7 @@ public abstract class AbstractServerExecCommand extends AbstractServerCommand {
 		return directory;
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		new Thread(new CommandRunner()).start();
 	}
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerChildInfosCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerChildInfosCommand.java
index 376b6638714..2f0ab124449 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerChildInfosCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerChildInfosCommand.java
@@ -51,6 +51,7 @@ public class ServerChildInfosCommand extends AbstractServerCommand {
 		this.uri = URI.create("file:" + path); //$NON-NLS-1$
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		try {
 			infos = EFS.getStore(uri).childInfos(EFS.NONE, null);
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerDeleteCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerDeleteCommand.java
index 2396401a084..cf207323762 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerDeleteCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerDeleteCommand.java
@@ -26,6 +26,7 @@ public class ServerDeleteCommand extends AbstractServerCommand {
 		this.uri = URI.create("file:" + path); //$NON-NLS-1$
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		try {
 			EFS.getStore(uri).delete(options, new NullProgressMonitor());
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerExecCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerExecCommand.java
index 6d6b164154c..06ebe5e1ef6 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerExecCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerExecCommand.java
@@ -22,6 +22,7 @@ import org.eclipse.remote.proxy.protocol.core.StreamChannel;
  *
  */
 public class ServerExecCommand extends AbstractServerExecCommand {
+	@Override
 	public Process doRun() throws IOException {
 		System.err.print("exec: ");
 		for (String arg : getCommand()) {
@@ -52,12 +53,14 @@ public class ServerExecCommand extends AbstractServerExecCommand {
 		return builder.start();
 	}
 
+	@Override
 	protected void doKill(Process proc) {
 		if (proc.isAlive()) {
 			proc.destroyForcibly();
 		}
 	}
 
+	@Override
 	protected void doSetTerminalSize(Process proc, int cols, int rows) {
 		// Not supported
 	}
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerFetchInfoCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerFetchInfoCommand.java
index f8d7ff886a2..7b32c6bbad2 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerFetchInfoCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerFetchInfoCommand.java
@@ -48,6 +48,7 @@ public class ServerFetchInfoCommand extends AbstractServerCommand {
 		this.uri = URI.create("file:" + path); //$NON-NLS-1$
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		try {
 			info = EFS.getStore(uri).fetchInfo();
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetCwdCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetCwdCommand.java
index 483d32b3bf1..f4b8a2655ae 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetCwdCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetCwdCommand.java
@@ -37,6 +37,7 @@ public class ServerGetCwdCommand extends AbstractServerCommand {
 		this.result = new DataOutputStream(chan.getOutputStream());
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		cwd = System.getProperty("user.dir"); //$NON-NLS-1$
 		new Thread(new CommandRunner()).start();
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetEnvCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetEnvCommand.java
index 218fef344a3..256222dcab8 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetEnvCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetEnvCommand.java
@@ -42,6 +42,7 @@ public class ServerGetEnvCommand extends AbstractServerCommand {
 		this.result = new DataOutputStream(chan.getOutputStream());
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		new Thread(new CommandRunner()).start();
 	}
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetInputStreamCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetInputStreamCommand.java
index a46298809d3..cb0fb5b4aed 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetInputStreamCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetInputStreamCommand.java
@@ -73,6 +73,7 @@ public class ServerGetInputStreamCommand extends AbstractServerCommand {
 		this.uri = URI.create("file:" + path); //$NON-NLS-1$
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		try {
 			InputStream in = new BufferedInputStream(
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetOutputStreamCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetOutputStreamCommand.java
index 5eda4a6e217..930fb4d69fe 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetOutputStreamCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetOutputStreamCommand.java
@@ -74,6 +74,7 @@ public class ServerGetOutputStreamCommand extends AbstractServerCommand {
 		this.uri = URI.create("file:" + path); //$NON-NLS-1$
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		try {
 			OutputStream out = new BufferedOutputStream(
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetPropertiesCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetPropertiesCommand.java
index 519b4c17c66..46d538c3082 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetPropertiesCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerGetPropertiesCommand.java
@@ -27,7 +27,7 @@ public class ServerGetPropertiesCommand extends AbstractServerCommand {
 		@Override
 		public void run() {
 			try {
-				Map<String, String> props = new HashMap<String, String>();
+				Map<String, String> props = new HashMap<>();
 				props.put(IRemoteConnection.FILE_SEPARATOR_PROPERTY,
 						System.getProperty(IRemoteConnection.FILE_SEPARATOR_PROPERTY));
 				props.put(IRemoteConnection.PATH_SEPARATOR_PROPERTY,
@@ -58,6 +58,7 @@ public class ServerGetPropertiesCommand extends AbstractServerCommand {
 		this.result = new DataOutputStream(chan.getOutputStream());
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		new Thread(new CommandRunner()).start();
 	}
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerMkdirCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerMkdirCommand.java
index 7c1577b253c..3f193f8b29c 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerMkdirCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerMkdirCommand.java
@@ -26,6 +26,7 @@ public class ServerMkdirCommand extends AbstractServerCommand {
 		this.uri = URI.create("file:" + path); //$NON-NLS-1$
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		try {
 			EFS.getStore(uri).mkdir(options, new NullProgressMonitor());
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerPutInfoCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerPutInfoCommand.java
index f68e94292aa..6647589df9f 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerPutInfoCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerPutInfoCommand.java
@@ -29,10 +29,11 @@ public class ServerPutInfoCommand extends AbstractServerCommand {
 		this.uri = URI.create("file:" + path); //$NON-NLS-1$
 	}
 
+	@Override
 	public void exec() throws ProxyException {
 		try {
 			EFS.getStore(uri).putInfo(info, options, new NullProgressMonitor());
-			;
+
 		} catch (CoreException e) {
 			throw new ProxyException(e.getMessage());
 		}
diff --git a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerShellCommand.java b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerShellCommand.java
index 7497dfb68a0..eb2b93e7f77 100644
--- a/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerShellCommand.java
+++ b/remote/org.eclipse.remote.proxy.server.core/src/org/eclipse/remote/internal/proxy/server/core/commands/ServerShellCommand.java
@@ -85,6 +85,7 @@ public class ServerShellCommand extends AbstractServerExecCommand {
 		super(null, null, null, true, false, cmdChan, ioChan, null);
 	}
 
+	@Override
 	public Process doRun() throws IOException {
 		String shell = findLoginShell();
 
@@ -97,12 +98,14 @@ public class ServerShellCommand extends AbstractServerExecCommand {
 		return ProcessFactory.getFactory().exec(new String[] { shell, "-l" }, null, null); //$NON-NLS-1$
 	}
 
+	@Override
 	protected void doKill(Process proc) {
 		if (proc.isAlive()) {
 			proc.destroyForcibly();
 		}
 	}
 
+	@Override
 	protected void doSetTerminalSize(Process proc, int cols, int rows) {
 		if (proc.isAlive() && proc instanceof ShellProcess) {
 			ShellProcess shell = (ShellProcess) proc;
diff --git a/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/Activator.java b/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/Activator.java
index 7152957bb36..02ff2019936 100644
--- a/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/Activator.java
+++ b/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/Activator.java
@@ -21,11 +21,13 @@ public class Activator extends AbstractUIPlugin {
 	public Activator() {
 	}
 
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
 	}
 
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/MultiplexServerTests.java b/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/MultiplexServerTests.java
index a8d1fb1d3e3..9ff7172a240 100644
--- a/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/MultiplexServerTests.java
+++ b/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/MultiplexServerTests.java
@@ -8,8 +8,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import org.eclipse.remote.proxy.protocol.core.StreamChannelManager;
 import org.eclipse.remote.proxy.protocol.core.StreamChannel;
+import org.eclipse.remote.proxy.protocol.core.StreamChannelManager;
 
 import junit.framework.TestCase;
 
@@ -163,7 +163,7 @@ public class MultiplexServerTests extends TestCase {
 
 	private List<StreamChannel> runChannelTest(StreamChannelManager mpx, Thread[] readers, Thread[] writers,
 			final StringBuffer[] sentBufs, final StringBuffer[] recvBufs) throws IOException {
-		List<StreamChannel> channels = new ArrayList<StreamChannel>();
+		List<StreamChannel> channels = new ArrayList<>();
 		for (int i = 0; i < NUM_CHANS; i++) {
 			StreamChannel chan = mpx.openChannel(); // needs to be in same thread as reader
 			//			ChanReader reader = new ChanReader(chan, recvBufs, "clnt reader thread " + chan.getId());
diff --git a/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/MultiplexTests.java b/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/MultiplexTests.java
index 121f8917a6d..cf5597d76b7 100644
--- a/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/MultiplexTests.java
+++ b/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/MultiplexTests.java
@@ -12,9 +12,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import org.eclipse.remote.proxy.protocol.core.StreamChannel;
 import org.eclipse.remote.proxy.protocol.core.StreamChannelManager;
 import org.eclipse.remote.proxy.protocol.core.StreamChannelManager.IChannelListener;
-import org.eclipse.remote.proxy.protocol.core.StreamChannel;
 
 import junit.framework.TestCase;
 
@@ -154,8 +154,8 @@ public class MultiplexTests extends TestCase {
 			final PipedOutputStream outClnt = new PipedOutputStream(inSvr);
 			final PipedOutputStream outSvr = new PipedOutputStream(inClnt);
 
-			final List<List<Integer>> clntSentBufs = new ArrayList<List<Integer>>();
-			final List<List<Integer>> clntRecvBufs = new ArrayList<List<Integer>>();
+			final List<List<Integer>> clntSentBufs = new ArrayList<>();
+			final List<List<Integer>> clntRecvBufs = new ArrayList<>();
 
 			final Thread[][] clntReaders = new Thread[NUM_THREADS][NUM_CHANS_PER_THREAD];
 			final Thread[][] clntWriters = new Thread[NUM_THREADS][NUM_CHANS_PER_THREAD];
@@ -207,7 +207,7 @@ public class MultiplexTests extends TestCase {
 	private List<StreamChannel> runChannelTest(final StreamChannelManager mpx, final Thread[] testers,
 			final Thread[][] readers, final Thread[][] writers, final List<List<Integer>> sentBufs,
 			final List<List<Integer>> recvBufs) throws IOException {
-		final List<StreamChannel> channels = new ArrayList<StreamChannel>();
+		final List<StreamChannel> channels = new ArrayList<>();
 		for (int i = 0; i < NUM_THREADS; i++) {
 			final int thread = i;
 			testers[i] = new Thread("client test thread " + thread) {
diff --git a/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/ProcessTests.java b/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/ProcessTests.java
index 6cdcc46cd1a..b22c2cc2b76 100644
--- a/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/ProcessTests.java
+++ b/remote/org.eclipse.remote.proxy.tests/src/org/eclipse/remote/proxy/tests/ProcessTests.java
@@ -34,7 +34,7 @@ public class ProcessTests extends TestCase {
 	public void testStreamHalfClose() {
 		IRemoteProcessBuilder builder = processService.getProcessBuilder("perl", "-v"); //$NON-NLS-1$
 		try {
-			final Set<String> results = new HashSet<String>();
+			final Set<String> results = new HashSet<>();
 			IRemoteProcess proc = builder.start();
 			proc.getOutputStream().close(); // close stdin to make sure half closed channel works
 			BufferedReader stdout = new BufferedReader(new InputStreamReader(proc.getInputStream()));
diff --git a/remote/org.eclipse.remote.proxy.ui/src/org/eclipse/remote/internal/proxy/ui/wizards/ProxyConnectionPage.java b/remote/org.eclipse.remote.proxy.ui/src/org/eclipse/remote/internal/proxy/ui/wizards/ProxyConnectionPage.java
index 5fcf49560b2..8c3d2494d76 100644
--- a/remote/org.eclipse.remote.proxy.ui/src/org/eclipse/remote/internal/proxy/ui/wizards/ProxyConnectionPage.java
+++ b/remote/org.eclipse.remote.proxy.ui/src/org/eclipse/remote/internal/proxy/ui/wizards/ProxyConnectionPage.java
@@ -71,7 +71,7 @@ public class ProxyConnectionPage extends WizardPage {
 
 	private String fInitialName = "Remote Host"; //$NON-NLS-1$
 	private Set<String> fInvalidConnectionNames;
-	private final Map<String, String> fInitialAttributes = new HashMap<String, String>();
+	private final Map<String, String> fInitialAttributes = new HashMap<>();
 	private IRemoteConnectionWorkingCopy fConnection;
 
 	private final IRemoteConnectionType fConnectionType;
diff --git a/remote/org.eclipse.remote.proxy.ui/src/org/eclipse/remote/internal/proxy/ui/wizards/ProxyConnectionWizard.java b/remote/org.eclipse.remote.proxy.ui/src/org/eclipse/remote/internal/proxy/ui/wizards/ProxyConnectionWizard.java
index 5a0ba13d09c..522a832ac46 100644
--- a/remote/org.eclipse.remote.proxy.ui/src/org/eclipse/remote/internal/proxy/ui/wizards/ProxyConnectionWizard.java
+++ b/remote/org.eclipse.remote.proxy.ui/src/org/eclipse/remote/internal/proxy/ui/wizards/ProxyConnectionWizard.java
@@ -35,6 +35,7 @@ public class ProxyConnectionWizard extends Wizard implements IRemoteUIConnection
 		addPage(fPage);
 	}
 
+	@Override
 	public IRemoteConnectionWorkingCopy open() {
 		WizardDialog dialog = new WizardDialog(fShell, this);
 		dialog.setBlockOnOpen(true);
@@ -59,14 +60,17 @@ public class ProxyConnectionWizard extends Wizard implements IRemoteUIConnection
 		return true;
 	}
 
+	@Override
 	public void setConnection(IRemoteConnectionWorkingCopy connection) {
 		fPage.setConnection(connection);
 	}
 
+	@Override
 	public void setConnectionName(String name) {
 		fPage.setConnectionName(name);
 	}
 
+	@Override
 	public void setInvalidConnectionNames(Set<String> names) {
 		fPage.setInvalidConnectionNames(names);
 	}
diff --git a/remote/org.eclipse.remote.serial.core/src/org/eclipse/remote/serial/internal/core/Activator.java b/remote/org.eclipse.remote.serial.core/src/org/eclipse/remote/serial/internal/core/Activator.java
index f11914b2b96..90ab8c2109e 100644
--- a/remote/org.eclipse.remote.serial.core/src/org/eclipse/remote/serial/internal/core/Activator.java
+++ b/remote/org.eclipse.remote.serial.core/src/org/eclipse/remote/serial/internal/core/Activator.java
@@ -23,10 +23,12 @@ public class Activator extends Plugin {
 
 	private static Plugin plugin;
 
+	@Override
 	public void start(BundleContext bundleContext) throws Exception {
 		plugin = this;
 	}
 
+	@Override
 	public void stop(BundleContext bundleContext) throws Exception {
 		plugin = null;
 	}
diff --git a/remote/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/Activator.java b/remote/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/Activator.java
index 63d0a0a2719..1e6f51ed8e2 100644
--- a/remote/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/Activator.java
+++ b/remote/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/Activator.java
@@ -34,12 +34,14 @@ public class Activator extends AbstractUIPlugin {
 	// The shared instance
 	private static Activator plugin;
 
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
 		getImageRegistry().put(IMG_CONNECTION_TYPE, imageDescriptorFromPlugin(PLUGIN_ID, "/icons/serial.png")); //$NON-NLS-1$
 	}
 
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/remote/org.eclipse.remote.telnet.core.tests/src/org/eclipse/remote/telnet/core/tests/Activator.java b/remote/org.eclipse.remote.telnet.core.tests/src/org/eclipse/remote/telnet/core/tests/Activator.java
index e306019cf34..464be259a87 100644
--- a/remote/org.eclipse.remote.telnet.core.tests/src/org/eclipse/remote/telnet/core/tests/Activator.java
+++ b/remote/org.eclipse.remote.telnet.core.tests/src/org/eclipse/remote/telnet/core/tests/Activator.java
@@ -29,6 +29,7 @@ public class Activator implements BundleActivator {
 	 * (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext bundleContext) throws Exception {
 		Activator.context = bundleContext;
 	}
@@ -37,6 +38,7 @@ public class Activator implements BundleActivator {
 	 * (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext bundleContext) throws Exception {
 		Activator.context = null;
 	}
diff --git a/remote/org.eclipse.remote.telnet.core.tests/src/org/eclipse/remote/telnet/core/tests/TelnetConnectionTests.java b/remote/org.eclipse.remote.telnet.core.tests/src/org/eclipse/remote/telnet/core/tests/TelnetConnectionTests.java
index e4be531779b..bdb2c8abb1d 100644
--- a/remote/org.eclipse.remote.telnet.core.tests/src/org/eclipse/remote/telnet/core/tests/TelnetConnectionTests.java
+++ b/remote/org.eclipse.remote.telnet.core.tests/src/org/eclipse/remote/telnet/core/tests/TelnetConnectionTests.java
@@ -13,8 +13,8 @@
  *******************************************************************************/
 package org.eclipse.remote.telnet.core.tests;
 
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
diff --git a/remote/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Logger.java b/remote/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Logger.java
index 74f580bfda7..a05f45f6ef6 100644
--- a/remote/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Logger.java
+++ b/remote/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Logger.java
@@ -60,7 +60,7 @@ public final class Logger implements DebugOptionsListener {
 	}
 
 	private Logger(BundleContext context) {
-		Hashtable<String, String> props = new Hashtable<String, String>(2);
+		Hashtable<String, String> props = new Hashtable<>(2);
 		props.put(DebugOptions.LISTENER_SYMBOLICNAME, Activator.PLUGIN_ID);
 		context.registerService(DebugOptionsListener.class.getName(), this, props);
 	}
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/DeferredFileStore.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/DeferredFileStore.java
index d794662a18f..b69e1d88458 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/DeferredFileStore.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/DeferredFileStore.java
@@ -65,7 +65,7 @@ public class DeferredFileStore implements IDeferredWorkbenchAdapter, IAdaptable
 
 	@Override
 	public void fetchDeferredChildren(Object object, IElementCollector collector, IProgressMonitor monitor) {
-		ArrayList<DeferredFileStore> children = new ArrayList<DeferredFileStore>();
+		ArrayList<DeferredFileStore> children = new ArrayList<>();
 		try {
 			IFileInfo[] childInfos = fFileStore.childInfos(EFS.NONE, monitor);
 			for (IFileInfo info : childInfos) {
@@ -122,7 +122,7 @@ public class DeferredFileStore implements IDeferredWorkbenchAdapter, IAdaptable
 	 * @return IWorkbenchAdapter or <code>null</code>
 	 */
 	protected IWorkbenchAdapter getAdapter(Object element) {
-		return (IWorkbenchAdapter) getAdapter(element, IWorkbenchAdapter.class);
+		return getAdapter(element, IWorkbenchAdapter.class);
 	}
 
 	/**
@@ -177,7 +177,7 @@ public class DeferredFileStore implements IDeferredWorkbenchAdapter, IAdaptable
 	public Object[] getChildren(Object o) {
 		try {
 			IFileStore[] stores = fFileStore.childStores(EFS.NONE, null);
-			List<DeferredFileStore> def = new ArrayList<DeferredFileStore>();
+			List<DeferredFileStore> def = new ArrayList<>();
 			for (int i = 0; i < stores.length; i++) {
 				if (!(fExcludeHidden && stores[i].getName().startsWith("."))) { //$NON-NLS-1$
 					def.add(new DeferredFileStore(stores[i], fExcludeHidden, this));
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteTreeContentManager.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteTreeContentManager.java
index d73565f0ab2..7882d47a0d3 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteTreeContentManager.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteTreeContentManager.java
@@ -50,9 +50,9 @@ public class RemoteTreeContentManager {
 	/**
 	 * Queue of parents to fetch children for, and associated element collectors and deferred adapters.
 	 */
-	private final List<Object> fElementQueue = new ArrayList<Object>();
-	private final List<IElementCollector> fCollectors = new ArrayList<IElementCollector>();
-	private final List<IDeferredWorkbenchAdapter> fAdapaters = new ArrayList<IDeferredWorkbenchAdapter>();
+	private final List<Object> fElementQueue = new ArrayList<>();
+	private final List<IElementCollector> fCollectors = new ArrayList<>();
+	private final List<IDeferredWorkbenchAdapter> fAdapaters = new ArrayList<>();
 
 	/**
 	 * Fetching children is done in a single background job. This makes fetching single threaded/serial per
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteTreeViewer.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteTreeViewer.java
index fc1ff752968..b6ba5f44e79 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteTreeViewer.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/RemoteTreeViewer.java
@@ -42,7 +42,7 @@ public class RemoteTreeViewer extends TreeViewer {
 	private class ExpansionJob extends UIJob {
 
 		private Object element;
-		private final List<Object> parents = new ArrayList<Object>(); // top down
+		private final List<Object> parents = new ArrayList<>(); // top down
 
 		/**
 		 * Constructs a job to expand the given element.
@@ -108,7 +108,7 @@ public class RemoteTreeViewer extends TreeViewer {
 
 		private IStructuredSelection selection;
 		private Object first;
-		private final List<Object> parents = new ArrayList<Object>(); // top down
+		private final List<Object> parents = new ArrayList<>(); // top down
 
 		/**
 		 * Constucts a job to select the given element.
@@ -317,7 +317,7 @@ public class RemoteTreeViewer extends TreeViewer {
 	private void addAllParents(List<Object> list, Object element) {
 		if (element instanceof IAdaptable) {
 			IAdaptable adaptable = (IAdaptable) element;
-			IWorkbenchAdapter adapter = (IWorkbenchAdapter) adaptable.getAdapter(IWorkbenchAdapter.class);
+			IWorkbenchAdapter adapter = adaptable.getAdapter(IWorkbenchAdapter.class);
 			if (adapter != null) {
 				Object parent = adapter.getParent(element);
 				if (parent != null) {
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java
index f1fdf5fdc00..4c92f021b68 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/ConnectionsPreferencePage.java
@@ -212,7 +212,7 @@ public class ConnectionsPreferencePage extends PreferencePage implements IWorkbe
 	private IRemoteConnectionType fConnectionType;
 	private IRemoteUIConnectionService fUIConnectionManager;
 
-	private final Map<String, IRemoteConnection> fWorkingCopies = new HashMap<String, IRemoteConnection>();
+	private final Map<String, IRemoteConnection> fWorkingCopies = new HashMap<>();
 
 	private static final String DEFAULT_CONNECTION_NAME = "Remote Host"; //$NON-NLS-1$
 
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/PreferencesAdapter.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/PreferencesAdapter.java
index e4e51396783..7649ef6dd05 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/PreferencesAdapter.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/PreferencesAdapter.java
@@ -40,6 +40,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 		 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener# propertyChange
 		 * (org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
 		 */
+		@Override
 		public void preferenceChange(IEclipsePreferences.PreferenceChangeEvent event) {
 			firePropertyChangeEvent(event.getKey(), event.getOldValue(), event.getNewValue());
 		}
@@ -71,6 +72,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void addPropertyChangeListener(IPropertyChangeListener listener) {
 		fListeners.add(listener);
 	}
@@ -78,6 +80,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void removePropertyChangeListener(IPropertyChangeListener listener) {
 		fListeners.remove(listener);
 	}
@@ -85,6 +88,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean contains(String name) {
 		return Preferences.contains(name);
 	}
@@ -92,6 +96,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
 		fNeedsSaving = true;
 		if (!fSilent) {
@@ -106,6 +111,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean getBoolean(String name) {
 		return Preferences.getBoolean(name);
 	}
@@ -113,6 +119,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean getDefaultBoolean(String name) {
 		return Preferences.getDefaultBoolean(name, false);
 	}
@@ -120,6 +127,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public double getDefaultDouble(String name) {
 		return Preferences.getDefaultDouble(name, 0.0);
 	}
@@ -127,6 +135,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public float getDefaultFloat(String name) {
 		return Preferences.getDefaultFloat(name, 0.0f);
 	}
@@ -134,6 +143,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public int getDefaultInt(String name) {
 		return Preferences.getDefaultInt(name, 0);
 	}
@@ -141,6 +151,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public long getDefaultLong(String name) {
 		return Preferences.getDefaultLong(name, 0L);
 	}
@@ -148,6 +159,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getDefaultString(String name) {
 		return Preferences.getDefaultString(name, ""); //$NON-NLS-1$
 	}
@@ -155,6 +167,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public double getDouble(String name) {
 		return Preferences.getDouble(name);
 	}
@@ -162,6 +175,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public float getFloat(String name) {
 		return Preferences.getFloat(name);
 	}
@@ -169,6 +183,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public int getInt(String name) {
 		return Preferences.getInt(name);
 	}
@@ -176,6 +191,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public long getLong(String name) {
 		return Preferences.getLong(name);
 	}
@@ -183,6 +199,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public String getString(String name) {
 		return Preferences.getString(name);
 	}
@@ -190,6 +207,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean isDefault(String name) {
 		return Preferences.isDefault(name);
 	}
@@ -197,6 +215,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean needsSaving() {
 		return fNeedsSaving;
 	}
@@ -204,6 +223,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void putValue(String name, String value) {
 		try {
 			fSilent = true;
@@ -216,6 +236,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setDefault(String name, double value) {
 		Preferences.setDefaultDouble(name, value);
 	}
@@ -223,6 +244,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setDefault(String name, float value) {
 		Preferences.setDefaultFloat(name, value);
 	}
@@ -230,6 +252,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setDefault(String name, int value) {
 		Preferences.setDefaultInt(name, value);
 	}
@@ -237,6 +260,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setDefault(String name, long value) {
 		Preferences.setDefaultLong(name, value);
 	}
@@ -244,6 +268,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setDefault(String name, String defaultObject) {
 		Preferences.setDefaultString(name, defaultObject);
 	}
@@ -251,6 +276,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setDefault(String name, boolean value) {
 		Preferences.setDefaultBoolean(name, value);
 	}
@@ -258,6 +284,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setToDefault(String name) {
 		Preferences.setToDefault(name);
 	}
@@ -265,6 +292,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setValue(String name, double value) {
 		Preferences.setDouble(name, value);
 	}
@@ -272,6 +300,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setValue(String name, float value) {
 		Preferences.setFloat(name, value);
 	}
@@ -279,6 +308,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setValue(String name, int value) {
 		Preferences.setInt(name, value);
 	}
@@ -286,6 +316,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setValue(String name, long value) {
 		Preferences.setLong(name, value);
 	}
@@ -293,6 +324,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setValue(String name, String value) {
 		Preferences.setString(name, value);
 	}
@@ -300,6 +332,7 @@ public class PreferencesAdapter implements IPreferenceStore {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setValue(String name, boolean value) {
 		Preferences.setBoolean(name, value);
 	}
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/RemoteDevelopmentPreferencePage.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/RemoteDevelopmentPreferencePage.java
index f03f47ccc79..2026745f586 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/RemoteDevelopmentPreferencePage.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/preferences/RemoteDevelopmentPreferencePage.java
@@ -45,7 +45,7 @@ public class RemoteDevelopmentPreferencePage extends FieldEditorPreferencePage i
 
 	@Override
 	protected void createFieldEditors() {
-		List<String[]> namesAndValues = new ArrayList<String[]>();
+		List<String[]> namesAndValues = new ArrayList<>();
 		String[] nameAndValue = new String[2];
 		nameAndValue[0] = "None"; //$NON-NLS-1$
 		nameAndValue[1] = ""; //$NON-NLS-1$
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/CloseConnectionHandler.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/CloseConnectionHandler.java
index 8131688a1c0..2374eb95458 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/CloseConnectionHandler.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/CloseConnectionHandler.java
@@ -27,7 +27,7 @@ public class CloseConnectionHandler extends AbstractHandler {
 		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
 		if (selection != null && selection instanceof IStructuredSelection) {
 			// Get the manageable connections from the selection
-			final List<IRemoteConnection> connections = new ArrayList<IRemoteConnection>();
+			final List<IRemoteConnection> connections = new ArrayList<>();
 			@SuppressWarnings("unchecked")
 			Iterator<Object> i = ((IStructuredSelection) selection).iterator();
 			while (i.hasNext()) {
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/DeleteRemoteConnectionHandler.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/DeleteRemoteConnectionHandler.java
index a5cb7ae2a87..5b49b27e59a 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/DeleteRemoteConnectionHandler.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/DeleteRemoteConnectionHandler.java
@@ -39,7 +39,7 @@ public class DeleteRemoteConnectionHandler extends AbstractHandler {
 		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
 		if (selection != null && selection instanceof IStructuredSelection) {
 			// Get the manageable connections from the selection
-			List<IRemoteConnection> connections = new ArrayList<IRemoteConnection>();
+			List<IRemoteConnection> connections = new ArrayList<>();
 			@SuppressWarnings("unchecked")
 			Iterator<Object> i = ((IStructuredSelection) selection).iterator();
 			while (i.hasNext()) {
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/OpenConnectionHandler.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/OpenConnectionHandler.java
index b772677e3c7..d9f368d2ea2 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/OpenConnectionHandler.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/OpenConnectionHandler.java
@@ -28,7 +28,7 @@ public class OpenConnectionHandler extends AbstractHandler {
 		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
 		if (selection != null && selection instanceof IStructuredSelection) {
 			// Get the manageable connections from the selection
-			final List<IRemoteConnection> connections = new ArrayList<IRemoteConnection>();
+			final List<IRemoteConnection> connections = new ArrayList<>();
 			@SuppressWarnings("unchecked")
 			Iterator<Object> i = ((IStructuredSelection) selection).iterator();
 			while (i.hasNext()) {
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/RemoteConnectionPropertyPage.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/RemoteConnectionPropertyPage.java
index 47ec6d32182..3d886c1fd70 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/RemoteConnectionPropertyPage.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/RemoteConnectionPropertyPage.java
@@ -24,7 +24,7 @@ public class RemoteConnectionPropertyPage extends PropertyPage {
 		if (element instanceof IRemoteConnection) {
 			connection = (IRemoteConnection) element;
 		} else if (element instanceof IAdaptable) {
-			connection = (IRemoteConnection) ((IAdaptable) element).getAdapter(IRemoteConnection.class);
+			connection = ((IAdaptable) element).getAdapter(IRemoteConnection.class);
 		}
 
 		if (connection != null) {
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/RemoteConnectionsContentProvider.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/RemoteConnectionsContentProvider.java
index 85ecb208a3f..eef7007c91a 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/RemoteConnectionsContentProvider.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/internal/ui/views/RemoteConnectionsContentProvider.java
@@ -16,9 +16,9 @@ package org.eclipse.remote.internal.ui.views;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.remote.core.IRemoteConnection;
-import org.eclipse.remote.core.RemoteConnectionChangeEvent;
 import org.eclipse.remote.core.IRemoteConnectionChangeListener;
 import org.eclipse.remote.core.IRemoteServicesManager;
+import org.eclipse.remote.core.RemoteConnectionChangeEvent;
 
 public class RemoteConnectionsContentProvider implements ITreeContentProvider, IRemoteConnectionChangeListener {
 
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIFileService.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIFileService.java
index 2d3518ab8a8..85ef9158bcc 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIFileService.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIFileService.java
@@ -103,7 +103,7 @@ public class RemoteUIFileService implements IRemoteUIFileService {
 			return null;
 		}
 		connection = browser.getConnection();
-		List<String> paths = new ArrayList<String>();
+		List<String> paths = new ArrayList<>();
 		for (IFileStore store : browser.getResources()) {
 			paths.add(store.toURI().getPath());
 		}
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
index 0f24922b862..cb4c1ddaf51 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
@@ -217,7 +217,7 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext {
 		if (fResourceBrowserWidget != null) {
 			return fResourceBrowserWidget.getResources();
 		}
-		return new ArrayList<IFileStore>();
+		return new ArrayList<>();
 	}
 
 	@Override
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java
index 33f3fbf2f8d..4add1483dcd 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java
@@ -56,7 +56,7 @@ public class RemoteDirectoryWidget extends Composite {
 	private IRemoteConnection fRemoteConnection;
 	private final ListenerList modifyListeners = new ListenerList();
 
-	private final Map<String, String> previousSelections = new HashMap<String, String>();
+	private final Map<String, String> previousSelections = new HashMap<>();
 
 	public RemoteDirectoryWidget(Composite parent, int style, String title, String defaultPath) {
 		super(parent, style);
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java
index 3145e6419f4..e27065a4067 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java
@@ -63,7 +63,7 @@ public class RemoteFileWidget extends Composite {
 	private IRemoteConnection fRemoteConnection;
 
 	private final ListenerList fModifyListeners = new ListenerList();
-	private final Map<String, String> fPreviousSelections = new HashMap<String, String>();
+	private final Map<String, String> fPreviousSelections = new HashMap<>();
 
 	public RemoteFileWidget(Composite parent, int style, int flags, String title, String defaultPath) {
 		super(parent, style);
diff --git a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java
index 587bc04d13a..7ff3356ec0f 100644
--- a/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java
+++ b/remote/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java
@@ -191,7 +191,7 @@ public class RemoteResourceBrowserWidget extends Composite {
 	private String fDialogLabel;
 
 	private boolean fShowHidden;
-	private final List<IFileStore> fResources = new ArrayList<IFileStore>();
+	private final List<IFileStore> fResources = new ArrayList<>();
 	private String fResource;
 	private String fInitialPath;
 	private IPath fRootPath;
diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/ArgumentParser.java b/terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/ArgumentParser.java
index ca3e15e474e..fd6236141b4 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/ArgumentParser.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.connector.remote/src/org/eclipse/tm/terminal/connector/remote/internal/ArgumentParser.java
@@ -51,7 +51,7 @@ public class ArgumentParser {
 	 * are.
 	 */
 	public ArgumentParser(List<String> tokenList) {
-		this.tokens = new ArrayList<String>(tokenList);
+		this.tokens = new ArrayList<>(tokenList);
 	}
 
 	/**
@@ -69,13 +69,13 @@ public class ArgumentParser {
 	 * the are.
 	 */
 	public ArgumentParser(String command, List<String> parameterList) {
-		this.tokens = new ArrayList<String>();
+		this.tokens = new ArrayList<>();
 		this.tokens.add(command);
 		this.tokens.addAll(parameterList);
 	}
 
 	private static List<String> parseCommandline(String commandline) {
-		ArrayList<String> result = new ArrayList<String>();
+		ArrayList<String> result = new ArrayList<>();
 		StringCharacterIterator iterator = new StringCharacterIterator(commandline);
 
 		for (iterator.first(); iterator.current() != CharacterIterator.DONE; iterator.next()) {
@@ -268,7 +268,7 @@ public class ArgumentParser {
 	 * @return The List
 	 */
 	public List<String> getTokenList() {
-		return new ArrayList<String>(this.tokens);
+		return new ArrayList<>(this.tokens);
 	}
 
 	/**
@@ -328,7 +328,7 @@ public class ArgumentParser {
 		if (this.tokens.size() == 0) {
 			return null;
 		}
-		return new ArrayList<String>(this.tokens.subList(1, this.tokens.size()));
+		return new ArrayList<>(this.tokens.subList(1, this.tokens.size()));
 	}
 
 	/**
diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java
index acda0b3d9f4..d8baa8f7289 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/controls/SshWizardConfigurationPanel.java
@@ -302,7 +302,7 @@ public class SshWizardConfigurationPanel extends AbstractExtendedConfigurationPa
 				if (!savePassword)
 					removeSecurePassword(host);
 			} else if (add) {
-				Map<String, String> hostSettings = new HashMap<String, String>();
+				Map<String, String> hostSettings = new HashMap<>();
 				hostSettings.put(ITerminalsConnectorConstants.PROP_IP_HOST, sshSettings.getHost());
 				hostSettings.put(ITerminalsConnectorConstants.PROP_IP_PORT, Integer.toString(sshSettings.getPort()));
 				hostSettings.put(ITerminalsConnectorConstants.PROP_TIMEOUT, Integer.toString(sshSettings.getTimeout()));
diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java
index f72c5f73fe4..5fb593acd18 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/connector/NetworkPortMap.java
@@ -53,7 +53,7 @@ public class NetworkPortMap {
 	}
 
 	public List<String> getNameTable() {
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 		for (int i = 0; i < fPortMap.length; i++) {
 			names.add(fPortMap[i][0]);
 		}
diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java
index 2a08ae46685..af825928674 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java
@@ -24,7 +24,7 @@ class EditActionAccelerators {
 	private static final String COPY_COMMAND_ID = "org.eclipse.tm.terminal.copy"; //$NON-NLS-1$
 	private static final String PASTE_COMMAND_ID = "org.eclipse.tm.terminal.paste"; //$NON-NLS-1$
 
-	private final Map<Integer, String> commandIdsByAccelerator = new HashMap<Integer, String>();
+	private final Map<Integer, String> commandIdsByAccelerator = new HashMap<>();
 
 	private void load() {
 		addAccelerator(COPY_COMMAND_ID);
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java
index 74d9ddead52..c85f3871a63 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java
@@ -43,14 +43,13 @@ public abstract class AbstractTriggerCommandHandler extends AbstractHandler {
 	protected void triggerCommand(String commandId, ISelection selection) {
 		Assert.isNotNull(commandId);
 
-		ICommandService service = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
+		ICommandService service = PlatformUI.getWorkbench().getService(ICommandService.class);
 		Command command = service != null ? service.getCommand(commandId) : null;
 		if (command != null && command.isDefined() && command.isEnabled()) {
 			try {
 				ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null);
 				Assert.isNotNull(pCmd);
-				IHandlerService handlerSvc = (IHandlerService) PlatformUI.getWorkbench()
-						.getService(IHandlerService.class);
+				IHandlerService handlerSvc = PlatformUI.getWorkbench().getService(IHandlerService.class);
 				Assert.isNotNull(handlerSvc);
 				IEvaluationContext ctx = handlerSvc.getCurrentState();
 				if (selection != null) {
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java
index d1baba881fe..ff85cec8e72 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java
@@ -64,9 +64,9 @@ import org.eclipse.tm.terminal.view.ui.activator.UIPlugin;
 import org.eclipse.tm.terminal.view.ui.controls.NoteCompositeHelper;
 import org.eclipse.tm.terminal.view.ui.interfaces.IExternalExecutablesProperties;
 import org.eclipse.tm.terminal.view.ui.interfaces.IPreferenceKeys;
-import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesUtils;
 import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesDialog;
 import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesManager;
+import org.eclipse.tm.terminal.view.ui.local.showin.ExternalExecutablesUtils;
 import org.eclipse.tm.terminal.view.ui.nls.Messages;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java
index 3a7ff1734a0..dac6e73ecda 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java
@@ -36,8 +36,8 @@ import org.eclipse.tm.internal.terminal.control.actions.TerminalActionPaste;
 import org.eclipse.tm.internal.terminal.control.actions.TerminalActionSelectAll;
 import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
-import org.eclipse.tm.terminal.view.ui.actions.RenameTerminalAction;
 import org.eclipse.tm.terminal.view.ui.actions.InvertColorsAction;
+import org.eclipse.tm.terminal.view.ui.actions.RenameTerminalAction;
 import org.eclipse.tm.terminal.view.ui.actions.SelectEncodingAction;
 import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView;
 import org.eclipse.ui.IWorkbenchActionConstants;
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java
index 36cbfd4b131..88e0ff99e4a 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsViewMementoHandler.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.PlatformUI;
 public class TerminalsViewMementoHandler {
 	// The list of items to save. See the workbench listener implementation
 	// in o.e.tm.terminal.view.ui.activator.UIPlugin.
-	private final List<CTabItem> saveables = new ArrayList<CTabItem>();
+	private final List<CTabItem> saveables = new ArrayList<>();
 
 	/**
 	 * Sets the list of saveable items.
@@ -154,7 +154,7 @@ public class TerminalsViewMementoHandler {
 			IMemento[] connections = memento.getChildren("connection"); //$NON-NLS-1$
 			for (IMemento connection : connections) {
 				// Create the properties container that holds the terminal properties
-				Map<String, Object> properties = new HashMap<String, Object>();
+				Map<String, Object> properties = new HashMap<>();
 
 				// Set the view id attributes
 				properties.put(ITerminalsConnectorConstants.PROP_ID, id);
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/showin/GitShowInContextHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/showin/GitShowInContextHandler.java
index 16caadc4f05..9d453bbe750 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/showin/GitShowInContextHandler.java
+++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/showin/GitShowInContextHandler.java
@@ -36,7 +36,7 @@ public class GitShowInContextHandler {
 	public static ISelection getSelection(Object input) {
 		Assert.isNotNull(input);
 
-		List<Object> elements = new ArrayList<Object>();
+		List<Object> elements = new ArrayList<>();
 
 		if (input instanceof org.eclipse.egit.ui.internal.history.HistoryPageInput) {
 			org.eclipse.egit.ui.internal.history.HistoryPageInput inp = (org.eclipse.egit.ui.internal.history.HistoryPageInput) input;
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/actions/HistoryDropDownAction.java b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/actions/HistoryDropDownAction.java
index 393ce9e367a..a8bf6788a80 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/actions/HistoryDropDownAction.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner/src/org/eclipse/cdt/testsrunner/internal/ui/view/actions/HistoryDropDownAction.java
@@ -103,7 +103,7 @@ public class HistoryDropDownAction extends Action {
 		 * Fills the testing sessions history list.
 		 */
 		private void createHistoryList() {
-			IListAdapter<ITestingSession> adapter = new IListAdapter<ITestingSession>() {
+			IListAdapter<ITestingSession> adapter = new IListAdapter<>() {
 				@Override
 				public void customButtonPressed(ListDialogField<ITestingSession> field, int index) {
 					doCustomButtonPressed(index);
diff --git a/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/internal/launcher/CTestingTab.java b/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/internal/launcher/CTestingTab.java
index f7ea8f67ebd..1395cb05a66 100644
--- a/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/internal/launcher/CTestingTab.java
+++ b/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/internal/launcher/CTestingTab.java
@@ -18,7 +18,10 @@ import org.eclipse.cdt.testsrunner.internal.TestsRunnerPlugin;
 import org.eclipse.cdt.testsrunner.internal.launcher.ITestsLaunchConfigurationConstants;
 import org.eclipse.cdt.testsrunner.internal.launcher.TestsRunnerProviderInfo;
 import org.eclipse.cdt.testsrunner.launcher.ITestsRunnerProviderInfo;
-
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -29,12 +32,6 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
 /**
  * A launch configuration tab that displays and edits different testing options
  * (e.g. Tests Runner provider plug-in).
diff --git a/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/internal/launcher/TestingProcessFactory.java b/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/internal/launcher/TestingProcessFactory.java
index 11556e38c57..5a7a312d296 100644
--- a/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/internal/launcher/TestingProcessFactory.java
+++ b/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/internal/launcher/TestingProcessFactory.java
@@ -19,7 +19,6 @@ import java.util.Map;
 import org.eclipse.cdt.dsf.gdb.IGdbDebugConstants;
 import org.eclipse.cdt.dsf.gdb.launching.GDBProcess;
 import org.eclipse.cdt.dsf.gdb.launching.InferiorRuntimeProcess;
-
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.IProcessFactory;
 import org.eclipse.debug.core.model.IProcess;
diff --git a/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/ui/OpenEditorAtLineAction.java b/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/ui/OpenEditorAtLineAction.java
index 035895a0150..1e885a2f376 100644
--- a/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/ui/OpenEditorAtLineAction.java
+++ b/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/ui/OpenEditorAtLineAction.java
@@ -18,47 +18,37 @@ import java.net.URI;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
 import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.cdt.unittest.CDTUnitTestPlugin;
-import org.eclipse.unittest.model.ITestRunSession;
-
-import org.eclipse.swt.widgets.Shell;
-
 import org.eclipse.core.filesystem.URIUtil;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
-
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.model.IPersistableSourceLocator;
+import org.eclipse.debug.core.model.ISourceLocator;
+import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector;
+import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
+import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.IDebugModelPresentation;
+import org.eclipse.debug.ui.sourcelookup.ISourceLookupResult;
 import org.eclipse.jface.action.Action;
-
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
-
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
-
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.IPersistableSourceLocator;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.debug.ui.sourcelookup.ISourceLookupResult;
+import org.eclipse.unittest.model.ITestRunSession;
 
 /**
  * Opens the editor in place where the currently selected message is pointed to.
diff --git a/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/ui/OpenTestAction.java b/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/ui/OpenTestAction.java
index 8af6936f465..e2d25171762 100644
--- a/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/ui/OpenTestAction.java
+++ b/unittest/org.eclipse.cdt.unittest/src/org/eclipse/cdt/unittest/ui/OpenTestAction.java
@@ -34,29 +34,23 @@ import org.eclipse.cdt.internal.core.browser.IndexModelUtil;
 import org.eclipse.cdt.internal.ui.search.CSearchUtil;
 import org.eclipse.cdt.internal.ui.util.EditorUtility;
 import org.eclipse.cdt.unittest.CDTUnitTestPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.unittest.model.ITestCaseElement;
-import org.eclipse.unittest.model.ITestElement;
-import org.eclipse.unittest.model.ITestSuiteElement;
-
-import org.eclipse.swt.widgets.Shell;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.MessageDialog;
-
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
-
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
-
 import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.unittest.model.ITestCaseElement;
+import org.eclipse.unittest.model.ITestElement;
+import org.eclipse.unittest.model.ITestSuiteElement;
 
 public class OpenTestAction extends Action {
 	protected String fClassName;
author	Jonah Graham	2022-04-17 19:34:43 +0000
committer	Jonah Graham	2022-04-20 00:13:15 +0000
commit	a1c02e2cce72f98aa1c73324225fc53563a81856 (patch)
tree	dfef033f1eed2f6b46a39700c5c0dddc5a27b405
parent	148ae40d0f4303d9ee4fcda44a3ef9297f6d3079 (diff)
download	org.eclipse.cdt-a1c02e2cce72f98aa1c73324225fc53563a81856.tar.gz org.eclipse.cdt-a1c02e2cce72f98aa1c73324225fc53563a81856.tar.xz org.eclipse.cdt-a1c02e2cce72f98aa1c73324225fc53563a81856.zip