Bug 540373: Cleanup: Remove redundant type arguments

This was done by selecting all projects in Eclipse then
Source -> Clean Up... -> choosing:
- Remove redundant type arguments
and completing the wizard

Change-Id: Iaecc7010f097b4b1fabd29ccaa34ccb23a716fbf

22 files changed, 41 insertions, 41 deletions

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java
index 8f83bac2471..840406179bd 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java
@@ -235,7 +235,7 @@ public class DsfTerminateCommand implements ITerminateHandler {
 	}
 
 	private IProcessDMContext[] getProcessDMContexts(Object[] elements) {
-		final Set<IProcessDMContext> procDmcs = new HashSet<IProcessDMContext>();
+		final Set<IProcessDMContext> procDmcs = new HashSet<>();
 		for (Object obj : elements) {
 			if (obj instanceof IDMVMContext) {
 				IProcessDMContext procDmc = DMContexts.getAncestorOfType(((IDMVMContext) obj).getDMContext(),
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java
index 1f8ced9e17f..6ebf4b46036 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java
@@ -184,7 +184,7 @@ public class GdbDisconnectCommand implements IDisconnectHandler {
 
 	private void getContainerDMContexts(Object[] elements, final DataRequestMonitor<IContainerDMContext[]> rm) {
 		GdbLaunch launch = null;
-		final Set<IContainerDMContext> contDmcs = new HashSet<IContainerDMContext>();
+		final Set<IContainerDMContext> contDmcs = new HashSet<>();
 		for (Object obj : elements) {
 			if (obj instanceof GdbLaunch) {
 				launch = (GdbLaunch) obj;
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleDynamicPrintfTarget.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleDynamicPrintfTarget.java
index e42e3247f43..4db6fc84d29 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleDynamicPrintfTarget.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleDynamicPrintfTarget.java
@@ -49,7 +49,7 @@ public class DisassemblyToggleDynamicPrintfTarget extends AbstractDisassemblyBre
 	protected void createLineBreakpointInteractive(IWorkbenchPart part, String sourceHandle, IResource resource,
 			int lineNumber) throws CoreException {
 		ICDynamicPrintf dprintf = (ICDynamicPrintf) CDIDebugModel.createBlankLineDynamicPrintf();
-		Map<String, Object> attributes = new HashMap<String, Object>();
+		Map<String, Object> attributes = new HashMap<>();
 		CDIDebugModel.setLineBreakpointAttributes(attributes, sourceHandle, getBreakpointType(), lineNumber, true, 0,
 				""); //$NON-NLS-1$
 
@@ -89,7 +89,7 @@ public class DisassemblyToggleDynamicPrintfTarget extends AbstractDisassemblyBre
 	protected void createAddressBreakpointInteractive(IWorkbenchPart part, IResource resource, IAddress address)
 			throws CoreException {
 		ICDynamicPrintf dprintf = (ICDynamicPrintf) CDIDebugModel.createBlankAddressDynamicPrintf();
-		Map<String, Object> attributes = new HashMap<String, Object>();
+		Map<String, Object> attributes = new HashMap<>();
 		CDIDebugModel.setAddressBreakpointAttributes(attributes, null, null, getBreakpointType(), -1, address, true, 0,
 				""); //$NON-NLS-1$
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleTracepointsTarget.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleTracepointsTarget.java
index f2d4d80f32e..70aafa7ded5 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleTracepointsTarget.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/DisassemblyToggleTracepointsTarget.java
@@ -44,7 +44,7 @@ public class DisassemblyToggleTracepointsTarget extends AbstractDisassemblyBreak
 	protected void createLineBreakpointInteractive(IWorkbenchPart part, String sourceHandle, IResource resource,
 			int lineNumber) throws CoreException {
 		ICLineBreakpoint lineBp = CDIDebugModel.createBlankLineTracepoint();
-		Map<String, Object> attributes = new HashMap<String, Object>();
+		Map<String, Object> attributes = new HashMap<>();
 		CDIDebugModel.setLineBreakpointAttributes(attributes, sourceHandle, getBreakpointType(), lineNumber, true, 0,
 				""); //$NON-NLS-1$
 		openBreakpointPropertiesDialog(lineBp, part, resource, attributes);
@@ -63,7 +63,7 @@ public class DisassemblyToggleTracepointsTarget extends AbstractDisassemblyBreak
 	protected void createAddressBreakpointInteractive(IWorkbenchPart part, IResource resource, IAddress address)
 			throws CoreException {
 		ICLineBreakpoint lineBp = CDIDebugModel.createBlankAddressTracepoint();
-		Map<String, Object> attributes = new HashMap<String, Object>();
+		Map<String, Object> attributes = new HashMap<>();
 		CDIDebugModel.setAddressBreakpointAttributes(attributes, null, null, getBreakpointType(), -1, address, true, 0,
 				""); //$NON-NLS-1$
 		openBreakpointPropertiesDialog(lineBp, part, resource, attributes);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java
index 10e2e8663bd..fa7680944d2 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java
@@ -141,7 +141,7 @@ public class GdbThreadFilterEditor {
 			}
 
 			if (parent instanceof ILaunchManager) {
-				List<Object> children = new ArrayList<Object>();
+				List<Object> children = new ArrayList<>();
 				ILaunch[] launches = ((ILaunchManager) parent).getLaunches();
 				IContainerDMContext[] targetArray;
 				for (int i = 0; i < launches.length; i++) {
@@ -276,7 +276,7 @@ public class GdbThreadFilterEditor {
 		if (!(input instanceof ILaunchManager)) {
 			return new IContainerDMContext[0];
 		}
-		List<Object> targets = new ArrayList<Object>();
+		List<Object> targets = new ArrayList<>();
 		ILaunch[] launches = ((ILaunchManager) input).getLaunches();
 		IContainerDMContext[] targetArray;
 		for (int i = 0; i < launches.length; i++) {
@@ -343,7 +343,7 @@ public class GdbThreadFilterEditor {
 
 	private IExecutionDMContext[] getTargetThreadFilters(IContainerDMContext target) {
 		Object[] threads = ((ITreeContentProvider) getThreadViewer().getContentProvider()).getChildren(target);
-		ArrayList<Object> list = new ArrayList<Object>(threads.length);
+		ArrayList<Object> list = new ArrayList<>(threads.length);
 		for (int i = 0; i < threads.length; ++i) {
 			if (getThreadViewer().getChecked(threads[i]))
 				list.add(threads[i]);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleDynamicPrintfTargetFactory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleDynamicPrintfTargetFactory.java
index 6a9f1193941..61ec294d7ab 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleDynamicPrintfTargetFactory.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleDynamicPrintfTargetFactory.java
@@ -48,7 +48,7 @@ public class ToggleDynamicPrintfTargetFactory implements IToggleBreakpointsTarge
 	public static final String TOGGLE_C_DYNAMICPRINTF_TARGET_ID = CDebugUIPlugin.PLUGIN_ID
 			+ ".toggleCDynamicPrintfTarget"; //$NON-NLS-1$
 
-	private static final Set<String> TOGGLE_TARGET_IDS_ALL = new HashSet<String>(1);
+	private static final Set<String> TOGGLE_TARGET_IDS_ALL = new HashSet<>(1);
 	static {
 		TOGGLE_TARGET_IDS_ALL.add(TOGGLE_C_DYNAMICPRINTF_TARGET_ID);
 	}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleTracepointsTargetFactory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleTracepointsTargetFactory.java
index 1a81de7abf5..e2af9cc455e 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleTracepointsTargetFactory.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleTracepointsTargetFactory.java
@@ -46,7 +46,7 @@ public class ToggleTracepointsTargetFactory implements IToggleBreakpointsTargetF
 	 */
 	public static final String TOGGLE_C_TRACEPOINT_TARGET_ID = CDebugUIPlugin.PLUGIN_ID + ".toggleCTracepointTarget"; //$NON-NLS-1$
 
-	private static final Set<String> TOGGLE_TARGET_IDS_ALL = new HashSet<String>(1);
+	private static final Set<String> TOGGLE_TARGET_IDS_ALL = new HashSet<>(1);
 	static {
 		TOGGLE_TARGET_IDS_ALL.add(TOGGLE_C_TRACEPOINT_TARGET_ID);
 	}
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 f825dd5a1fa..b8bd0ed1830 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
@@ -90,7 +90,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
 	// reset it by using a new debug session.
 	// This map is only needed for remote sessions, since we don't need to specify
 	// the binary location for a local attach session.
-	private Map<String, String> fProcessNameToBinaryMap = new HashMap<String, String>();
+	private Map<String, String> fProcessNameToBinaryMap = new HashMap<>();
 
 	public GdbConnectCommand(DsfSession session, ILaunch launch) {
 		fLaunch = launch;
@@ -408,7 +408,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
 								@Override
 								protected void handleSuccess() {
 
-									final List<IProcessExtendedInfo> procInfoList = new ArrayList<IProcessExtendedInfo>();
+									final List<IProcessExtendedInfo> procInfoList = new ArrayList<>();
 
 									final CountingRequestMonitor countingRm = new CountingRequestMonitor(fExecutor,
 											rm) {
@@ -555,7 +555,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
 
 			// Create a list of all our processes so we can attach to one at a time.
 			// We need to create a new list so that we can remove elements from it.
-			final List<IProcessExtendedInfo> procList = new ArrayList<IProcessExtendedInfo>(Arrays.asList(processes));
+			final List<IProcessExtendedInfo> procList = new ArrayList<>(Arrays.asList(processes));
 			// Create a one element array to remember what process we are trying to attach to, so that we can
 			// use it in case of error.
 			final IProcessExtendedInfo[] previousProcAttempt = new IProcessExtendedInfo[1];
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/NewExecutableInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/NewExecutableInfo.java
index cc5ae917434..d2813555904 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/NewExecutableInfo.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/NewExecutableInfo.java
@@ -35,7 +35,7 @@ public class NewExecutableInfo {
 	final private SessionType fSessionType;
 	private String fHostPath = ""; //$NON-NLS-1$
 
-	private Map<String, Object> fAttributes = new HashMap<String, Object>();
+	private Map<String, Object> fAttributes = new HashMap<>();
 
 	public NewExecutableInfo(SessionType sessionType) {
 		super();
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java
index 965e4f943d7..c526ae5a189 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java
@@ -316,7 +316,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 				@SuppressWarnings("unchecked")
 				List<String> values = configuration.getAttribute(
 						IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST);
-				ArrayList<Path> paths = new ArrayList<Path>(values.size());
+				ArrayList<Path> paths = new ArrayList<>(values.size());
 				Iterator<String> it = values.iterator();
 				while (it.hasNext()) {
 					paths.add(new Path(it.next()));
@@ -337,7 +337,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 		List<String> autoSolibs = configuration
 				.getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB_LIST, Collections.EMPTY_LIST);
 
-		List<File> list = new ArrayList<File>(autoSolibs.size());
+		List<File> list = new ArrayList<>(autoSolibs.size());
 		Iterator<String> it = autoSolibs.iterator();
 		while (it.hasNext()) {
 			list.add(new File(it.next()));
@@ -363,14 +363,14 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 			@SuppressWarnings("unchecked")
 			List<IPath> elements = fDirList.getElements();
 
-			ArrayList<String> values = new ArrayList<String>(elements.size());
+			ArrayList<String> values = new ArrayList<>(elements.size());
 			Iterator<IPath> it = elements.iterator();
 			while (it.hasNext()) {
 				values.add((it.next()).toOSString());
 			}
 			configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, values);
 		}
-		ArrayList<String> autoLibs = new ArrayList<String>(fAutoSolibs.length);
+		ArrayList<String> autoLibs = new ArrayList<>(fAutoSolibs.length);
 		for (int i = 0; i < fAutoSolibs.length; ++i)
 			autoLibs.add(fAutoSolibs[i].getPath());
 		configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB_LIST, autoLibs);
@@ -467,7 +467,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 		@SuppressWarnings("unchecked")
 		List<IPath> dirList = fDirList.getSelectedElements();
 
-		final HashSet<IPath> libs = new HashSet<IPath>(10);
+		final HashSet<IPath> libs = new HashSet<>(10);
 		if (generateLibraryList(dirList.toArray(new IPath[dirList.size()]), libs)) {
 			ITreeContentProvider cp = new ITreeContentProvider() {
 				@Override
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 1849e4c3ba6..e180d301939 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
@@ -147,7 +147,7 @@ public class AttachProcessHandler extends AbstractHandler implements IHandler {
 
 			// Use a set of process. It is possible to have multiple entries
 			// with the same pid, e.g. threads with same process id
-			Set<String> process_ids = new LinkedHashSet<String>();
+			Set<String> process_ids = new LinkedHashSet<>();
 			for (Object sel : ((IStructuredSelection) selection).toList()) {
 				IResourcesInformation ri = (IResourcesInformation) sel;
 				if (pidColumn >= 0) {
@@ -163,7 +163,7 @@ public class AttachProcessHandler extends AbstractHandler implements IHandler {
 			}
 
 			final ICommandControlDMContext context = ((OSResourcesView) part).getSessionContext();
-			final List<Sequence.Step> attach_steps = new ArrayList<Sequence.Step>(process_ids.size());
+			final List<Sequence.Step> attach_steps = new ArrayList<>(process_ids.size());
 			for (final String p : process_ids) {
 				attach_steps.add(new Sequence.Step() {
 					@Override
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/ColumnLayout.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/ColumnLayout.java
index 097c760b3ac..b2b1dd24977 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/ColumnLayout.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/ColumnLayout.java
@@ -25,8 +25,8 @@ import org.eclipse.jface.dialogs.IDialogSettings;
  */
 class ColumnLayout {
 	private String fResourceClass;
-	private Map<String, Boolean> fVisible = new HashMap<String, Boolean>();
-	private Map<String, Integer> fWidth = new HashMap<String, Integer>();
+	private Map<String, Boolean> fVisible = new HashMap<>();
+	private Map<String, Integer> fWidth = new HashMap<>();
 	private Integer fSortColumn = null;
 	private Integer fSortDirection = null;
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSData.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSData.java
index 4ab8142f4b6..84c6cd78904 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSData.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSData.java
@@ -38,7 +38,7 @@ class OSData extends LabelProvider implements ITableLabelProvider, IStructuredCo
 		this.data = data;
 		determineColumnTypes();
 
-		remap = new ArrayList<Integer>(data.getColumnNames().length);
+		remap = new ArrayList<>(data.getColumnNames().length);
 		for (int i = 0; i < data.getColumnNames().length; ++i)
 			remap.add(i);
 
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 a6d7a98415c..622a992a63e 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
@@ -91,7 +91,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded
 	// The data model for the selected session, or null if no session is
 	// selected.
 	private SessionOSData fSessionData;
-	private Map<String, SessionOSData> fSessionDataCache = new HashMap<String, SessionOSData>();
+	private Map<String, SessionOSData> fSessionDataCache = new HashMap<>();
 	// The data presently shown by table viewer.
 	private OSData fTableShownData = null;
 	// The data which was used to populate column selector menu
@@ -112,7 +112,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded
 	private Action fRefreshAction;
 
 	// Map from resource class name to table column layout.
-	private Map<String, ColumnLayout> fColumnLayouts = new HashMap<String, ColumnLayout>();
+	private Map<String, ColumnLayout> fColumnLayouts = new HashMap<>();
 
 	private ColumnLayout fColumnLayout = null;
 
@@ -553,7 +553,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded
 		fViewer.getTable().setEnabled(true);
 
 		if (fViewer.getContentProvider() == null) {
-			ContentLabelProviderWrapper<OSData> wrapper = new ContentLabelProviderWrapper<OSData>(data);
+			ContentLabelProviderWrapper<OSData> wrapper = new ContentLabelProviderWrapper<>(data);
 			fViewer.setContentProvider(wrapper);
 			fViewer.setLabelProvider(wrapper);
 		} else {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java
index fcb235617c0..7227c39c6a6 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/SessionOSData.java
@@ -55,8 +55,8 @@ public class SessionOSData {
 	private ICommandControlDMContext fContext;
 
 	private IResourceClass[] fResourceClasses = new IResourceClass[0];
-	private Map<String, OSData> fExistingData = new HashMap<String, OSData>();
-	private Map<String, Date> fTimestamp = new HashMap<String, Date>();
+	private Map<String, OSData> fExistingData = new HashMap<>();
+	private Map<String, Date> fTimestamp = new HashMap<>();
 
 	private Listener fUIListener;
 	private Control fUIControl;
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java
index 6298aac88fd..1c7e36d23a1 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java
@@ -228,7 +228,7 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements
 		AdvancedTimeoutSettingsDialog(Shell parentShell, Set<Map.Entry<String, Integer>> entries) {
 			super(parentShell);
 			setShellStyle(getShellStyle() | SWT.RESIZE);
-			fEntries = new LinkedList<CommandTimeoutEntry>();
+			fEntries = new LinkedList<>();
 			for (Map.Entry<String, Integer> entry : entries) {
 				fEntries.add(new CommandTimeoutEntry(entry.getKey(), entry.getValue()));
 			}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointActionDialog.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointActionDialog.java
index 09ec33f5b62..22e1510d2f2 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointActionDialog.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointActionDialog.java
@@ -157,7 +157,7 @@ public class TracepointActionDialog extends Dialog {
 		});
 		combo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 
-		tracepointActions = new Vector<ITracepointAction>(TRACEPOINT_ACTIONS_COUNT);
+		tracepointActions = new Vector<>(TRACEPOINT_ACTIONS_COUNT);
 		tracepointActions.add(new CollectAction());
 		tracepointActions.add(new EvaluateAction());
 		// Sub actions of whileStepping cannot be whileStepping
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/AbstractImageRegistry.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/AbstractImageRegistry.java
index 2b506899f72..599e0e20d87 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/AbstractImageRegistry.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/AbstractImageRegistry.java
@@ -35,8 +35,8 @@ import org.osgi.framework.Bundle;
  * @since 2.1
  */
 public abstract class AbstractImageRegistry extends ImageRegistry {
-	private HashMap<String, String> fPlugins = new HashMap<String, String>();
-	private HashMap<String, String[]> fLocations = new HashMap<String, String[]>();
+	private HashMap<String, String> fPlugins = new HashMap<>();
+	private HashMap<String, String[]> fLocations = new HashMap<>();
 	private URL fBaseUrl;
 
 	protected AbstractImageRegistry(Plugin plugin) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TracepointImageRegistry.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TracepointImageRegistry.java
index e90abca9111..a9d5dbc255e 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TracepointImageRegistry.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TracepointImageRegistry.java
@@ -26,7 +26,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
  *  @since 2.1
  */
 public class TracepointImageRegistry extends AbstractImageRegistry {
-	private static List<Object[]> fStore = new ArrayList<Object[]>();
+	private static List<Object[]> fStore = new ArrayList<>();
 
 	private static String add(String plugin, String[] dirs, String name) {
 		String key = plugin + '/' + dirs[0] + '/' + name;
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 1fe6d290a0f..31b2871d205 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
@@ -294,7 +294,7 @@ public class GdbVariableVMNode extends VariableVMNode {
 	/**
 	 * Maps expressions to their current limit on the maximum number of children.
 	 */
-	private Map<IExpressionDMContext, Integer> childCountLimits = new HashMap<IExpressionDMContext, Integer>();
+	private Map<IExpressionDMContext, Integer> childCountLimits = new HashMap<>();
 
 	/**
 	 * Utility method to create an IStatus object for an internal error
@@ -418,7 +418,7 @@ public class GdbVariableVMNode extends VariableVMNode {
 
 	@Override
 	public void update(IPropertiesUpdate[] updates) {
-		List<IPropertiesUpdate> realExpressions = new ArrayList<IPropertiesUpdate>();
+		List<IPropertiesUpdate> realExpressions = new ArrayList<>();
 
 		for (IPropertiesUpdate update : updates) {
 			if (update.getElement() instanceof IncompleteChildrenVMC) {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/breakpoints/GdbBreakpointVMProvider.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/breakpoints/GdbBreakpointVMProvider.java
index 0994819ade3..f2d31424529 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/breakpoints/GdbBreakpointVMProvider.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/breakpoints/GdbBreakpointVMProvider.java
@@ -122,7 +122,7 @@ public class GdbBreakpointVMProvider extends BreakpointVMProvider {
 				ISelection debugContext = getDebugContext();
 				if (debugContext instanceof IStructuredSelection) {
 					// Use a set to avoid duplicates
-					final Set<IBreakpoint> bps = new HashSet<IBreakpoint>();
+					final Set<IBreakpoint> bps = new HashSet<>();
 
 					int count = 0;
 					final ImmediateCountingRequestMonitor crm = new ImmediateCountingRequestMonitor(rm) {
@@ -167,7 +167,7 @@ public class GdbBreakpointVMProvider extends BreakpointVMProvider {
 			} else {
 				// Original behavior of bp filtering.  Return all bp of type ICBreakpoint
 				IBreakpoint[] allBreakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints();
-				List<IBreakpoint> filteredBPs = new ArrayList<IBreakpoint>(allBreakpoints.length);
+				List<IBreakpoint> filteredBPs = new ArrayList<>(allBreakpoints.length);
 				for (IBreakpoint bp : allBreakpoints) {
 					if (bp instanceof ICBreakpoint && bp.getModelIdentifier().equals(CDebugCorePlugin.PLUGIN_ID)) {
 						filteredBPs.add(bp);
@@ -293,7 +293,7 @@ public class GdbBreakpointVMProvider extends BreakpointVMProvider {
 									}
 
 									if (getData().length > 0) {
-										final Set<IBreakpoint> bps = new HashSet<IBreakpoint>(getData().length);
+										final Set<IBreakpoint> bps = new HashSet<>(getData().length);
 										final CountingRequestMonitor crm = new CountingRequestMonitor(
 												ImmediateExecutor.getInstance(), rm) {
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java
index 5d904de1fb3..cf58fccda4b 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java
@@ -280,7 +280,7 @@ public class ThreadVMNode extends AbstractThreadVMNode implements IElementLabelP
 								return;
 							}
 
-							List<IExecutionDMContext> execDmcsNotRunning = new ArrayList<IExecutionDMContext>();
+							List<IExecutionDMContext> execDmcsNotRunning = new ArrayList<>();
 							for (IExecutionDMContext execDmc : execDmcs) {
 								// Keep suspended or stepping threads
 								if (runControl.isSuspended(execDmc) || runControl.isStepping(execDmc)) {