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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Maxim Kropotov
2016-12-21 15:30:14 +03:00
parent f8c09dd420 d9313b23ad
commit 386b8e0891
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/projectWizard/ModuleNameLocationComponent.java
+7 -4
View File
@@ -18,10 +18,7 @@ package com.intellij.ide.projectWizard;
import com.intellij.ide.IdeBundle;
import com.intellij.ide.highlighter.ModuleFileType;
import com.intellij.ide.util.BrowseFilesListener;
import com.intellij.ide.util.projectWizard.AbstractModuleBuilder;
import com.intellij.ide.util.projectWizard.NamePathComponent;
import com.intellij.ide.util.projectWizard.ProjectWizardUtil;
import com.intellij.ide.util.projectWizard.WizardContext;
import com.intellij.ide.util.projectWizard.*;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.options.ConfigurationException;
@@ -71,6 +68,9 @@ public class ModuleNameLocationComponent {
return ((AbstractModuleBuilder)myWizardContext.getProjectBuilder());
}
/**
* @see ModuleWizardStep#validate()
*/
public boolean validate() throws ConfigurationException {
AbstractModuleBuilder builder = getModuleBuilder();
if (builder != null && !builder.validateModuleName(getModuleName())) return false;
@@ -79,6 +79,9 @@ public class ModuleNameLocationComponent {
return true;
}
/**
* @see ModuleWizardStep#updateDataModel()
*/
public void updateDataModel() {
AbstractModuleBuilder moduleBuilder = getModuleBuilder();
if (moduleBuilder == null) return;
platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleWizardStep.java
+6
View File
@@ -45,6 +45,12 @@ public abstract class ModuleWizardStep extends StepAdapter {
return null;
}
/**
* Validates user input before {@link #updateDataModel()} is called.
*
* @return {@code true} if input is valid, {@code false} otherwise
* @throws ConfigurationException if input is not valid and needs user attention. Exception message will be displayed to user
*/
public boolean validate() throws ConfigurationException {
return true;
}