mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-30 21:55:31 +02:00
Code Issues Wiki Activity

Bug fix

Browse source
This commit is contained in:
Oleg Krasilnikov 2007-03-15 18:00:47 +00:00
parent 6ec930568f
commit 2827d3620c
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CMainWizardPage.java
View file

@ -325,7 +325,7 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes
setMessage(null); setMessage(null);
String projectFieldContents = getProjectNameFieldValue(); String projectFieldContents = getProjectNameFieldValue();
if (projectFieldContents.equals("")) { //$NON-NLS-1$ if (projectFieldContents.length() == 0) {
setErrorMessage(IDEWorkbenchMessages.WizardNewProjectCreationPage_projectNameEmpty); setErrorMessage(IDEWorkbenchMessages.WizardNewProjectCreationPage_projectNameEmpty);
return false; return false;
} }
@ -339,8 +339,16 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes
IProject handle = getProjectHandle(); IProject handle = getProjectHandle();
if (handle.exists()) { if (handle.exists()) {
setErrorMessage(IDEWorkbenchMessages.WizardNewProjectCreationPage_projectExistsMessage); boolean bad = true;
return false; if (getWizard() instanceof NewModelProjectWizard) {
NewModelProjectWizard w = (NewModelProjectWizard)getWizard();
if (w.lastProjectName != null && w.lastProjectName.equals(getProjectName()))
bad = false;
}
if (bad) {
setErrorMessage(IDEWorkbenchMessages.WizardNewProjectCreationPage_projectExistsMessage);
return false;
}
} }
if (!locationArea.isDefault()) { if (!locationArea.isDefault()) {

4
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewModelProjectWizard.java
View file

@ -60,7 +60,7 @@ public abstract class NewModelProjectWizard extends BasicNewResourceWizard imple
private String wz_title; private String wz_title;
private String wz_desc; private String wz_desc;
private String lastProjectName = null; public String lastProjectName = null;
private ICWizardHandler savedHandler = null; private ICWizardHandler savedHandler = null;
private IToolChain[] savedToolChains = null; private IToolChain[] savedToolChains = null;
private boolean savedDefaults = false; private boolean savedDefaults = false;
@ -128,7 +128,7 @@ public abstract class NewModelProjectWizard extends BasicNewResourceWizard imple
return true; return true;
for (int i=0; i<savedToolChains.length; i++) { for (int i=0; i<savedToolChains.length; i++) {
boolean found = false; boolean found = false;
for (int j=0; i<tcs.length; j++) { for (int j=0; j<tcs.length; j++) {
if (savedToolChains[i] == tcs[j]) { if (savedToolChains[i] == tcs[j]) {
found = true; break; found = true; break;
} }

2
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/messages.properties
View file

@ -11,7 +11,7 @@ CConfigWizardPage.8=Deselect all
CConfigWizardPage.9=Edit properties after project creation CConfigWizardPage.9=Edit properties after project creation
CConfigWizardPage.10=At least one configuration should be available. Project cannot be created. CConfigWizardPage.10=At least one configuration should be available. Project cannot be created.
CConfigWizardPage.11=At least one configuration should be selected. Please check needed configurations. CConfigWizardPage.11=At least one configuration should be selected. Please check needed configurations.
CConfigWizardPage.12=Additional configurations can be added after project creation.\nUse "Manage configurations" buttons either on toolbar or on property pages. CConfigWizardPage.12=Use "Advanced settings" button to edit project's properties.\n\nAdditional configurations can be added after project creation.\nUse "Manage configurations" buttons either on toolbar or on property pages.
CConfigWizardPage.13=Advanced settings... CConfigWizardPage.13=Advanced settings...
CMainWizardPage.0=Project types: CMainWizardPage.0=Project types:
CMainWizardPage.1=Show project types and toolchains only if they are supported on the platform CMainWizardPage.1=Show project types and toolchains only if they are supported on the platform