diff options
author | Sergey Prigogin | 2016-03-22 02:40:36 +0000 |
---|---|---|
committer | Sergey Prigogin | 2016-03-22 03:17:05 +0000 |
commit | 52432d73702960aaab6810bbda22feb2f11dfdd1 (patch) | |
tree | beff96a44e7ef6d178ada9d121262fe3132181b7 /build | |
parent | de3b172c7dbd1cbff5ffd59067c138f43e410afc (diff) | |
download | org.eclipse.cdt-52432d73702960aaab6810bbda22feb2f11dfdd1.tar.gz org.eclipse.cdt-52432d73702960aaab6810bbda22feb2f11dfdd1.tar.xz org.eclipse.cdt-52432d73702960aaab6810bbda22feb2f11dfdd1.zip |
Cosmetics.
Change-Id: I4022285d11267b77861cc8e4333adbea9c780ea7
Diffstat (limited to 'build')
2 files changed, 17 insertions, 18 deletions
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 d2fa145ba46..5a1a20dff73 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]); } } @@ -220,11 +220,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); @@ -382,7 +382,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); @@ -2366,10 +2366,10 @@ public class GCCBuildCommandParserTest extends BaseTestCase { */ public void testEntriesProjectLevelGlobalProvider() throws Exception { // create GCCBuildCommandParser - ILanguageSettingsProvider wspProvider = LanguageSettingsManager - .getWorkspaceProvider(GCC_BUILD_COMMAND_PARSER_EXT); - GCCBuildCommandParser parser = (GCCBuildCommandParser) LanguageSettingsManager - .getRawProvider(wspProvider); + ILanguageSettingsProvider wspProvider = + LanguageSettingsManager.getWorkspaceProvider(GCC_BUILD_COMMAND_PARSER_EXT); + GCCBuildCommandParser parser = + (GCCBuildCommandParser) LanguageSettingsManager.getRawProvider(wspProvider); parser.setResourceScope(AbstractBuildCommandParser.ResourceScope.PROJECT); parser.clear(); @@ -2379,7 +2379,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((IBuildConfiguration) null, null, LANG_CPP)); } @@ -2440,8 +2440,8 @@ public class GCCBuildCommandParserTest extends BaseTestCase { String languageId = ls.getLanguageId(); // create GCCBuildCommandParser - GCCBuildCommandParser parser = (GCCBuildCommandParser) LanguageSettingsManager - .getExtensionProviderCopy(GCC_BUILD_COMMAND_PARSER_EXT, true); + GCCBuildCommandParser parser = (GCCBuildCommandParser) LanguageSettingsManager.getExtensionProviderCopy( + GCC_BUILD_COMMAND_PARSER_EXT, true); parser.setResourceScope(AbstractBuildCommandParser.ResourceScope.PROJECT); // parse line @@ -2461,10 +2461,10 @@ public class GCCBuildCommandParserTest extends BaseTestCase { */ public void testFileAbsolutePath_ProjectLevelGlobalProvider() throws Exception { // create GCCBuildCommandParser - ILanguageSettingsProvider wspProvider = LanguageSettingsManager - .getWorkspaceProvider(GCC_BUILD_COMMAND_PARSER_EXT); - GCCBuildCommandParser parser = (GCCBuildCommandParser) LanguageSettingsManager - .getRawProvider(wspProvider); + ILanguageSettingsProvider wspProvider = + LanguageSettingsManager.getWorkspaceProvider(GCC_BUILD_COMMAND_PARSER_EXT); + GCCBuildCommandParser parser = + (GCCBuildCommandParser) LanguageSettingsManager.getRawProvider(wspProvider); parser.setResourceScope(AbstractBuildCommandParser.ResourceScope.PROJECT); parser.clear(); @@ -2479,5 +2479,4 @@ public class GCCBuildCommandParserTest extends BaseTestCase { List<ICLanguageSettingEntry> entries = parser.getSettingEntries((IBuildConfiguration) null, null, LANG_CPP); assertEquals(new CIncludePathEntry("/path0", 0), entries.get(0)); } - } 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 4cf93cfbeab..a4fc55efb52 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 @@ -581,7 +581,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 |