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

reworked new web2py project creation

Browse Source
This commit is contained in:
Ekaterina Tuzova
2014-06-12 18:57:04 +04:00
parent 6c7ba8d799
commit 5193eabc66
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java
+10 -4
View File
@@ -231,6 +231,9 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
public boolean checkValid() {
final String projectName = myLocationField.getText();
setErrorText(null);
myInstallFramework = false;
if (projectName.trim().isEmpty()) {
setErrorText("Project name can't be empty");
return false;
@@ -246,7 +249,12 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
setErrorText(validationResult.getErrorMessage());
return false;
}
if (myProjectGenerator instanceof PythonProjectGenerator) {
final ValidationResult warningResult = ((PythonProjectGenerator)myProjectGenerator).warningValitation();
if (!warningResult.isOk()) {
setWarningText(warningResult.getErrorMessage());
}
}
if (myProjectGenerator instanceof WebProjectTemplate) {
final ValidationInfo validationInfo = ((WebProjectTemplate)myProjectGenerator).getPeer().validate();
if (validationInfo != null) {
@@ -257,8 +265,6 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
}
final Sdk sdk = getSdk();
setErrorText(null);
myInstallFramework = false;
final boolean isPy3k = sdk != null && PythonSdkType.getLanguageLevelForSdk(sdk).isPy3K();
if (sdk != null && PythonSdkType.isRemote(sdk) && !acceptsRemoteSdk(myProjectGenerator)) {
@@ -305,7 +311,7 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
}
public void setWarningText(@Nullable String text) {
myErrorLabel.setText("Note: " + text);
myErrorLabel.setText("Note: " + text + " ");
myErrorLabel.setForeground(JBColor.YELLOW);
}
python/openapi/src/com/jetbrains/python/newProject/PythonProjectGenerator.java
+5
View File
@@ -1,5 +1,6 @@
package com.jetbrains.python.newProject;
import com.intellij.facet.ui.ValidationResult;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
@@ -21,6 +22,10 @@ public abstract class PythonProjectGenerator {
return new PyNewProjectSettings();
}
public ValidationResult warningValitation() {
return ValidationResult.OK;
}
public void addSettingsStateListener(@NotNull SettingsListener listener) {
myListeners.add(listener);
}