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, 88 insertions, 88 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/BuildFilesHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/BuildFilesHandler.java
index ba53fcc3349..e160b4d7f54 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/BuildFilesHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/BuildFilesHandler.java
@@ -128,7 +128,7 @@ public class BuildFilesHandler extends AbstractResourceActionHandler {
 	 * across all selected resources.
 	 */
 	private Collection<IProject> getProjectsToBuild(List<IFile> selectedFiles) {
-		Set<IProject> projectsToBuild = new HashSet<IProject>();
+		Set<IProject> projectsToBuild = new HashSet<>();
 		for (IFile file : selectedFiles) {
 			IProject project = file.getProject();
 			if (!projectsToBuild.contains(project)) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/ConvertTargetDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/ConvertTargetDialog.java
index 365cc2a2ff2..55d4e75cf53 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/ConvertTargetDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/commands/ConvertTargetDialog.java
@@ -192,7 +192,7 @@ public class ConvertTargetDialog extends Dialog {
 
 	private Map<String, IConfigurationElement> getConversionElements() {
 		if (conversionElements == null) {
-			conversionElements = new HashMap<String, IConfigurationElement>();
+			conversionElements = new HashMap<>();
 		}
 		return conversionElements;
 	}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
index a7ba26b34e8..c8bde41f4c7 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java
@@ -60,9 +60,9 @@ public class ArtifactTab extends AbstractCBuildPropertyTab {
 		NAME, EXT, PREF
 	}
 
-	private Set<String> set2 = new TreeSet<String>();
-	private Set<String> set3 = new TreeSet<String>();
-	private Set<String> set4 = new TreeSet<String>();
+	private Set<String> set2 = new TreeSet<>();
+	private Set<String> set3 = new TreeSet<>();
+	private Set<String> set4 = new TreeSet<>();
 
 	@Override
 	public void createControls(Composite parent) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java
index 287e7c0cbe7..d20ac18b21c 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java
@@ -99,7 +99,7 @@ import org.eclipse.ui.dialogs.PatternFilter;
  * Option settings page in project properties Build Settings under Tool Settings tab.
  */
 public class BuildOptionSettingsUI extends AbstractToolSettingUI {
-	private Map<String, FieldEditor> fieldsMap = new HashMap<String, FieldEditor>();
+	private Map<String, FieldEditor> fieldsMap = new HashMap<>();
 	private IOptionCategory category;
 	private IHoldsOptions optionHolder;
 	/** Option Holders involved */
@@ -107,7 +107,7 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI {
 	/** The index of the current IHoldsOptions in ohs */
 	private int curr = -1;
 	private Map<String, CustomFieldEditorDescriptor> customFieldEditorDescriptorIndex;
-	private Map<FieldEditor, Composite> fieldEditorsToParentMap = new HashMap<FieldEditor, Composite>();
+	private Map<FieldEditor, Composite> fieldEditorsToParentMap = new HashMap<>();
 	/** True if the user selected "Display tool option tips at a fixed location" in Preferences */
 	private boolean displayFixedTip;
 	/** type of mouse action the displayFixedTip responds to.
@@ -206,7 +206,7 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI {
 			 * which contain the option category and accept the input type
 			 * of this option holder.
 			 */
-			ArrayList<IHoldsOptions> lst = new ArrayList<IHoldsOptions>();
+			ArrayList<IHoldsOptions> lst = new ArrayList<>();
 			if (optionHolder instanceof ITool) {
 				String ext = ((ITool) optionHolder).getDefaultInputExtension();
 				for (int i = 0; i < ris.length; i++) {
@@ -417,7 +417,7 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI {
 							// in the plugin.xml file) in the UI Combobox. This refrains the user from selecting an
 							// invalid value and avoids issuing an error message.
 							String[] enumNames = opt.getApplicableValues();
-							Vector<String> enumValidList = new Vector<String>();
+							Vector<String> enumValidList = new Vector<>();
 							for (int i = 0; i < enumNames.length; ++i) {
 								if (opt.getValueHandler().isEnumValueAppropriate(config, opt.getOptionHolder(), opt,
 										opt.getValueHandlerExtraArgument(), enumNames[i])) {
@@ -564,7 +564,7 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI {
 		if (this.customFieldEditorDescriptorIndex != null)
 			return;
 
-		this.customFieldEditorDescriptorIndex = new HashMap<String, CustomFieldEditorDescriptor>();
+		this.customFieldEditorDescriptorIndex = new HashMap<>();
 
 		IExtensionPoint ep = Platform.getExtensionRegistry()
 				.getExtensionPoint(ManagedBuilderUIPlugin.getUniqueIdentifier() + ".buildDefinitionsUI"); //$NON-NLS-1$
@@ -977,7 +977,7 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI {
 		boolean selectNewEnum = true;
 		boolean selectDefault = false;
 
-		Vector<String> enumValidList = new Vector<String>();
+		Vector<String> enumValidList = new Vector<>();
 		for (int i = 0; i < enumNames.length; ++i) {
 			if (opt.getValueHandler().isEnumValueAppropriate(config, opt.getOptionHolder(), opt,
 					opt.getValueHandlerExtraArgument(), enumNames[i])) {
@@ -1166,14 +1166,14 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI {
 						if (children == null)
 							return null;
 
-						List<ITreeOption> childrenList = new ArrayList<ITreeOption>(Arrays.asList(children));
+						List<ITreeOption> childrenList = new ArrayList<>(Arrays.asList(children));
 
 						// Check if any of the children has empty name
 						List<ITreeOption> toRemove = null;
 						for (ITreeOption child : children) {
 							if (child.getName() == null || child.getName().trim().length() == 0) {
 								if (toRemove == null) {
-									toRemove = new ArrayList<ITreeOption>();
+									toRemove = new ArrayList<>();
 								}
 								toRemove.add(child);
 							}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java
index ee05a1d2319..a5207a2dbe7 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java
@@ -74,10 +74,10 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
 		PRECMD, PREANN, PSTCMD, PSTANN
 	}
 
-	private Set<String> set1 = new TreeSet<String>();
-	private Set<String> set2 = new TreeSet<String>();
-	private Set<String> set3 = new TreeSet<String>();
-	private Set<String> set4 = new TreeSet<String>();
+	private Set<String> set1 = new TreeSet<>();
+	private Set<String> set2 = new TreeSet<>();
+	private Set<String> set3 = new TreeSet<>();
+	private Set<String> set4 = new TreeSet<>();
 
 	private static final String[] rcbsApplicabilityRules = {
 			Messages.ResourceCustomBuildStepBlock_label_applicability_rule_override,
@@ -292,7 +292,7 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab {
 	}
 
 	private ITool[] getRcbsTools(IResourceInfo rcConfig) {
-		List<ITool> list = new ArrayList<ITool>();
+		List<ITool> list = new ArrayList<>();
 		ITool tools[] = rcConfig.getTools();
 
 		for (int i = 0; i < tools.length; i++) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java
index 9d6c882df5f..705d84b9343 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java
@@ -125,8 +125,8 @@ public class BuildToolSettingUI extends AbstractToolSettingUI {
 		super(info);
 		this.fTool = _tool;
 		buildPropPage = page;
-		stringOptionsMap = new HashMap<String, String>();
-		userObjsMap = new HashMap<IOption, String>();
+		stringOptionsMap = new HashMap<>();
+		userObjsMap = new HashMap<>();
 	}
 
 	/* (non-Javadoc)
@@ -188,7 +188,7 @@ public class BuildToolSettingUI extends AbstractToolSettingUI {
 	 */
 	private Vector<String> getDefaultOptionNames() {
 		if (defaultOptionNames == null) {
-			defaultOptionNames = new Vector<String>();
+			defaultOptionNames = new Vector<>();
 			defaultOptionNames.add("Other flags"); //$NON-NLS-1$
 			defaultOptionNames.add("Linker flags"); //$NON-NLS-1$
 			defaultOptionNames.add("Archiver flags"); //$NON-NLS-1$
@@ -215,8 +215,8 @@ public class BuildToolSettingUI extends AbstractToolSettingUI {
 	 * @return Vector containing all options
 	 */
 	private Vector<String> getOptionVector(String rawOptionString) {
-		Vector<String> tokens = new Vector<String>(Arrays.asList(rawOptionString.split("\\s"))); //$NON-NLS-1$
-		Vector<String> output = new Vector<String>(tokens.size());
+		Vector<String> tokens = new Vector<>(Arrays.asList(rawOptionString.split("\\s"))); //$NON-NLS-1$
+		Vector<String> output = new Vector<>(tokens.size());
 
 		Iterator<String> iter = tokens.iterator();
 		while (iter.hasNext()) {
@@ -269,7 +269,7 @@ public class BuildToolSettingUI extends AbstractToolSettingUI {
 		String alloptions = getToolSettingsPrefStore().getString(ToolSettingsPrefStore.ALL_OPTIONS_ID);
 		// list that holds the options for the option type other than
 		// boolean,string and enumerated
-		List<String> optionsList = new ArrayList<String>();
+		List<String> optionsList = new ArrayList<>();
 		// additional options buffer
 		StringBuilder addnOptions = new StringBuilder();
 		// split all build options string
@@ -393,7 +393,7 @@ public class BuildToolSettingUI extends AbstractToolSettingUI {
 		for (int s = 0; s < objSet.size(); s++) {
 			for (IOption op : objSet) {
 				String val = userObjsMap.get(op);
-				ArrayList<String> list = new ArrayList<String>();
+				ArrayList<String> list = new ArrayList<>();
 				for (String v : parseString(val)) {
 					if (alloptions.indexOf(v) != -1)
 						list.add(v);
@@ -414,7 +414,7 @@ public class BuildToolSettingUI extends AbstractToolSettingUI {
 			try {
 				switch (opt.getValueType()) {
 				case IOption.BOOLEAN:
-					ArrayList<String> optsList = new ArrayList<String>(optionsArr);
+					ArrayList<String> optsList = new ArrayList<>(optionsArr);
 					if (opt.getCommand() != null && opt.getCommand().length() > 0
 							&& !optsList.contains(opt.getCommand()))
 						setOption(opt, false);
@@ -436,7 +436,7 @@ public class BuildToolSettingUI extends AbstractToolSettingUI {
 				case IOption.INCLUDE_PATH:
 				case IOption.PREPROCESSOR_SYMBOLS:
 				case IOption.LIBRARIES:
-					ArrayList<String> newList = new ArrayList<String>();
+					ArrayList<String> newList = new ArrayList<>();
 					for (String s : optionsList) {
 						if (opt.getCommand() != null && s.startsWith(opt.getCommand())) {
 							newList.add(s.substring(opt.getCommand().length()));
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java
index 02cfa7795f2..bbed363c19f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java
@@ -102,7 +102,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
 	};
 
 	private boolean fShowSysMacros = false;
-	private Set<String> fIncorrectlyDefinedMacrosNames = new HashSet<String>();
+	private Set<String> fIncorrectlyDefinedMacrosNames = new HashSet<>();
 
 	private TableViewer tv;
 	private Label fStatusLabel;
@@ -545,7 +545,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
 		if (cfgd == null) {
 			chkVars();
 			if (fShowSysMacros) {
-				List<ICdtVariable> lst = new ArrayList<ICdtVariable>(_vars.length);
+				List<ICdtVariable> lst = new ArrayList<>(_vars.length);
 				ICdtVariable[] uvars = prefvars.getMacros();
 				for (int i = 0; i < uvars.length; i++) {
 					lst.add(uvars[i]);
@@ -567,7 +567,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab {
 			}
 		}
 
-		ArrayList<ICdtVariable> list = new ArrayList<ICdtVariable>(_vars.length);
+		ArrayList<ICdtVariable> list = new ArrayList<>(_vars.length);
 		for (int i = 0; i < _vars.length; i++) {
 			if (_vars[i] != null && (fShowSysMacros || isUserVar(_vars[i])))
 				list.add(_vars[i]);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
index 43ae518d2aa..8111f0ed67a 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
@@ -451,7 +451,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
 		Set<String> contextProfiles = null;
 		if (page.isForPrefs()) {
 			// for preference page get all profiles
-			contextProfiles = new TreeSet<String>(profilesList);
+			contextProfiles = new TreeSet<>(profilesList);
 		} else {
 			// property page
 			if (!needPerRcProfile) {
@@ -467,7 +467,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
 
 				if (isMakefileProjectToolChain(toolchain)) {
 					// for generic Makefile project let user choose any profile
-					contextProfiles = new TreeSet<String>(profilesList);
+					contextProfiles = new TreeSet<>(profilesList);
 				} else {
 					contextProfiles = CfgScannerConfigUtil.getAllScannerDiscoveryProfileIds(toolchain);
 				}
@@ -486,7 +486,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
 			}
 		}
 
-		visibleProfilesList = new ArrayList<String>(contextProfiles);
+		visibleProfilesList = new ArrayList<>(contextProfiles);
 
 		realPages = new AbstractDiscoveryPage[visibleProfilesList.size()];
 		String[] labels = new String[visibleProfilesList.size()];
@@ -596,7 +596,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
 	private void initializeProfilePageMap() {
 		GCCPerProjectSCDProfilePage.isSIConsoleEnabled = DefaultRunSIProvider.isConsoleEnabled();
 
-		pagesList = new ArrayList<DiscoveryProfilePageConfiguration>(5);
+		pagesList = new ArrayList<>(5);
 		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(NAMESPACE, POINT);
 		if (point == null)
 			return;
@@ -707,11 +707,11 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
 
 	private List<CfgInfoContext> checkChanges() {
 		if (cbi == null || baseInfoMap == null)
-			return new ArrayList<CfgInfoContext>(0);
+			return new ArrayList<>(0);
 
 		Map<CfgInfoContext, IScannerConfigBuilderInfo2> cfgInfoMap = cbi.getInfoMap();
-		HashMap<InfoContext, Object> baseCopy = new HashMap<InfoContext, Object>(baseInfoMap);
-		List<CfgInfoContext> list = new ArrayList<CfgInfoContext>();
+		HashMap<InfoContext, Object> baseCopy = new HashMap<>(baseInfoMap);
+		List<CfgInfoContext> list = new ArrayList<>();
 		for (Map.Entry<CfgInfoContext, IScannerConfigBuilderInfo2> entry : cfgInfoMap.entrySet()) {
 			CfgInfoContext cic = entry.getKey();
 			InfoContext c = cic.toInfoContext();
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/FileListControlFieldEditor.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/FileListControlFieldEditor.java
index a1a6e3fad4c..93dee751692 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/FileListControlFieldEditor.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/FileListControlFieldEditor.java
@@ -300,7 +300,7 @@ public class FileListControlFieldEditor extends FieldEditor {
 	 */
 	private String[] parseString(String stringList) {
 		StringTokenizer tokenizer = new StringTokenizer(stringList, DEFAULT_SEPARATOR);
-		ArrayList<String> list = new ArrayList<String>();
+		ArrayList<String> list = new ArrayList<>();
 		while (tokenizer.hasMoreElements()) {
 			list.add((String) tokenizer.nextElement());
 		}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
index bc9cbb8bbdd..58cd9655777 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
@@ -437,7 +437,7 @@ public class NewCfgDialog implements INewCfgDialog {
 		des = prj;
 		ICConfigurationDescription[] descs = des.getConfigurations();
 		cfgds = new IConfiguration[descs.length];
-		ArrayList<IConfiguration> lst = new ArrayList<IConfiguration>();
+		ArrayList<IConfiguration> lst = new ArrayList<>();
 		for (int i = 0; i < descs.length; ++i) {
 			cfgds[i] = ManagedBuildManager.getConfigurationForDescription(descs[i]);
 			IConfiguration cfg = cfgds[i];
@@ -620,7 +620,7 @@ public class NewCfgDialog implements INewCfgDialog {
 	}
 
 	private String[] getImportItems() {
-		imported = new HashMap<String, IConfiguration>();
+		imported = new HashMap<>();
 		if (des != null) {
 			IProject[] ps = des.getProject().getWorkspace().getRoot().getProjects();
 			for (IProject p : ps) {
@@ -637,14 +637,14 @@ public class NewCfgDialog implements INewCfgDialog {
 				}
 			}
 		}
-		ArrayList<String> lst = new ArrayList<String>(imported.keySet());
+		ArrayList<String> lst = new ArrayList<>(imported.keySet());
 		Collections.sort(lst);
 		lst.add(0, NOT);
 		return lst.toArray(new String[lst.size()]);
 	}
 
 	private String[] getImportDefItems() {
-		importedDef = new HashMap<String, IConfiguration>();
+		importedDef = new HashMap<>();
 		IBuildPropertyManager bpm = ManagedBuildManager.getBuildPropertyManager();
 		IBuildPropertyType bpt = bpm.getPropertyType(ART);
 		for (IBuildPropertyValue v : bpt.getSupportedValues()) {
@@ -664,7 +664,7 @@ public class NewCfgDialog implements INewCfgDialog {
 				}
 			}
 		}
-		ArrayList<String> lst = new ArrayList<String>(importedDef.keySet());
+		ArrayList<String> lst = new ArrayList<>(importedDef.keySet());
 		Collections.sort(lst);
 		lst.add(0, NOT);
 		return lst.toArray(new String[lst.size()]);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/RefreshPolicyExceptionDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/RefreshPolicyExceptionDialog.java
index e0978e86e2f..8c476c373d5 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/RefreshPolicyExceptionDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/RefreshPolicyExceptionDialog.java
@@ -65,7 +65,7 @@ public class RefreshPolicyExceptionDialog extends Dialog {
 		setShellStyle(getShellStyle());
 		fContrManager = RefreshExclusionContributionManager.getInstance();
 		fAddException = addException;
-		fExclusionContributors = new LinkedList<RefreshExclusionContributor>(fContrManager.getContributors());
+		fExclusionContributors = new LinkedList<>(fContrManager.getContributors());
 	}
 
 	public RefreshPolicyExceptionDialog(Shell parent, IResource resource, java.util.List<RefreshExclusion> exclusions,
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/RefreshPolicyTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/RefreshPolicyTab.java
index fd67c76e001..a051a26300c 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/RefreshPolicyTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/RefreshPolicyTab.java
@@ -96,7 +96,7 @@ public class RefreshPolicyTab extends AbstractCBuildPropertyTab {
 		HashMap<IResource, List<RefreshExclusion>> resourceMap = fConfigurationToResourcesToExclusionsMap
 				.get(configName);
 		if (resourceMap == null) {
-			resourceMap = new HashMap<IResource, List<RefreshExclusion>>();
+			resourceMap = new HashMap<>();
 			resourceMap.put(fProject, new ArrayList<RefreshExclusion>());
 			fConfigurationToResourcesToExclusionsMap.put(configName, resourceMap);
 		}
@@ -111,7 +111,7 @@ public class RefreshPolicyTab extends AbstractCBuildPropertyTab {
 	private HashMap<String, HashMap<IResource, List<RefreshExclusion>>> copyHashMap(
 			HashMap<String, HashMap<IResource, List<RefreshExclusion>>> source) {
 
-		HashMap<String, HashMap<IResource, List<RefreshExclusion>>> target = new HashMap<String, HashMap<IResource, List<RefreshExclusion>>>();
+		HashMap<String, HashMap<IResource, List<RefreshExclusion>>> target = new HashMap<>();
 
 		if (source.isEmpty())
 			return target;
@@ -122,13 +122,13 @@ public class RefreshPolicyTab extends AbstractCBuildPropertyTab {
 			String configName = config_iterator.next();
 
 			HashMap<IResource, List<RefreshExclusion>> source_resourceMap = source.get(configName);
-			HashMap<IResource, List<RefreshExclusion>> target_resourceMap = new HashMap<IResource, List<RefreshExclusion>>();
+			HashMap<IResource, List<RefreshExclusion>> target_resourceMap = new HashMap<>();
 
 			Iterator<IResource> resource_iterator = source_resourceMap.keySet().iterator();
 			while (resource_iterator.hasNext()) {
 				IResource source_resource = resource_iterator.next();
 				List<RefreshExclusion> source_exclusions = source_resourceMap.get(source_resource);
-				List<RefreshExclusion> target_exclusions = new LinkedList<RefreshExclusion>();
+				List<RefreshExclusion> target_exclusions = new LinkedList<>();
 				for (RefreshExclusion exclusion : source_exclusions) {
 					// ADD each exclusion to the target exclusion list.
 					RefreshExclusion target_exclusion = (RefreshExclusion) exclusion.clone();
@@ -157,7 +157,7 @@ public class RefreshPolicyTab extends AbstractCBuildPropertyTab {
 		HashMap<IResource, List<RefreshExclusion>> resourceMap = getResourcesToExclusionsMap(configName);
 		List<RefreshExclusion> exclusions = resourceMap.get(resource);
 		if (exclusions == null) {
-			exclusions = new LinkedList<RefreshExclusion>();
+			exclusions = new LinkedList<>();
 			resourceMap.put(resource, exclusions);
 
 		}
@@ -181,7 +181,7 @@ public class RefreshPolicyTab extends AbstractCBuildPropertyTab {
 		_Exception_Node exceptions_node = null;
 
 		// if this is a refresh exclusion, exclusion_instances is a list of exclusion instances associated with this exclusion
-		List<_Exclusion_Instance> exclusion_instances = new ArrayList<_Exclusion_Instance>();
+		List<_Exclusion_Instance> exclusion_instances = new ArrayList<>();
 
 		_Entry(IResource _ent) {
 			resourceToRefresh = _ent;
@@ -214,7 +214,7 @@ public class RefreshPolicyTab extends AbstractCBuildPropertyTab {
 
 		public Object[] getChildren() {
 			if (isExclusion()) {
-				List<Object> children = new ArrayList<Object>(exclusion_instances);
+				List<Object> children = new ArrayList<>(exclusion_instances);
 				if (exceptions_node != null)
 					children.add(exceptions_node);
 				return children.toArray();
@@ -278,7 +278,7 @@ public class RefreshPolicyTab extends AbstractCBuildPropertyTab {
 		_Entry parent; //can be IResource or RefreshExclusion - must not be null
 
 		//list of refresh exclusions under this Exceptions node
-		List<_Entry> exceptions = new ArrayList<_Entry>();
+		List<_Entry> exceptions = new ArrayList<>();
 
 		_Exception_Node(_Entry ent) {
 			parent = ent;
@@ -307,7 +307,7 @@ public class RefreshPolicyTab extends AbstractCBuildPropertyTab {
 			} else {
 				List<RefreshExclusion> exclusions = getExclusions(getConfigName(), parent.resourceToRefresh);
 				if (exclusions == null) {
-					exclusions = new LinkedList<RefreshExclusion>();
+					exclusions = new LinkedList<>();
 					getResourcesToExclusionsMap(getConfigName()).put(parent.resourceToRefresh, exclusions);
 
 				}
@@ -377,7 +377,7 @@ public class RefreshPolicyTab extends AbstractCBuildPropertyTab {
 		Group g1 = setupGroup(usercomp, Messages.RefreshPolicyTab_resourcesGroupLabel, 2,
 				GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
 
-		fSrc = new ArrayList<_Entry>();
+		fSrc = new ArrayList<>();
 		generateTreeContent();
 
 		fTree = new TreeViewer(g1);
@@ -561,7 +561,7 @@ public class RefreshPolicyTab extends AbstractCBuildPropertyTab {
 		 */
 		@Override
 		public Object[] getChildren(Object element) {
-			ArrayList<Object> filteredChildren = new ArrayList<Object>(Arrays.asList(super.getChildren(element)));
+			ArrayList<Object> filteredChildren = new ArrayList<>(Arrays.asList(super.getChildren(element)));
 			Iterator<IResource> iterator = getResourcesToExclusionsMap(getConfigName()).keySet().iterator();
 
 			while (iterator.hasNext()) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
index 9a65bf02fd7..b1b3383c375 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
@@ -275,7 +275,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 
 		c_toolchain.removeAll();
 		boolean isMng = cfg.getBuilder().isManagedBuildOn();
-		ArrayList<IToolChain> list = new ArrayList<IToolChain>();
+		ArrayList<IToolChain> list = new ArrayList<>();
 
 		IToolChain[] tcs = r_tcs;
 		if (b_dispCompatible.getSelection() && (ri instanceof IFolderInfo)) {
@@ -318,7 +318,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 			realBuilder = cfg.getBuilder();
 		int pos = -1;
 		c_builder.removeAll();
-		ArrayList<IBuilder> list = new ArrayList<IBuilder>();
+		ArrayList<IBuilder> list = new ArrayList<>();
 
 		IBuilder[] bs = r_bs;
 
@@ -443,7 +443,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 
 	private boolean updateCompatibleTools(ITool real) {
 		boolean result = false;
-		ArrayList<ITool> list = new ArrayList<ITool>();
+		ArrayList<ITool> list = new ArrayList<>();
 		IFileInfoModification fim = (IFileInfoModification) mod;
 
 		if (real != null) { // Current tool exists
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListContentProvider.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListContentProvider.java
index 22d83d9346a..2cbd8a41fd4 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListContentProvider.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListContentProvider.java
@@ -57,7 +57,7 @@ public class ToolListContentProvider implements ITreeContentProvider {
 	private ToolListElement[] createElements(IConfiguration config) {
 		IOptionCategory toolChainCategories[];
 		ITool filteredTools[];
-		List<ToolListElement> elementList = new ArrayList<ToolListElement>();
+		List<ToolListElement> elementList = new ArrayList<>();
 		if (config != null) {
 			// Get the the option categories of the toolChain
 			IToolChain toolChain = config.getToolChain();
@@ -88,7 +88,7 @@ public class ToolListContentProvider implements ITreeContentProvider {
 	}
 
 	private ToolListElement[] createElements(IResourceInfo info) {
-		List<ToolListElement> elementList = new ArrayList<ToolListElement>();
+		List<ToolListElement> elementList = new ArrayList<>();
 		if (info != null) {
 			ITool[] tools = null;
 			if (info instanceof IFolderInfo) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListElement.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListElement.java
index a7a7fa551e2..53c55dd8e3f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListElement.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolListElement.java
@@ -126,7 +126,7 @@ public class ToolListElement {
 
 	public void addChildElement(ToolListElement element) {
 		if (childElements == null)
-			childElements = new ArrayList<ToolListElement>();
+			childElements = new ArrayList<>();
 		childElements.add(element);
 	}
 }
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
index 146f1bed0a4..3aeae29f9f1 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
@@ -98,10 +98,10 @@ public class ToolSelectionDialog extends Dialog {
 		gd.heightHint = 300;
 		composite.setLayoutData(gd);
 
-		added = new ArrayList<ITool>();
-		removed = new ArrayList<ITool>();
-		left = new ArrayList<ITool>();
-		right = new ArrayList<ITool>();
+		added = new ArrayList<>();
+		removed = new ArrayList<>();
+		left = new ArrayList<>();
+		right = new ArrayList<>();
 
 		Composite c1 = new Composite(composite, SWT.NONE);
 		c1.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -476,7 +476,7 @@ public class ToolSelectionDialog extends Dialog {
 			if ((c & IModificationStatus.TOOLS_CONFLICT) != 0) {
 				s = s + Messages.ToolSelectionDialog_7;
 				ITool[][] tools = st.getToolsConflicts();
-				List<String> conflictTools = new ArrayList<String>();
+				List<String> conflictTools = new ArrayList<>();
 				for (int k = 0; k < t2.getItemCount(); k++) {
 					TableItem ti = t2.getItem(k);
 					ITool t = (ITool) ti.getData();
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
index e213cfa6f8b..671185fbf1e 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
@@ -108,7 +108,7 @@ public class ToolSettingsTab extends AbstractCBuildPropertyTab implements IPrefe
 		super.createControls(par);
 		usercomp.setLayout(new GridLayout());
 
-		configToPageListMap = new HashMap<String, List<AbstractToolSettingUI>>();
+		configToPageListMap = new HashMap<>();
 		settingsStore = ToolSettingsPrefStore.getDefault();
 
 		// Create the sash form
@@ -674,7 +674,7 @@ public class ToolSettingsTab extends AbstractCBuildPropertyTab implements IPrefe
 			return null;
 		List<AbstractToolSettingUI> pages = configToPageListMap.get(getCfg().getId());
 		if (pages == null) {
-			pages = new ArrayList<AbstractToolSettingUI>();
+			pages = new ArrayList<>();
 			configToPageListMap.put(getCfg().getId(), pages);
 		}
 		return pages;
@@ -839,8 +839,8 @@ public class ToolSettingsTab extends AbstractCBuildPropertyTab implements IPrefe
 	 * @return the one-for-one correspondence of tools, in order of <tt>t2</tt>
 	 */
 	private Map<ITool, ITool> getToolCorrespondence(ITool[] t1, ITool[] t2) {
-		Map<ITool, ITool> result = new java.util.LinkedHashMap<ITool, ITool>();
-		Map<ITool, List<ITool>> realT1Tools = new java.util.LinkedHashMap<ITool, List<ITool>>();
+		Map<ITool, ITool> result = new java.util.LinkedHashMap<>();
+		Map<ITool, List<ITool>> realT1Tools = new java.util.LinkedHashMap<>();
 
 		for (ITool next : t1) {
 			ITool real = ManagedBuildManager.getRealTool(next);
@@ -851,7 +851,7 @@ public class ToolSettingsTab extends AbstractCBuildPropertyTab implements IPrefe
 			} else {
 				if (list.size() == 1) {
 					// make the list mutable
-					list = new java.util.ArrayList<ITool>(list);
+					list = new java.util.ArrayList<>(list);
 					realT1Tools.put(real, list);
 				}
 				list.add(next);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java
index b092ff8ac2f..2501f5dd0da 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java
@@ -93,7 +93,7 @@ public class CDTConfigWizardPage extends WizardPage {
 		if (getDefault || table == null || !isVisited())
 			its = getDefaultCfgs(handler);
 		else {
-			ArrayList<CfgHolder> out = new ArrayList<CfgHolder>(table.getItemCount());
+			ArrayList<CfgHolder> out = new ArrayList<>(table.getItemCount());
 			for (TableItem ti : table.getItems()) {
 				if (ti.getChecked())
 					out.add((CfgHolder) ti.getData());
@@ -217,7 +217,7 @@ public class CDTConfigWizardPage extends WizardPage {
 	static public CfgHolder[] getDefaultCfgs(MBSWizardHandler handler) {
 		String id = handler.getPropertyId();
 		IProjectType pt = handler.getProjectType();
-		ArrayList<CfgHolder> out = new ArrayList<CfgHolder>();
+		ArrayList<CfgHolder> out = new ArrayList<>();
 		for (IToolChain tc : handler.getSelectedToolChains()) {
 			CfgHolder[] cfgs = null;
 			if (id != null)
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java
index 3ef5ddb84b8..541f4fe0e9e 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java
@@ -176,7 +176,7 @@ public class CfgHolder {
 	 */
 
 	public static CfgHolder[] reorder(CfgHolder[] its) {
-		ArrayList<CfgHolder> ls = new ArrayList<CfgHolder>(its.length);
+		ArrayList<CfgHolder> ls = new ArrayList<>(its.length);
 		boolean found = true;
 		while (found) {
 			found = false;
@@ -210,7 +210,7 @@ public class CfgHolder {
 	 * Note that null configurations are ignored !
 	 */
 	public static IConfiguration[] items2cfgs(CfgHolder[] its) {
-		ArrayList<IConfiguration> lst = new ArrayList<IConfiguration>(its.length);
+		ArrayList<IConfiguration> lst = new ArrayList<>(its.length);
 		for (CfgHolder h : its)
 			if (h.cfg != null)
 				lst.add(h.cfg);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
index a30db77225a..066ba6fba3e 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
@@ -94,7 +94,7 @@ public class MBSWizardHandler extends CWizardHandler {
 	private static final String tooltip = Messages.CWizardHandler_1 + Messages.CWizardHandler_2
 			+ Messages.CWizardHandler_3 + Messages.CWizardHandler_4 + Messages.CWizardHandler_5;
 
-	protected SortedMap<String, IToolChain> full_tcs = new TreeMap<String, IToolChain>();
+	protected SortedMap<String, IToolChain> full_tcs = new TreeMap<>();
 	private String propertyId = null;
 	private IProjectType pt = null;
 	protected IWizardItemsListListener listener;
@@ -110,7 +110,7 @@ public class MBSWizardHandler extends CWizardHandler {
 	/**
 	 * Current list of preferred toolchains
 	 */
-	private List<String> preferredTCs = new ArrayList<String>();
+	private List<String> preferredTCs = new ArrayList<>();
 
 	protected static final class EntryInfo {
 		private SortedMap<String, IToolChain> tcs;
@@ -172,7 +172,7 @@ public class MBSWizardHandler extends CWizardHandler {
 						ICDTCommonProjectWizard wz = (ICDTCommonProjectWizard) wizard;
 						String[] langIDs = wz.getLanguageIDs();
 						if (langIDs.length > 0) {
-							List<Template> lstTemplates = new ArrayList<Template>();
+							List<Template> lstTemplates = new ArrayList<>();
 							for (String id : langIDs) {
 								lstTemplates.addAll(Arrays
 										.asList(TemplateEngineUI.getDefault().getTemplates(projectTypeId, null, id)));
@@ -263,7 +263,7 @@ public class MBSWizardHandler extends CWizardHandler {
 			Set<String> full = tcs.keySet();
 			if (entryDescriptor == null)
 				return full;
-			Set<String> out = new LinkedHashSet<String>(full.size());
+			Set<String> out = new LinkedHashSet<>(full.size());
 			for (String s : full)
 				if (isToolChainAcceptable(s))
 					out.add(s);
@@ -280,7 +280,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		 */
 		public SortedMap<String, IToolChain> getToolChains() {
 			Set<String> toolChainNames = this.tc_filter();
-			SortedMap<String, IToolChain> toolChainMap = new TreeMap<String, IToolChain>();
+			SortedMap<String, IToolChain> toolChainMap = new TreeMap<>();
 
 			for (String toolChainName : toolChainNames) {
 				IToolChain tc = tcs.get(toolChainName);
@@ -386,7 +386,7 @@ public class MBSWizardHandler extends CWizardHandler {
 
 	public Map<String, String> getMainPageData() {
 		WizardNewProjectCreationPage page = (WizardNewProjectCreationPage) getNewProjectCreationPage();
-		Map<String, String> data = new HashMap<String, String>();
+		Map<String, String> data = new HashMap<>();
 		String projName = page.getProjectName();
 		projName = projName != null ? projName.trim() : EMPTY_STR;
 		data.put("projectName", projName); //$NON-NLS-1$
@@ -506,7 +506,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		else if (natures.length == 1)
 			MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.NATURE, natures[0]);
 		else {
-			TreeSet<String> x = new TreeSet<String>();
+			TreeSet<String> x = new TreeSet<>();
 			for (String nature : natures)
 				x.add(nature);
 			MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.NATURE, x);
@@ -519,8 +519,8 @@ public class MBSWizardHandler extends CWizardHandler {
 					getProjectType().getId());
 
 		IToolChain[] tcs = getSelectedToolChains();
-		ArrayList<IToolChain> x = new ArrayList<IToolChain>();
-		TreeSet<String> y = new TreeSet<String>();
+		ArrayList<IToolChain> x = new ArrayList<>();
+		TreeSet<String> y = new TreeSet<>();
 		if (tcs != null) {
 			int n = tcs.length;
 			for (int i = 0; i < n; i++) {
@@ -655,7 +655,7 @@ public class MBSWizardHandler extends CWizardHandler {
 		if (template == null)
 			return;
 
-		List<IConfiguration> configs = new ArrayList<IConfiguration>();
+		List<IConfiguration> configs = new ArrayList<>();
 		for (CfgHolder cfg : cfgs) {
 			configs.add(cfg.getConfiguration());
 		}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
index d64279b5eae..bdbe320fda4 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
@@ -54,7 +54,7 @@ public class ManagedBuildWizard extends AbstractCWizard {
 		IBuildPropertyValue[] vs = bpt.getSupportedValues();
 		Arrays.sort(vs, BuildListComparator.getInstance());
 
-		ArrayList<EntryDescriptor> items = new ArrayList<EntryDescriptor>();
+		ArrayList<EntryDescriptor> items = new ArrayList<>();
 		// new style project types
 		for (int i = 0; i < vs.length; i++) {
 			IToolChain[] tcs = ManagedBuildManager.getExtensionsToolChains(MBSWizardHandler.ARTIFACT, vs[i].getId(),
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java
index 6f9db2d2e2e..d7d30430e3e 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java
@@ -61,7 +61,7 @@ public class NewMakeProjFromExistingPage extends WizardPage {
 	Button langcpp;
 	IWorkspaceRoot root;
 	List tcList;
-	Map<String, IToolChain> tcMap = new HashMap<String, IToolChain>();
+	Map<String, IToolChain> tcMap = new HashMap<>();
 
 	/**
 	 * True if the user entered a non-empty string in the project name field. In that state, we avoid
@@ -292,7 +292,7 @@ public class NewMakeProjFromExistingPage extends WizardPage {
 	 */
 	private void updateTcWidget(boolean supportedOnly) {
 		updateTcMap(supportedOnly);
-		ArrayList<String> names = new ArrayList<String>(tcMap.keySet());
+		ArrayList<String> names = new ArrayList<>(tcMap.keySet());
 		Collections.sort(names);
 
 		tcList.removeAll();