MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

step validation fixed

Browse Source
This commit is contained in:
Alexander Doroshko
2012-01-20 20:24:42 +04:00
parent 3d03407d69
commit b26af7fcdc
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectNameStep.java
+19 -8
View File
@@ -21,6 +21,7 @@ import com.intellij.ide.highlighter.ModuleFileType;
import com.intellij.openapi.application.ApplicationInfo;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.project.ProjectUtil;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.io.FileUtil;
@@ -32,6 +33,8 @@ import java.awt.*;
import java.io.File;
import java.util.List;
import static com.intellij.openapi.components.StorageScheme.DIRECTORY_BASED;
/**
* @author Eugene Zhuravlev
* Date: Jan 21, 2004
@@ -73,7 +76,7 @@ public class ProjectNameStep extends ModuleWizardStep {
public void updateStep() {
super.updateStep();
myNamePathComponent.setPath(myWizardContext.getProjectFileDirectory());
myNamePathComponent.setPath(FileUtil.toSystemDependentName(myWizardContext.getProjectFileDirectory()));
String name = myWizardContext.getProjectName();
if (name == null) {
List<String> components = StringUtil.split(FileUtil.toSystemIndependentName(myWizardContext.getProjectFileDirectory()), "/");
@@ -115,13 +118,21 @@ public class ProjectNameStep extends ModuleWizardStep {
}
boolean shouldContinue = true;
final File projectFile = new File(getProjectFilePath());
final String path = myWizardContext.isCreatingNewProject() && myWizardContext.getProjectStorageFormat() == DIRECTORY_BASED
? getProjectFileDirectory() + "/" + ProjectUtil.DIRECTORY_BASED_PROJECT_DIR
: getProjectFilePath();
final File projectFile = new File(path);
if (projectFile.exists()) {
int answer = Messages.showYesNoDialog(
IdeBundle.message("prompt.overwrite.project.file", projectFile.getAbsolutePath(), myWizardContext.getPresentationName()),
IdeBundle.message("title.file.already.exists"),
Messages.getQuestionIcon()
);
final String title = myWizardContext.isCreatingNewProject()
? IdeBundle.message("title.new.project")
: IdeBundle.message("title.add.module");
final String message = myWizardContext.isCreatingNewProject() && myWizardContext.getProjectStorageFormat() == DIRECTORY_BASED
? IdeBundle.message("prompt.overwrite.project.folder", ProjectUtil.DIRECTORY_BASED_PROJECT_DIR,
projectFile.getParentFile().getAbsolutePath())
: IdeBundle.message("prompt.overwrite.project.file", projectFile.getAbsolutePath(),
myWizardContext.getPresentationName());
int answer = Messages.showYesNoDialog(message, title, Messages.getQuestionIcon());
shouldContinue = answer == 0;
}
@@ -135,7 +146,7 @@ public class ProjectNameStep extends ModuleWizardStep {
}
public String getProjectFileDirectory() {
return myNamePathComponent.getPath();
return FileUtil.toSystemIndependentName(myNamePathComponent.getPath());
}
public String getProjectName() {
platform/platform-resources-en/src/messages/IdeBundle.properties
+1
View File
@@ -744,6 +744,7 @@ prompt.new.project.file.name=Enter a file name to create a new {0} {1}
prompt.enter.project.file.location=Enter {0} file location
directory.project.file.directory=The {0} file directory\n
prompt.overwrite.project.file=The {1} file \n''{0}''\nalready exists.\nWould you like to overwrite it?
prompt.overwrite.project.folder={0} folder already exists in {1}.\nIts content may be overwritten.\nContinue?
warning.message.the.module.file.0.already.exist.and.will.be.overwritten=The module file ''{0}'' already exist.
warning.text.0.do.you.want.to.overwrite.these.files={0}\nWould you like to overwrite {1,choice,1#it|2#these files}?
title.select.jdk=Select JDK