diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java index bbfc50bcb57..b3a765ffd8d 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java @@ -72,7 +72,7 @@ public class RefreshScopeTests extends TestCase { CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() { @Override public void run(IProgressMonitor monitor) throws CoreException { - ICProject cProject = CProjectHelper.createNewStileCProject("testRefreshScope", IPDOMManager.ID_NO_INDEXER, false); + ICProject cProject = CProjectHelper.createNewStyleCProject("testRefreshScope", IPDOMManager.ID_NO_INDEXER, false); fProject = cProject.getProject(); IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java index 74c440d53b1..6b5425a0e24 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/BackwardCompatibilityTests.java @@ -63,7 +63,7 @@ public class BackwardCompatibilityTests extends BaseTestCase { } public void testPathEntriesForNewStyle() throws Exception { - p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", TestUserAndDiscoveredEntriesCfgDataProvider.PROVIDER_ID, IPDOMManager.ID_NO_INDEXER); + p1 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "a", TestUserAndDiscoveredEntriesCfgDataProvider.PROVIDER_ID, IPDOMManager.ID_NO_INDEXER); IProject project = p1.getProject(); IPathEntry[] entries = CoreModel.getRawPathEntries(p1); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java index 2b5ff5b2807..a2950c824f0 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java @@ -65,7 +65,7 @@ public class CProjectDescriptionBasicTests extends BaseTestCase{ } public void testModulesCopiedOnCreateNewConfig() throws Exception { - ICProject p = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "c", IPDOMManager.ID_NO_INDEXER); + ICProject p = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "c", IPDOMManager.ID_NO_INDEXER); p3 = p.getProject(); ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager(); @@ -186,7 +186,7 @@ public class CProjectDescriptionBasicTests extends BaseTestCase{ } public void testSetDescriptionWithRootIncompatibleRuleAquired() throws Exception { - ICProject p = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "4", IPDOMManager.ID_NO_INDEXER); + ICProject p = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "4", IPDOMManager.ID_NO_INDEXER); p4 = p.getProject(); ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager(); @@ -225,7 +225,7 @@ public class CProjectDescriptionBasicTests extends BaseTestCase{ // Emulate entering Eclipse first time { // Create model project and accompanied descriptions - ICProject cproject = CProjectHelper.createNewStileCProject(projectName, IPDOMManager.ID_NO_INDEXER); + ICProject cproject = CProjectHelper.createNewStyleCProject(projectName, IPDOMManager.ID_NO_INDEXER); IProject project = cproject.getProject(); // Initial project description after opening a project diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java index 0a191764db1..e44cdfdd7f8 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java @@ -62,7 +62,7 @@ public class CProjectDescriptionStorageTests extends BaseTestCase { @Override protected void setUp() throws Exception { - cProj = CProjectHelper.createNewStileCProject("CProjDescStorage", IPDOMManager.ID_FAST_INDEXER); + cProj = CProjectHelper.createNewStyleCProject("CProjDescStorage", IPDOMManager.ID_FAST_INDEXER); resListener = new OurResourceChangeListener(); ResourcesPlugin.getWorkspace().addResourceChangeListener(resListener); } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java index 52021457a34..f1de49411b8 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java @@ -39,7 +39,7 @@ public class CfgSettingsTests extends BaseTestCase { int wspRel = prefs.getConfigurationRelations(); CoreModel model = CoreModel.getDefault(); - p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER); + p1 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER); IProject project = p1.getProject(); ICProjectDescription des = model.getProjectDescription(project, false); assertEquals(wspRel, des.getConfigurationRelations()); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java index 98418e57d30..91d4953add4 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java @@ -41,12 +41,12 @@ public class ExternalSettingsProviderTests extends BaseTestCase{ @Override protected void setUp() throws Exception { - p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER); - p2 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "b", IPDOMManager.ID_NO_INDEXER); - p3 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "c", IPDOMManager.ID_NO_INDEXER); - p4 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "d", IPDOMManager.ID_NO_INDEXER); - p5 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "e", IPDOMManager.ID_NO_INDEXER); - p6 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "f", IPDOMManager.ID_NO_INDEXER); + p1 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER); + p2 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "b", IPDOMManager.ID_NO_INDEXER); + p3 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "c", IPDOMManager.ID_NO_INDEXER); + p4 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "d", IPDOMManager.ID_NO_INDEXER); + p5 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "e", IPDOMManager.ID_NO_INDEXER); + p6 = CProjectHelper.createNewStyleCProject(PROJ_NAME_PREFIX + "f", IPDOMManager.ID_NO_INDEXER); } /** diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java index 4345fe9dec8..37102690894 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java @@ -115,7 +115,7 @@ public class ProjectCreationStateTests extends BaseTestCase{ initListener(projName); - ICProject cp1 = CProjectHelper.createNewStileCProject(projName, IPDOMManager.ID_NO_INDEXER, true); + ICProject cp1 = CProjectHelper.createNewStyleCProject(projName, IPDOMManager.ID_NO_INDEXER, true); IProject project = cp1.getProject(); p1 = project; assertTrue(listener.isNotified()); @@ -246,7 +246,7 @@ public class ProjectCreationStateTests extends BaseTestCase{ initListener(projName); - ICProject cp3 = CProjectHelper.createNewStileCProject(projName, IPDOMManager.ID_NO_INDEXER, true); + ICProject cp3 = CProjectHelper.createNewStyleCProject(projName, IPDOMManager.ID_NO_INDEXER, true); IProject project = cp3.getProject(); p3 = project; @@ -308,7 +308,7 @@ public class ProjectCreationStateTests extends BaseTestCase{ initListener(projName); - ICProject cp4 = CProjectHelper.createNewStileCProject(projName, IPDOMManager.ID_NO_INDEXER, false); + ICProject cp4 = CProjectHelper.createNewStyleCProject(projName, IPDOMManager.ID_NO_INDEXER, false); IProject project = cp4.getProject(); p4 = project; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ChangeConfigurationTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ChangeConfigurationTests.java index c9fd02d96f5..bd4a6ef4c62 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ChangeConfigurationTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ChangeConfigurationTests.java @@ -73,7 +73,7 @@ public class ChangeConfigurationTests extends PDOMTestBase { //#endif public void testRepeatedlyChangeConfig_bug375226() throws Exception { ModelJoiner mj = new ModelJoiner(); - ICProject cProject = CProjectHelper.createNewStileCProject("testChangeConfiguration", IPDOMManager.ID_FAST_INDEXER); + ICProject cProject = CProjectHelper.createNewStyleCProject("testChangeConfiguration", IPDOMManager.ID_FAST_INDEXER); IProject project = cProject.getProject(); StringBuilder[] contents= TestSourceReader.getContentsForTest(CTestPlugin.getDefault().getBundle(), "parser", getClass(), getName(), 1); IFile file= TestSourceReader.createFile(cProject.getProject(), new Path("test.c"), contents[0].toString()); diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java index 656b14e9e02..1885fbaccd0 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java @@ -137,28 +137,28 @@ public class CProjectHelper { /** * Creates a ICProject. */ - public static ICProject createNewStileCProject(final String projectName, final String indexerID) throws CoreException { - return createNewStileCProject(projectName, indexerID, false); + public static ICProject createNewStyleCProject(final String projectName, final String indexerID) throws CoreException { + return createNewStyleCProject(projectName, indexerID, false); } /** * Creates a ICProject. */ - public static ICProject createNewStileCProject(final String projectName, String providerId, final String indexerID) throws CoreException { - return createNewStileCProject(projectName, providerId, indexerID, false); + public static ICProject createNewStyleCProject(final String projectName, String providerId, final String indexerID) throws CoreException { + return createNewStyleCProject(projectName, providerId, indexerID, false); } /** * Creates a ICProject. */ - public static ICProject createNewStileCProject(final String projectName, final String indexerID, boolean markCreating) throws CoreException { - return createNewStileCProject(projectName, null, indexerID, markCreating); + public static ICProject createNewStyleCProject(final String projectName, final String indexerID, boolean markCreating) throws CoreException { + return createNewStyleCProject(projectName, null, indexerID, markCreating); } /** * Creates a ICProject. */ - public static ICProject createNewStileCProject(final String projectName, String cfgProviderId, final String indexerID, final boolean markCreating) throws CoreException { + public static ICProject createNewStyleCProject(final String projectName, String cfgProviderId, final String indexerID, final boolean markCreating) throws CoreException { final IWorkspace ws = ResourcesPlugin.getWorkspace(); final ICProject newProject[] = new ICProject[1]; if(cfgProviderId == null) @@ -260,7 +260,7 @@ public class CProjectHelper { public static ICContainer addCContainer(ICProject cproject, String containerName) throws CoreException { IProject project = cproject.getProject(); ICContainer container = null; - if (containerName == null || containerName.length() == 0) { + if (containerName == null || containerName.isEmpty()) { ICContainer[] conts = cproject.getSourceRoots(); if (conts.length > 0) { container = conts[0]; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java index 71fd6f63b72..028ddf5d1c8 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java @@ -102,8 +102,8 @@ public class SettingsImportExportTest extends BaseUITestCase { public void testNormalExportImport() throws Exception { - ICProject exportProject = CProjectHelper.createNewStileCProject("TempProject1", IPDOMManager.ID_NO_INDEXER); - ICProject importProject = CProjectHelper.createNewStileCProject("TempProject2", IPDOMManager.ID_NO_INDEXER); + ICProject exportProject = CProjectHelper.createNewStyleCProject("TempProject1", IPDOMManager.ID_NO_INDEXER); + ICProject importProject = CProjectHelper.createNewStyleCProject("TempProject2", IPDOMManager.ID_NO_INDEXER); setUpProjectSettings(exportProject); ProjectSettingsWizardPageMock page = new ProjectSettingsWizardPageMock() { @@ -165,7 +165,7 @@ public class SettingsImportExportTest extends BaseUITestCase { String filePath = getFilePath("test.txt"); createFile(xmlContent, filePath); - ICProject project = CProjectHelper.createNewStileCProject("VaidateProject", IPDOMManager.ID_NO_INDEXER); + ICProject project = CProjectHelper.createNewStyleCProject("VaidateProject", IPDOMManager.ID_NO_INDEXER); ICProjectDescription desc = CoreModel.getDefault().getProjectDescription(project.getProject(), false); ICConfigurationDescription config = desc.getActiveConfiguration();