Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMikhail Sennikovsky2007-06-08 17:50:12 +0000
committerMikhail Sennikovsky2007-06-08 17:50:12 +0000
commitf535244b896041ace8a72ea7e0449f0c70af07f2 (patch)
treec940c47045a281c02c9ce8ed36b887ac5d077178 /core
parent9c79058aadea1230a85887ce91b767f76033120e (diff)
downloadorg.eclipse.cdt-f535244b896041ace8a72ea7e0449f0c70af07f2.tar.gz
org.eclipse.cdt-f535244b896041ace8a72ea7e0449f0c70af07f2.tar.xz
org.eclipse.cdt-f535244b896041ace8a72ea7e0449f0c70af07f2.zip
1. Follow-up for fix for [Bug 188764] make it posible to apply the "isCDTProjectCreating" ICProjectDescription with no configurations
2. test for the above functionality
Diffstat (limited to 'core')
-rw-r--r--core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionBasicTests.java2
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java2
2 files changed, 2 insertions, 2 deletions
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 bef4f1fccaa..3fa75087824 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
@@ -124,7 +124,7 @@ public class CProjectDescriptionBasicTests extends BaseTestCase{
}
- public void remove_prefix_testSetInvalidCreatingDescription() throws Exception {
+ public void testSetInvalidCreatingDescription() throws Exception {
IWorkspace wsp = ResourcesPlugin.getWorkspace();
IWorkspaceRoot root = wsp.getRoot();
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java
index 8efdc1ff9a2..68752886d68 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java
@@ -326,7 +326,7 @@ public class CConfigBasedDescriptorManager implements ICDescriptorManager {
throw ExceptionFactory.createCoreException(CCorePlugin.getResourceString("CConfigBasedDescriptorManager.4")); //$NON-NLS-1$
dr = new CConfigBasedDescriptor(cfgDes);
- } else {
+ } else if (!des.isCdtProjectCreating()){
throw ExceptionFactory.createCoreException(CCorePlugin.getResourceString("CConfigBasedDescriptorManager.5")); //$NON-NLS-1$
}
}

Back to the top