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

create from checkout sources: do not override explicitly set project directory (IDEA-69299)

Browse Source
This commit is contained in:
anna
2011-05-16 21:22:47 +04:00
parent ef199042d8
commit 6a507f9085
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java
+4
View File
@@ -80,6 +80,10 @@ public class WizardContext {
"Projects";
}
public boolean isProjectFileDirectorySet() {
return myProjectFileDirectory != null;
}
public void setProjectFileDirectory(String projectFileDirectory) {
myProjectFileDirectory = projectFileDirectory;
}
plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseWorkspaceRootStep.java
+5 -1
View File
@@ -109,7 +109,11 @@ public class EclipseWorkspaceRootStep extends ProjectImportWizardStep {
public void updateStep() {
String path = getContext().getRootDirectory();
if (path == null) {
path = PropertiesComponent.getInstance().isValueSet(_ECLIPSE_PROJECT_DIR) ? PropertiesComponent.getInstance().getValue(_ECLIPSE_PROJECT_DIR) : getWizardContext().getProjectFileDirectory();
if (getWizardContext().isProjectFileDirectorySet() || !PropertiesComponent.getInstance().isValueSet(_ECLIPSE_PROJECT_DIR)) {
path = getWizardContext().getProjectFileDirectory();
} else {
path = PropertiesComponent.getInstance().getValue(_ECLIPSE_PROJECT_DIR);
}
}
myWorkspaceRootComponent.setText(path.replace('/', File.separatorChar));
myWorkspaceRootComponent.getTextField().selectAll();