diff options
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse')
20 files changed, 80 insertions, 80 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953.java index 10ae1420883..d032b63ecdd 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953.java @@ -38,7 +38,7 @@ public class Bug_303953 extends AbstractBuilderTest { setWorkspace("regressions"); final IProject app = loadProject("helloworldC"); - List<IResource> buildOutputResources = new ArrayList<IResource>(); + List<IResource> buildOutputResources = new ArrayList<>(); buildOutputResources.addAll(getProjectBuildExeResources("helloworldC", "Debug", "src/helloworldC")); // Ensure Debug is the active configuration diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildDescriptionModelTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildDescriptionModelTests.java index 477fe72da38..5cd67e38e39 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildDescriptionModelTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildDescriptionModelTests.java @@ -75,7 +75,7 @@ public class BuildDescriptionModelTests extends TestCase { private Runnable fCleaner = fCompositeCleaner; private class CompositeCleaner implements Runnable { - private List<Runnable> fRunnables = new ArrayList<Runnable>(); + private List<Runnable> fRunnables = new ArrayList<>(); public void addRunnable(Runnable r) { fRunnables.add(r); @@ -93,7 +93,7 @@ public class BuildDescriptionModelTests extends TestCase { } private class ProjectCleaner implements Runnable { - List<String> fProjList = new ArrayList<String>(); + List<String> fProjList = new ArrayList<>(); public ProjectCleaner(IProject project) { addProject(project); @@ -576,8 +576,8 @@ public class BuildDescriptionModelTests extends TestCase { } */ private void doTestStep(IBuildStep step, IBuildStep oStep, boolean up) { - Map<IBuildIOType, IBuildIOType> inMap = new HashMap<IBuildIOType, IBuildIOType>(); - Map<IBuildIOType, IBuildIOType> outMap = new HashMap<IBuildIOType, IBuildIOType>(); + Map<IBuildIOType, IBuildIOType> inMap = new HashMap<>(); + Map<IBuildIOType, IBuildIOType> outMap = new HashMap<>(); stepsMatch(step, oStep, inMap, outMap, true); @@ -589,7 +589,7 @@ public class BuildDescriptionModelTests extends TestCase { } private void doTestType(IBuildIOType type, IBuildIOType oType) { - Map<IBuildResource, IBuildResource> map = new HashMap<IBuildResource, IBuildResource>(); + Map<IBuildResource, IBuildResource> map = new HashMap<>(); typesMatch(type, oType, map, true); @@ -599,7 +599,7 @@ public class BuildDescriptionModelTests extends TestCase { } private void doTestResource(IBuildResource rc, IBuildResource oRc, boolean up) { - Map<IBuildIOType, IBuildIOType> outMap = new HashMap<IBuildIOType, IBuildIOType>(); + Map<IBuildIOType, IBuildIOType> outMap = new HashMap<>(); doTestResourceMatch(rc, oRc, outMap); @@ -607,7 +607,7 @@ public class BuildDescriptionModelTests extends TestCase { typesMatch(rc.getProducerIOType(), oRc.getProducerIOType(), null, true); doTestStep(rc.getProducerIOType().getStep(), oRc.getProducerIOType().getStep(), up); } else { - Set<IBuildStep> stepSet = new HashSet<IBuildStep>(); + Set<IBuildStep> stepSet = new HashSet<>(); for (Entry<IBuildIOType, IBuildIOType> entry : outMap.entrySet()) { IBuildIOType type = entry.getKey(); @@ -785,8 +785,8 @@ public class BuildDescriptionModelTests extends TestCase { return false; if (resourcesMatch(rcs, oRcs, rcMap)) { - Map<IBuildIOType, IBuildIOType> inMap = new HashMap<IBuildIOType, IBuildIOType>(); - Map<IBuildIOType, IBuildIOType> outMap = new HashMap<IBuildIOType, IBuildIOType>(); + Map<IBuildIOType, IBuildIOType> inMap = new HashMap<>(); + Map<IBuildIOType, IBuildIOType> outMap = new HashMap<>(); if (!checkStep) return true; return stepsMatch(type.getStep(), oType.getStep(), inMap, outMap, false, failOnError); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java index 094e294abee..ce593337ddd 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java @@ -120,7 +120,7 @@ public class BuildSystem40Tests extends TestCase { assertTrue(Arrays.equals(modifiedValue, value)); { - List<ICLanguageSettingEntry> list = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> list = new ArrayList<>(); list.addAll(Arrays.asList(entries)); list.add(new CIncludePathEntry(platformDependentPath("dbg 3", "E:\\tmp\\w"), 0)); entries = list.toArray(new ICLanguageSettingEntry[0]); @@ -131,7 +131,7 @@ public class BuildSystem40Tests extends TestCase { } { - ArrayList<OptionStringValue> list = new ArrayList<OptionStringValue>(); + ArrayList<OptionStringValue> list = new ArrayList<>(); list.addAll(Arrays.asList(value)); list.add(new OptionStringValue("\"E:\\tmp\\w\"")); value = list.toArray(new OptionStringValue[0]); @@ -185,7 +185,7 @@ public class BuildSystem40Tests extends TestCase { BuildSystemTestHelper.checkDiff(expectedEntries, entries); { - ArrayList<ICLanguageSettingEntry> list = new ArrayList<ICLanguageSettingEntry>(Arrays.asList(entries)); + ArrayList<ICLanguageSettingEntry> list = new ArrayList<>(Arrays.asList(entries)); list.remove(6); //new CIncludePathEntry("/d1_abs/path", 0), expectedEntries = list.toArray(new ICLanguageSettingEntry[0]); ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, list); @@ -219,7 +219,7 @@ public class BuildSystem40Tests extends TestCase { option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]; { - ArrayList<OptionStringValue> list = new ArrayList<OptionStringValue>( + ArrayList<OptionStringValue> list = new ArrayList<>( Arrays.asList(option.getBasicStringListValueElements())); assertTrue(list.remove(new OptionStringValue("${IncludeDefaults}"))); list.add(0, new OptionStringValue("${IncludeDefaults}")); @@ -253,7 +253,7 @@ public class BuildSystem40Tests extends TestCase { BuildSystemTestHelper.checkDiff(expectedEntries, entries); { - ArrayList<OptionStringValue> list = new ArrayList<OptionStringValue>( + ArrayList<OptionStringValue> list = new ArrayList<>( Arrays.asList(option.getBasicStringListValueElements())); assertTrue(list.remove(new OptionStringValue("${IncludeDefaults}"))); list.add(list.size(), new OptionStringValue("${IncludeDefaults}")); @@ -335,7 +335,7 @@ public class BuildSystem40Tests extends TestCase { BuildSystemTestHelper.checkDiff(expectedValue, value); BuildSystemTestHelper.checkDiff(expectedEntries, entries); - ArrayList<ICLanguageSettingEntry> list = new ArrayList<ICLanguageSettingEntry>(); + ArrayList<ICLanguageSettingEntry> list = new ArrayList<>(); list.addAll(Arrays.asList(entries)); list.add(new CIncludePathEntry("/test/another/abs", 0)); expectedEntries = list.toArray(new ICLanguageSettingEntry[0]); @@ -376,7 +376,7 @@ public class BuildSystem40Tests extends TestCase { BuildSystemTestHelper.checkDiff(expectedValue, value); BuildSystemTestHelper.checkDiff(expectedEntries, entries); - list = new ArrayList<ICLanguageSettingEntry>(); + list = new ArrayList<>(); list.addAll(Arrays.asList(entries)); list.add(new CIncludePathEntry("/another/abs", 0)); @@ -479,7 +479,7 @@ public class BuildSystem40Tests extends TestCase { } }); - projectList = new ArrayList<IProject>(projectZips.length); + projectList = new ArrayList<>(projectZips.length); for (int i = 0; i < projectZips.length; i++) { try { String projectName = projectZips[i].getName(); @@ -505,7 +505,7 @@ public class BuildSystem40Tests extends TestCase { try { IProject project = ManagedBuildTestHelper.createProject(projName, null, location, projectTypeId); if (project != null) - projectList = new ArrayList<IProject>(1); + projectList = new ArrayList<>(1); projectList.add(project); } catch (Exception e) { } diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/DefaultFortranDependencyCalculator.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/DefaultFortranDependencyCalculator.java index dc722ec5c0d..94a925eede3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/DefaultFortranDependencyCalculator.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/DefaultFortranDependencyCalculator.java @@ -47,7 +47,7 @@ public class DefaultFortranDependencyCalculator implements IManagedDependencyGen * Return a list of the names of all modules used by a file */ private String[] findUsedModuleNames(File file) { - ArrayList<String> names = new ArrayList<String>(); + ArrayList<String> names = new ArrayList<>(); InputStream in = null; try { in = new BufferedInputStream(new FileInputStream(file)); @@ -88,7 +88,7 @@ public class DefaultFortranDependencyCalculator implements IManagedDependencyGen * Return a list of the names of all modules defined in a file */ private String[] findModuleNames(File file) { - ArrayList<String> names = new ArrayList<String>(); + ArrayList<String> names = new ArrayList<>(); InputStream in = null; try { in = new BufferedInputStream(new FileInputStream(file)); @@ -148,7 +148,7 @@ public class DefaultFortranDependencyCalculator implements IManagedDependencyGen */ private IResource[] FindModulesInResources(IProject project, ITool tool, IResource resource, IResource[] resourcesToSearch, String topBuildDir, String[] usedNames) { - ArrayList<IResource> modRes = new ArrayList<IResource>(); + ArrayList<IResource> modRes = new ArrayList<>(); for (int ir = 0; ir < resourcesToSearch.length; ir++) { if (resourcesToSearch[ir].equals(resource)) continue; @@ -199,7 +199,7 @@ public class DefaultFortranDependencyCalculator implements IManagedDependencyGen */ @Override public IResource[] findDependencies(IResource resource, IProject project) { - ArrayList<IResource> dependencies = new ArrayList<IResource>(); + ArrayList<IResource> dependencies = new ArrayList<>(); // TODO: This method should be passed the ITool and the relative path of the top build directory // For now we'll figure this out from the project. @@ -268,7 +268,7 @@ public class DefaultFortranDependencyCalculator implements IManagedDependencyGen @Override public IPath[] getOutputNames(ITool tool, IPath[] primaryInputNames) { // TODO: This method should be passed the relative path of the top build directory? - ArrayList<IPath> outs = new ArrayList<IPath>(); + ArrayList<IPath> outs = new ArrayList<>(); if (primaryInputNames.length > 0) { // Get the names of modules created by this source file String[] modules = findModuleNames(primaryInputNames[0].toFile()); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java index 5c88395fcb6..1bd037fb571 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java @@ -141,7 +141,7 @@ public class ManagedBuildCoreTests extends TestCase { // ITargetPlatform platform = toolChain.getTargetPlatform(); - List<String> expectedOSListarr = new ArrayList<String>(); + List<String> expectedOSListarr = new ArrayList<>(); String[] expectedOSListTokens = expectedOSList.split(","); //$NON-NLS-1$ for (i = 0; i < expectedOSListTokens.length; ++i) { expectedOSListarr.add(expectedOSListTokens[i].trim()); @@ -208,7 +208,7 @@ public class ManagedBuildCoreTests extends TestCase { assertEquals(optionDefaultValue, expectedOptionIdValue1[iconfig]); String optionEnumCmd1 = option.getEnumCommand(optionDefaultValue); assertEquals(optionEnumCmd1, expectedOptionEnumCmd1arr[iconfig]); - List<String> expectedEnumList1arr = new ArrayList<String>(); + List<String> expectedEnumList1arr = new ArrayList<>(); String[] expectedEnumList1Tokens = expectedEnumList1.split(","); //$NON-NLS-1$ for (i = 0; i < expectedEnumList1Tokens.length; ++i) { expectedEnumList1arr.add(expectedEnumList1Tokens[i].trim()); @@ -314,7 +314,7 @@ public class ManagedBuildCoreTests extends TestCase { IToolChain toolChain = configs[iconfig].getToolChain(); assertEquals(toolChain.getName(), (expectedToolChainName[iconfig])); - List<String> expectedOSListarr = new ArrayList<String>(); + List<String> expectedOSListarr = new ArrayList<>(); String[] expectedOSListTokens = expectedOSList.split(","); //$NON-NLS-1$ for (i = 0; i < expectedOSListTokens.length; ++i) { expectedOSListarr.add(expectedOSListTokens[i].trim()); @@ -502,7 +502,7 @@ public class ManagedBuildCoreTests extends TestCase { // IToolChain toolChain = configs[iconfig].getToolChain(); - List<String> expectedOSListarr = new ArrayList<String>(); + List<String> expectedOSListarr = new ArrayList<>(); String[] expectedOSListTokens = expectedOSList.split(","); //$NON-NLS-1$ for (i = 0; i < expectedOSListTokens.length; ++i) { expectedOSListarr.add(expectedOSListTokens[i].trim()); @@ -571,7 +571,7 @@ public class ManagedBuildCoreTests extends TestCase { String optionEnumCmd1 = option.getEnumCommand(optionDefaultValue); assertEquals(optionEnumCmd1, (expectedOptionEnumCmd1arr[iconfig])); - List<String> expectedEnumList1arr = new ArrayList<String>(); + List<String> expectedEnumList1arr = new ArrayList<>(); String[] expectedEnumList1Tokens = expectedEnumList1.split(","); //$NON-NLS-1$ for (i = 0; i < expectedEnumList1Tokens.length; ++i) { expectedEnumList1arr.add(expectedEnumList1Tokens[i].trim()); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java index aab03ada0a9..f1ce25d3ac6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java @@ -74,7 +74,7 @@ public class ManagedBuildDependencyCalculatorTests extends TestCase { } }); - projectList = new ArrayList<IProject>(projectZips.length); + projectList = new ArrayList<>(projectZips.length); for (int i = 0; i < projectZips.length; i++) { try { String projectName = projectZips[i].getName(); @@ -100,7 +100,7 @@ public class ManagedBuildDependencyCalculatorTests extends TestCase { try { IProject project = ManagedBuildTestHelper.createProject(projName, null, location, projectTypeId); if (project != null) - projectList = new ArrayList<IProject>(1); + projectList = new ArrayList<>(1); projectList.add(project); } catch (Exception e) { } diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyLibsTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyLibsTests.java index f767c5bb99f..437cbeb2159 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyLibsTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyLibsTests.java @@ -190,7 +190,7 @@ public class ManagedBuildDependencyLibsTests extends AbstractBuilderTest { } private long getArtifactTimeStamp(IProject project) { - List<IFile> files = new ArrayList<IFile>(); + List<IFile> files = new ArrayList<>(); findFiles(project, getArtefactFullName(project), files); if (files.size() == 0) // File not exists return 0; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java index ab280c43405..72479b0b2aa 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java @@ -258,7 +258,7 @@ public class ManagedBuildMacrosTests extends TestCase { PATH_ENV_VAR }; String[] resArr1 = { "new a", /*"test=CFGTEST",*/ "x", "y", "z", "PRJ=NewMacrosForProjectContext", "LIST=x|y|z" }; - List<String> res1 = new ArrayList<String>(Arrays.asList(resArr1)); + List<String> res1 = new ArrayList<>(Arrays.asList(resArr1)); try { // Add split ${PATH} to res1 String strList = mp.resolveValue(PATH_ENV_VAR, UNKNOWN, LISTSEP, IBuildMacroProvider.CONTEXT_OPTION, @@ -272,7 +272,7 @@ public class ManagedBuildMacrosTests extends TestCase { opt = cfgs[0].setOption(t, opt, set1); assertNotNull(opt); - ArrayList<String> res2 = new ArrayList<String>(res1.size()); + ArrayList<String> res2 = new ArrayList<>(res1.size()); for (int i = 0; i < set1.length; i++) { try { String[] aus = mp.resolveStringListValue(set1[i], UNKNOWN, LISTSEP, @@ -698,7 +698,7 @@ public class ManagedBuildMacrosTests extends TestCase { // returns a list of macro's NAMES (not values). private String[] printMacros(IBuildMacro[] vars, String head) { - ArrayList<String> ar = new ArrayList<String>(0); + ArrayList<String> ar = new ArrayList<>(0); if (vars != null) { if (vars.length > 0) { for (int i = 0; i < vars.length; i++) { diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java index 780bb88ac8d..c0a0c689686 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java @@ -99,7 +99,7 @@ public class ManagedProject21MakefileTests extends TestCase { } }); - projectList = new ArrayList<IProject>(projectZips.length); + projectList = new ArrayList<>(projectZips.length); for (int i = 0; i < projectZips.length; i++) { try { String projectName = projectZips[i].getName(); @@ -125,7 +125,7 @@ public class ManagedProject21MakefileTests extends TestCase { try { IProject project = ManagedBuildTestHelper.createProject(projName, null, location, projectTypeId); if (project != null) - projectList = new ArrayList<IProject>(1); + projectList = new ArrayList<>(1); projectList.add(project); } catch (Exception e) { } diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java index 4a315af597e..72b71808cfc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java @@ -84,7 +84,7 @@ public class ManagedProjectUpdateTests extends TestCase { } }); - ArrayList<IProject> projectList = new ArrayList<IProject>(projectZips.length); + ArrayList<IProject> projectList = new ArrayList<>(projectZips.length); for (int i = 0; i < projectZips.length; i++) { try { String projectName = projectZips[i].getName(); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java index 68e0781a146..b8b42c3c01f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/MultiVersionSupportTests.java @@ -500,7 +500,7 @@ public class MultiVersionSupportTests extends TestCase { } }); - ArrayList<IProject> projectList = new ArrayList<IProject>(projectZips.length); + ArrayList<IProject> projectList = new ArrayList<>(projectZips.length); assertEquals(projectZips.length, 1); try { diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestConfigElement.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestConfigElement.java index 7717108b625..12bcf24462e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestConfigElement.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestConfigElement.java @@ -30,7 +30,7 @@ public class TestConfigElement implements IManagedConfigElement { public TestConfigElement(String name, String[][] attributes, IManagedConfigElement[] children) { this.name = name; this.children = children; - this.attributeMap = new TreeMap<String, String>(); + this.attributeMap = new TreeMap<>(); for (int i = 0; i < attributes.length; i++) { attributeMap.put(attributes[i][0], attributes[i][1]); } @@ -65,7 +65,7 @@ public class TestConfigElement implements IManagedConfigElement { */ @Override public IManagedConfigElement[] getChildren(String elementName) { - List<IManagedConfigElement> ret = new ArrayList<IManagedConfigElement>(children.length); + List<IManagedConfigElement> ret = new ArrayList<>(children.length); for (int i = 0; i < children.length; i++) { if (children[i].getName().equals(elementName)) { ret.add(children[i]); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java index 383fb842bcb..225c707505c 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ToolChainModificationTests.java @@ -72,7 +72,7 @@ public class ToolChainModificationTests extends TestCase { assertTrue(cfgM.isBuilderCompatible()); IToolChain[] ctcs = cfgM.getCompatibleToolChains(); - HashSet<IHoldsOptions> set = new HashSet<IHoldsOptions>(); + HashSet<IHoldsOptions> set = new HashSet<>(); FolderInfo foInfo = (FolderInfo) cfg.getRootFolderInfo(); ToolChain tc = (ToolChain) foInfo.getToolChain(); IToolChain[] allSys = ManagedBuildManager.getRealToolChains(); @@ -83,12 +83,12 @@ public class ToolChainModificationTests extends TestCase { set.remove(incompatibleTc); compare(Arrays.asList(ctcs), set); - HashSet<IToolChain> incomp = new HashSet<IToolChain>(Arrays.asList(allSys)); + HashSet<IToolChain> incomp = new HashSet<>(Arrays.asList(allSys)); incomp.removeAll(Arrays.asList(ctcs)); assertTrue(incomp.contains(incompatibleTc)); IBuilder[] cbs = cfgM.getCompatibleBuilders(); - Set<IHoldsOptions> bSet = new HashSet<IHoldsOptions>(); + Set<IHoldsOptions> bSet = new HashSet<>(); IBuilder[] allSysB = ManagedBuildManager.getRealBuilders(); filterPropsSupported(cfg, allSysB, bSet); IBuilder incompatibleB = ManagedBuildManager.getExtensionBuilder("tcm.tc4.b1"); @@ -97,7 +97,7 @@ public class ToolChainModificationTests extends TestCase { bSet.remove(incompatibleB); compare(Arrays.asList(cbs), bSet); - HashSet<IBuilder> incompB = new HashSet<IBuilder>(Arrays.asList(allSysB)); + HashSet<IBuilder> incompB = new HashSet<>(Arrays.asList(allSysB)); incompB.removeAll(Arrays.asList(cbs)); assertTrue(incompB.contains(incompatibleB)); @@ -115,7 +115,7 @@ public class ToolChainModificationTests extends TestCase { } private HashSet<IHoldsOptions> filterSupportedToolChains(IFolderInfo foInfo, IToolChain tc) { - HashSet<IHoldsOptions> set = new HashSet<IHoldsOptions>(); + HashSet<IHoldsOptions> set = new HashSet<>(); IToolChain[] allSys = ManagedBuildManager.getRealToolChains(); filterPropsSupported((FolderInfo) foInfo, (ToolChain) tc, allSys, set); set.remove(ManagedBuildManager.getRealToolChain(tc)); @@ -239,7 +239,7 @@ public class ToolChainModificationTests extends TestCase { HashSet<? extends IHoldsOptions> s1 = new HashSet<IHoldsOptions>(c1); HashSet<? extends IHoldsOptions> s1c = new HashSet<IHoldsOptions>(s1); - HashSet<IHoldsOptions> s2 = new HashSet<IHoldsOptions>(c2); + HashSet<IHoldsOptions> s2 = new HashSet<>(c2); s1.removeAll(s2); s2.removeAll(s1c); @@ -267,7 +267,7 @@ public class ToolChainModificationTests extends TestCase { private Collection<IHoldsOptions> filterPropsSupported(FolderInfo foInfo, ToolChain tc, IToolChain[] tcs, Collection<IHoldsOptions> c) { if (c == null) - c = new ArrayList<IHoldsOptions>(); + c = new ArrayList<>(); for (int i = 0; i < tcs.length; i++) { if (foInfo.isToolChainCompatible(tc, tcs[i])) c.add(tcs[i]); @@ -279,7 +279,7 @@ public class ToolChainModificationTests extends TestCase { private Collection<IHoldsOptions> filterPropsSupported(IConfiguration cfg, IBuilder[] bs, Collection<IHoldsOptions> c) { if (c == null) - c = new ArrayList<IHoldsOptions>(); + c = new ArrayList<>(); for (int i = 0; i < bs.length; i++) { if (cfg.isBuilderCompatible(bs[i])) c.add(bs[i]); @@ -340,7 +340,7 @@ public class ToolChainModificationTests extends TestCase { IModificationOperation[] ops = tm.getSupportedOperations(); ITool tool31 = ManagedBuildManager.getExtensionTool("tcm.tc3.t1"); - Set<ITool> replacement = new HashSet<ITool>(); + Set<ITool> replacement = new HashSet<>(); boolean removable = getReplacementToolInfo(ops, replacement); assertFalse(removable); @@ -350,7 +350,7 @@ public class ToolChainModificationTests extends TestCase { assertTrue(tm.isProjectTool()); ops = tm.getSupportedOperations(); - replacement = new HashSet<ITool>(); + replacement = new HashSet<>(); removable = getReplacementToolInfo(ops, replacement); assertFalse(removable); 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 67ff3408e2c..4252f366330 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 @@ -299,11 +299,11 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { { // provider configured with non-null parameters MockBuiltinSpecsDetectorExecutedFlag provider = new MockBuiltinSpecsDetectorExecutedFlag(); - List<String> languages = new ArrayList<String>(); + List<String> languages = new ArrayList<>(); languages.add(LANGUAGE_ID); - Map<String, String> properties = new HashMap<String, String>(); + Map<String, String> properties = new HashMap<>(); properties.put(ATTR_PARAMETER, CUSTOM_COMMAND_1); - List<ICLanguageSettingEntry> entries = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> entries = new ArrayList<>(); ICLanguageSettingEntry entry = new CMacroEntry("MACRO", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY); entries.add(entry); @@ -349,9 +349,9 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { // create instance to compare to MockDetectorCloneable provider = new MockDetectorCloneable(); - List<String> languages = new ArrayList<String>(); + List<String> languages = new ArrayList<>(); languages.add(LANGUAGE_ID); - List<ICLanguageSettingEntry> entries = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> entries = new ArrayList<>(); ICLanguageSettingEntry entry = new CMacroEntry("MACRO", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY); entries.add(entry); @@ -361,7 +361,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { assertTrue(provider.equals(clone0)); // configure provider - Map<String, String> properties = new HashMap<String, String>(); + Map<String, String> properties = new HashMap<>(); properties.put(ATTR_PARAMETER, CUSTOM_COMMAND_1); provider.configureProvider(PROVIDER_ID, PROVIDER_NAME, languages, entries, properties); assertEquals(false, provider.isConsoleEnabled()); @@ -410,7 +410,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { // check entries { MockDetectorCloneable clone = provider.clone(); - List<ICLanguageSettingEntry> entries2 = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> entries2 = new ArrayList<>(); entries2.add(new CMacroEntry("MACRO2", "VALUE2", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY)); clone.setSettingEntries(null, null, null, entries2); assertFalse(provider.equals(clone)); @@ -489,7 +489,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { { // create provider MockBuiltinSpecsDetectorExecutedFlag provider = new MockBuiltinSpecsDetectorExecutedFlag(); - List<ICLanguageSettingEntry> entries = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> entries = new ArrayList<>(); entries.add(new CIncludePathEntry("path0", 1)); provider.setSettingEntries(null, null, null, entries); // serialize entries @@ -708,7 +708,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { ICConfigurationDescription cfgDescriptionWritable = prjDescriptionWritable.getActiveConfiguration(); // Create provider MockBuiltinSpecsDetectorEnvironmentChangeListener provider = new MockBuiltinSpecsDetectorEnvironmentChangeListener(); - List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>(); + List<ILanguageSettingsProvider> providers = new ArrayList<>(); providers.add(provider); ((ILanguageSettingsProvidersKeeper) cfgDescriptionWritable).setLanguageSettingProviders(providers); // Write to project description diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java index fbc2f48e810..31877514bbc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java @@ -195,7 +195,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { ICConfigurationDescription cfgDescription = cfgDescriptions[0]; Map<String, String> refs = cfgDescription.getReferenceInfo(); assertEquals(1, refs.size()); - Set<String> referencedProjectsNames = new LinkedHashSet<String>(refs.keySet()); + Set<String> referencedProjectsNames = new LinkedHashSet<>(refs.keySet()); assertEquals(projectReferenced.getName(), referencedProjectsNames.toArray()[0]); } @@ -221,11 +221,11 @@ public class GCCBuildCommandParserTest extends BaseTestCase { { // provider configured with non-null parameters MockBuildCommandParser provider = new MockBuildCommandParser(); - List<String> languages = new ArrayList<String>(); + List<String> languages = new ArrayList<>(); languages.add(LANGUAGE_ID); - Map<String, String> properties = new HashMap<String, String>(); + Map<String, String> properties = new HashMap<>(); properties.put(ATTR_PARAMETER, CUSTOM_PARAMETER); - List<ICLanguageSettingEntry> entries = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> entries = new ArrayList<>(); ICLanguageSettingEntry entry = new CMacroEntry("MACRO", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY); entries.add(entry); @@ -381,7 +381,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { public boolean processLine(String line) { // pretending that we parsed the line currentResource = file; - List<ICLanguageSettingEntry> entries = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> entries = new ArrayList<>(); ICLanguageSettingEntry entry = new CMacroEntry("MACRO", "VALUE", ICSettingEntry.BUILTIN); entries.add(entry); setSettingEntries(entries); @@ -2089,7 +2089,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { parser.shutdown(); // check populated entries - List<ICLanguageSettingEntry> expected = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> expected = new ArrayList<>(); expected.add(new CIncludePathEntry("/path0", 0)); assertEquals(expected, parser.getSettingEntries(cfgDescription, file, languageId)); assertEquals(null, parser.getSettingEntries(cfgDescription, folder, languageId)); @@ -2122,7 +2122,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { parser.shutdown(); // check populated entries - List<ICLanguageSettingEntry> expected = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> expected = new ArrayList<>(); expected.add(new CIncludePathEntry("/path0", 0)); assertEquals(null, parser.getSettingEntries(cfgDescription, file, languageId)); assertEquals(expected, parser.getSettingEntries(cfgDescription, folder, languageId)); @@ -2155,7 +2155,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { parser.shutdown(); // check populated entries - List<ICLanguageSettingEntry> expected = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> expected = new ArrayList<>(); expected.add(new CIncludePathEntry("/path0", 0)); assertEquals(null, parser.getSettingEntries(cfgDescription, file, languageId)); @@ -2180,7 +2180,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { parser.shutdown(); // check populated entries - List<ICLanguageSettingEntry> expected = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> expected = new ArrayList<>(); expected.add(new CIncludePathEntry("/path0", 0)); assertEquals(expected, parser.getSettingEntries(null, null, LANG_CPP)); } diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java index 8f960afda26..24ba7186a01 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java @@ -651,7 +651,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { ICConfigurationDescription[] cfgDescriptions = prjDescriptionWritable.getConfigurations(); assertTrue(cfgDescriptions.length > 0); ICConfigurationDescription cfgDescription = cfgDescriptions[0]; - List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>(); + List<ILanguageSettingsProvider> providers = new ArrayList<>(); providers.add(detector); ((ILanguageSettingsProvidersKeeper) cfgDescription).setLanguageSettingProviders(providers); // change the default command in all the tools of the toolchain diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TemplateEngineTestsHelper.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TemplateEngineTestsHelper.java index c643f3f60b9..5ade37fab62 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TemplateEngineTestsHelper.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TemplateEngineTestsHelper.java @@ -50,8 +50,8 @@ import junit.framework.TestCase; public class TemplateEngineTestsHelper { public static final String LOGGER_FILE_NAME = "TemplateEngineTests"; //$NON-NLS-1$ - private static List<IProjectType> projectTypes = new ArrayList<IProjectType>(); - private static List<String> projectTypeNames = new ArrayList<String>(); + private static List<IProjectType> projectTypes = new ArrayList<>(); + private static List<String> projectTypeNames = new ArrayList<>(); /** * get the url of a xml template, by passing the xml file name. diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java index 8f43cfa5acc..c0dd5c8510d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java @@ -31,7 +31,7 @@ import junit.framework.TestSuite; public class BackwardCompatiblityTests extends TestCase { private static final String TEST_3X_STD_MAKE_PROJECTS = "test3xStdMakeProjects"; - private List<IProject> projList = new LinkedList<IProject>(); + private List<IProject> projList = new LinkedList<>(); public static Test suite() { return new TestSuite(BackwardCompatiblityTests.class); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java index 0543f0fcdbe..1300fe2c349 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java @@ -81,7 +81,7 @@ public class OptionStringListValueTests extends TestCase { IFolderInfo fInfo = cfg.getRootFolderInfo(); ICLanguageSetting ls = fDes.getLanguageSettingForFile("a.c"); - List<ICLanguageSettingEntry> list = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> list = new ArrayList<>(); list.add(new CIncludePathEntry("a", 0)); list.add(new CIncludePathEntry("b", 0)); list.addAll(ls.getSettingEntriesList(ICSettingEntry.INCLUDE_PATH)); @@ -129,7 +129,7 @@ public class OptionStringListValueTests extends TestCase { ICFolderDescription fDes = cfgDes.getRootFolderDescription(); ICLanguageSetting ls = fDes.getLanguageSettingForFile("a.c"); - List<ICLanguageSettingEntry> list = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> list = new ArrayList<>(); list.add(new CLibraryFileEntry("usr_a", 0, new Path("ap"), new Path("arp"), new Path("apx"))); list.add(new CLibraryFileEntry("usr_b", 0, new Path("bp"), null, null)); list.add(new CLibraryFileEntry("usr_c", 0, new Path("cp"), new Path("crp"), null)); @@ -178,9 +178,9 @@ public class OptionStringListValueTests extends TestCase { } private void checkEntriesMatch(List<ICLanguageSettingEntry> list1, List<ICLanguageSettingEntry> list2) { - Set<ICLanguageSettingEntry> set1 = new LinkedHashSet<ICLanguageSettingEntry>(list1); + Set<ICLanguageSettingEntry> set1 = new LinkedHashSet<>(list1); set1.removeAll(list2); - Set<ICLanguageSettingEntry> set2 = new LinkedHashSet<ICLanguageSettingEntry>(list2); + Set<ICLanguageSettingEntry> set2 = new LinkedHashSet<>(list2); set2.removeAll(list1); if (set1.size() != 0 || set2.size() != 0) { fail("entries diff"); @@ -229,7 +229,7 @@ public class OptionStringListValueTests extends TestCase { checkOptionValues(option); - List<Object> list = new ArrayList<Object>(); + List<Object> list = new ArrayList<>(); list.add("usr_1"); list.add("usr_2"); list.addAll(Arrays.asList(option.getBasicStringListValue())); @@ -239,7 +239,7 @@ public class OptionStringListValueTests extends TestCase { assertTrue(Arrays.equals(updated, option.getBasicStringListValue())); checkOptionValues(option); - list = new ArrayList<Object>(); + list = new ArrayList<>(); list.add(new OptionStringValue("usr_3", false, "ap", "arp", "apx")); list.add(new OptionStringValue("usr_4", false, null, null, null)); list.add(new OptionStringValue("usr_5", false, "cp", null, null)); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/ProjectModelTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/ProjectModelTests.java index d930cda60c5..d473bb553e7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/ProjectModelTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/ProjectModelTests.java @@ -637,7 +637,7 @@ public class ProjectModelTests extends TestCase implements IElementChangedListen } CMacroEntry entry = new CMacroEntry("a", "b", 0); - List<ICLanguageSettingEntry> list = new ArrayList<ICLanguageSettingEntry>(); + List<ICLanguageSettingEntry> list = new ArrayList<>(); list.add(entry); list.addAll(Arrays.asList(entries)); |