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

notnull

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-08-05 13:14:54 +04:00
parent a0cb7ef884
commit f541853c60
29 changed files with 87 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class StepSequence {
myCommonFinishingSteps.add(Pair.create(step, suitableTypes));
}
public void addStepsForBuilder(AbstractModuleBuilder builder, WizardContext wizardContext, ModulesProvider modulesProvider) {
public void addStepsForBuilder(@NotNull AbstractModuleBuilder builder, @NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) {
String id = builder.getBuilderId();
if (!mySpecificSteps.containsKey(id)) {
mySpecificSteps.put(id, Arrays.asList(builder.createWizardSteps(wizardContext, modulesProvider)));
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java
+9 -2
View File
@@ -40,18 +40,21 @@ public class CreateFromScratchMode extends WizardMode {
@NonNls private final Map<String, ModuleBuilder> myBuildersMap = new HashMap<String, ModuleBuilder>();
@Override
@NotNull
public String getDisplayName(final WizardContext context) {
return ProjectBundle.message("project.new.wizard.from.scratch.title", context.getPresentationName());
}
@Override
@NotNull
public String getDescription(final WizardContext context) {
return ProjectBundle.message("project.new.wizard.from.scratch.description", ApplicationNamesInfo.getInstance().getFullProductName(), context.getPresentationName());
}
@Override
@Nullable
protected StepSequence createSteps(final WizardContext context, @NotNull final ModulesProvider modulesProvider) {
protected StepSequence createSteps(@NotNull final WizardContext context, @NotNull final ModulesProvider modulesProvider) {
List<ModuleBuilder> builders = ModuleBuilder.getAllBuilders();
for (ModuleBuilder builder : builders) {
myBuildersMap.put(builder.getBuilderId(), builder);
@@ -65,16 +68,19 @@ public class CreateFromScratchMode extends WizardMode {
return sequence;
}
@Override
public boolean isAvailable(WizardContext context) {
return true;
}
@Override
public ModuleBuilder getModuleBuilder() {
return myBuildersMap.get(getSelectedType());
}
@Override
public void onChosen(final boolean enabled) {
}
@Override
@@ -82,6 +88,7 @@ public class CreateFromScratchMode extends WizardMode {
return "Create from Scratch";
}
@Override
public void dispose() {
super.dispose();
myBuildersMap.clear();
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromSourcesMode.java
+1 -1
View File
@@ -58,7 +58,7 @@ public abstract class CreateFromSourcesMode extends WizardMode {
}
@Nullable
protected StepSequence createSteps(final WizardContext context, @NotNull final ModulesProvider modulesProvider) {
protected StepSequence createSteps(@NotNull final WizardContext context, @NotNull final ModulesProvider modulesProvider) {
final StepSequence sequence = new StepSequence();
addSteps(context, modulesProvider, sequence, null);
return sequence;
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java
+1 -1
View File
@@ -102,7 +102,7 @@ public class CreateFromTemplateMode extends WizardMode {
@Nullable
@Override
protected StepSequence createSteps(WizardContext context, @NotNull ModulesProvider modulesProvider) {
protected StepSequence createSteps(@NotNull WizardContext context, @NotNull ModulesProvider modulesProvider) {
MultiMap<TemplatesGroup, ProjectTemplate> map = getTemplatesMap(context);
StepSequence sequence = new StepSequence();
for (ProjectTemplate template : map.values()) {
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ImportImlMode extends WizardMode {
@Nullable
protected StepSequence createSteps(final WizardContext context, @NotNull final ModulesProvider modulesProvider) {
protected StepSequence createSteps(@NotNull final WizardContext context, @NotNull final ModulesProvider modulesProvider) {
return null;
}
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportMode.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class ImportMode extends WizardMode {
}
@Nullable
protected StepSequence createSteps(final WizardContext context, @NotNull final ModulesProvider modulesProvider) {
protected StepSequence createSteps(@NotNull final WizardContext context, @NotNull final ModulesProvider modulesProvider) {
final StepSequence stepSequence = new StepSequence();
if (myProviders.length > 1) {
stepSequence.addCommonStep(new ImportChooserStep(myProviders, stepSequence, context));
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/WizardMode.java
+3 -2
View File
@@ -46,7 +46,7 @@ public abstract class WizardMode implements Disposable {
public abstract boolean isAvailable(final WizardContext context);
@Nullable
public StepSequence getSteps(final WizardContext context, @NotNull final ModulesProvider modulesProvider) {
public StepSequence getSteps(@NotNull WizardContext context, @NotNull final ModulesProvider modulesProvider) {
if (myStepSequence == null) {
myStepSequence = createSteps(context, modulesProvider);
}
@@ -54,7 +54,7 @@ public abstract class WizardMode implements Disposable {
}
@Nullable
protected abstract StepSequence createSteps(final WizardContext context, @NotNull final ModulesProvider modulesProvider);
protected abstract StepSequence createSteps(@NotNull WizardContext context, @NotNull ModulesProvider modulesProvider);
@Nullable
public abstract ProjectBuilder getModuleBuilder();
@@ -70,6 +70,7 @@ public abstract class WizardMode implements Disposable {
return myStepSequence != null ? myStepSequence.getSelectedType() : null;
}
@Override
public void dispose() {
myStepSequence = null;
}
java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class JavaSettingsStep extends SdkSettingsStep {
private TextFieldWithBrowseButton mySourcePath;
private JPanel myPanel;
public JavaSettingsStep(SettingsStep settingsStep, ModuleBuilder moduleBuilder, @NotNull Condition<SdkTypeId> sdkFilter) {
public JavaSettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, @NotNull Condition<SdkTypeId> sdkFilter) {
super(settingsStep, moduleBuilder, sdkFilter);
mySourcePath.setText(PropertiesComponent.getInstance().getValue(MODULE_SOURCE_ROOT_KEY, DEFAULT_MODULE_SOURCE_ROOT_PATH));
myModuleBuilder = moduleBuilder;
java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java
+2 -2
View File
@@ -136,7 +136,7 @@ public class ProjectWizardStepFactoryImpl extends ProjectWizardStepFactory {
}
@Override
public ModuleWizardStep createSupportForFrameworksStep(WizardContext context, ModuleBuilder builder, ModulesProvider modulesProvider) {
public ModuleWizardStep createSupportForFrameworksStep(@NotNull WizardContext context, @NotNull ModuleBuilder builder, @NotNull ModulesProvider modulesProvider) {
Map<String,Boolean> availableFrameworks = builder.getAvailableFrameworks();
if (FrameworkSupportUtil.getProviders(builder).isEmpty() || availableFrameworks != null && availableFrameworks.isEmpty()) {
return null;
@@ -146,7 +146,7 @@ public class ProjectWizardStepFactoryImpl extends ProjectWizardStepFactory {
}
@Override
public ModuleWizardStep createJavaSettingsStep(SettingsStep settingsStep, ModuleBuilder moduleBuilder, @NotNull Condition<SdkTypeId> sdkFilter) {
public ModuleWizardStep createJavaSettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, @NotNull Condition<SdkTypeId> sdkFilter) {
return new JavaSettingsStep(settingsStep, moduleBuilder, sdkFilter);
}
}
java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class SdkSettingsStep extends ModuleWizardStep {
protected final ProjectSdksModel myModel;
private final ModuleBuilder myModuleBuilder;
public SdkSettingsStep(SettingsStep settingsStep, ModuleBuilder moduleBuilder, @NotNull Condition<SdkTypeId> sdkFilter) {
public SdkSettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, @NotNull Condition<SdkTypeId> sdkFilter) {
myModuleBuilder = moduleBuilder;
myWizardContext = settingsStep.getContext();
java/idea-ui/src/com/intellij/platform/templates/TemplateModuleBuilder.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class TemplateModuleBuilder extends ModuleBuilder {
}
@Override
public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, ModulesProvider modulesProvider) {
public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) {
ModuleBuilder builder = myType.createModuleBuilder();
builder.setAvailableFrameworks(Collections.<String, Boolean>emptyMap());
return builder.createWizardSteps(wizardContext, modulesProvider);
java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
+11 -6
View File
@@ -28,6 +28,7 @@ import com.intellij.psi.CommonClassNames;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -51,16 +52,19 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
super(id);
}
@NotNull
@Override
public JavaModuleBuilder createModuleBuilder() {
return new JavaModuleBuilder();
}
@NotNull
@Override
public String getName() {
return MODULE_NAME;
}
@NotNull
@Override
public String getDescription() {
return ProjectBundle.message("module.type.java.description");
@@ -76,9 +80,10 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
return getJavaModuleNodeIconClosed();
}
@NotNull
@Override
public ModuleWizardStep[] createWizardSteps(final WizardContext wizardContext, final JavaModuleBuilder moduleBuilder,
final ModulesProvider modulesProvider) {
public ModuleWizardStep[] createWizardSteps(@NotNull final WizardContext wizardContext, @NotNull final JavaModuleBuilder moduleBuilder,
@NotNull final ModulesProvider modulesProvider) {
final ProjectWizardStepFactory wizardFactory = ProjectWizardStepFactory.getInstance();
ArrayList<ModuleWizardStep> steps = new ArrayList<ModuleWizardStep>();
final ModuleWizardStep supportForFrameworksStep = wizardFactory.createSupportForFrameworksStep(wizardContext, moduleBuilder, modulesProvider);
@@ -91,7 +96,7 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
@Nullable
@Override
public ModuleWizardStep modifySettingsStep(SettingsStep settingsStep, final ModuleBuilder moduleBuilder) {
public ModuleWizardStep modifySettingsStep(@NotNull SettingsStep settingsStep, @NotNull final ModuleBuilder moduleBuilder) {
return ProjectWizardStepFactory.getInstance().createJavaSettingsStep(settingsStep, moduleBuilder, new Condition<SdkTypeId>() {
@Override
public boolean value(SdkTypeId sdkType) {
@@ -118,13 +123,13 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
}
@Override
public boolean isValidSdk(final Module module, final Sdk projectSdk) {
public boolean isValidSdk(@NotNull final Module module, final Sdk projectSdk) {
return isValidJavaSdk(module);
}
public static boolean isValidJavaSdk(final Module module) {
public static boolean isValidJavaSdk(@NotNull Module module) {
if (ModuleRootManager.getInstance(module).getSourceRoots().length == 0) return true;
return JavaPsiFacade.getInstance(module.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT,
return JavaPsiFacade.getInstance(module.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT,
module.getModuleWithLibrariesScope()) != null;
}
}
java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java
+2 -1
View File
@@ -33,6 +33,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
@@ -84,7 +85,7 @@ public class JavaModuleBuilder extends ModuleBuilder implements SourcePathsBuild
@Nullable
@Override
public ModuleWizardStep modifySettingsStep(SettingsStep settingsStep) {
public ModuleWizardStep modifySettingsStep(@NotNull SettingsStep settingsStep) {
return StdModuleTypes.JAVA.modifySettingsStep(settingsStep, this);
}
java/openapi/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactory.java
+3 -3
View File
@@ -47,7 +47,7 @@ public abstract class ProjectWizardStepFactory {
/**
* @deprecated Use another version of this method:
* @see com.intellij.ide.util.projectWizard.ProjectWizardStepFactory#createSourcePathsStep(WizardContext, SourcePathsBuilder, javax.swing.Icon, String)
* @see com.intellij.ide.util.projectWizard.ProjectWizardStepFactory#createSourcePathsStep(WizardContext, SourcePathsBuilder, javax.swing.Icon, String)
*/
public abstract ModuleWizardStep createSourcePathsStep(ModuleWizardStep nameAndLocationStep, SourcePathsBuilder builder, Icon icon, @NonNls String helpId);
@@ -72,7 +72,7 @@ public abstract class ProjectWizardStepFactory {
public abstract ModuleWizardStep createSupportForFrameworksStep(WizardContext context, ModuleBuilder builder);
@Nullable
public abstract ModuleWizardStep createSupportForFrameworksStep(WizardContext context, ModuleBuilder builder, ModulesProvider modulesProvider);
public abstract ModuleWizardStep createSupportForFrameworksStep(@NotNull WizardContext context, @NotNull ModuleBuilder builder, @NotNull ModulesProvider modulesProvider);
public abstract ModuleWizardStep createJavaSettingsStep(SettingsStep settingsStep, ModuleBuilder moduleBuilder, @NotNull Condition<SdkTypeId> sdkFilter);
public abstract ModuleWizardStep createJavaSettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, @NotNull Condition<SdkTypeId> sdkFilter);
}
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalModuleBuilder.java
+3 -3
View File
@@ -111,7 +111,7 @@ public abstract class AbstractExternalModuleBuilder<S extends ExternalProjectSet
}
@Override
public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, ModulesProvider modulesProvider) {
public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) {
return myExternalProjectSettingsControl == null
? ModuleWizardStep.EMPTY_ARRAY
: new ModuleWizardStep[]{new ExternalModuleSettingsStep<S>(myExternalProjectSettingsControl)};
@@ -164,13 +164,13 @@ public abstract class AbstractExternalModuleBuilder<S extends ExternalProjectSet
//noinspection unchecked
settings.linkProject(externalProjectSettings);
}
@NotNull
protected abstract S createSettings();
/**
* Asks external system-specific module builder to prepare external system config file if necessary.
*
*
* @param contentRootDir new module's content root dir
* @return external system config file created by the external system-specific implementation (if any);
* <code>null</code> as an indication that no external system config file has been created
platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java
+3 -2
View File
@@ -17,6 +17,7 @@ package com.intellij.ide.util.projectWizard;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -30,10 +31,10 @@ public abstract class AbstractModuleBuilder extends ProjectBuilder {
@Nullable
public abstract String getBuilderId();
public abstract ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, ModulesProvider modulesProvider);
public abstract ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider);
@Nullable
public ModuleWizardStep modifySettingsStep(SettingsStep settingsStep) {
public ModuleWizardStep modifySettingsStep(@NotNull SettingsStep settingsStep) {
return null;
}
platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
+3 -2
View File
@@ -59,6 +59,7 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder {
private final EventDispatcher<ModuleBuilderListener> myDispatcher = EventDispatcher.create(ModuleBuilderListener.class);
private Map<String, Boolean> myAvailableFrameworks;
@NotNull
public static List<ModuleBuilder> getAllBuilders() {
final ArrayList<ModuleBuilder> result = new ArrayList<ModuleBuilder>();
for (final ModuleType moduleType : ModuleTypeManager.getInstance().getRegisteredTypes()) {
@@ -87,7 +88,7 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder {
}
@Override
public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, ModulesProvider modulesProvider) {
public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) {
ModuleType moduleType = getModuleType();
return moduleType == null ? ModuleWizardStep.EMPTY_ARRAY : moduleType.createWizardSteps(wizardContext, this, modulesProvider);
}
@@ -102,7 +103,7 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder {
*/
@Override
@Nullable
public ModuleWizardStep modifySettingsStep(SettingsStep settingsStep) {
public ModuleWizardStep modifySettingsStep(@NotNull SettingsStep settingsStep) {
ModuleType type = getModuleType();
if (type == null) {
return null;
platform/lang-api/src/com/intellij/openapi/module/ModuleType.java
+13 -9
View File
@@ -30,15 +30,19 @@ import javax.swing.*;
public abstract class ModuleType<T extends ModuleBuilder> {
public static final ModuleType EMPTY;
@NotNull
private final String myId;
protected ModuleType(@NonNls String id) {
protected ModuleType(@NotNull @NonNls String id) {
myId = id;
}
@NotNull
public abstract T createModuleBuilder();
@NotNull
public abstract String getName();
@NotNull
public abstract String getDescription();
public abstract Icon getBigIcon();
@@ -48,16 +52,17 @@ public abstract class ModuleType<T extends ModuleBuilder> {
public abstract Icon getNodeIcon(@Deprecated boolean isOpened);
public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, T moduleBuilder, ModulesProvider modulesProvider) {
@NotNull
public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull T moduleBuilder, @NotNull ModulesProvider modulesProvider) {
return ModuleWizardStep.EMPTY_ARRAY;
}
@Nullable
public ModuleWizardStep modifySettingsStep(SettingsStep settingsStep, ModuleBuilder moduleBuilder) {
public ModuleWizardStep modifySettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder) {
return null;
}
@NotNull
public final String getId() {
return myId;
}
@@ -68,13 +73,11 @@ public abstract class ModuleType<T extends ModuleBuilder> {
final ModuleType moduleType = (ModuleType)o;
if (myId != null ? !myId.equals(moduleType.myId) : moduleType.myId != null) return false;
return true;
return myId.equals(moduleType.myId);
}
public final int hashCode() {
return myId != null ? myId.hashCode() : 0;
return myId.hashCode();
}
public String toString() {
@@ -85,6 +88,7 @@ public abstract class ModuleType<T extends ModuleBuilder> {
EMPTY = instantiate("com.intellij.openapi.module.EmptyModuleType");
}
@NotNull
private static ModuleType instantiate(String className) {
try {
return (ModuleType)Class.forName(className).newInstance();
@@ -94,7 +98,7 @@ public abstract class ModuleType<T extends ModuleBuilder> {
}
}
public boolean isValidSdk(final Module module, @Nullable final Sdk projectSdk) {
public boolean isValidSdk(@NotNull Module module, @Nullable final Sdk projectSdk) {
return true;
}
platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java
+1
View File
@@ -31,6 +31,7 @@ import org.jetbrains.annotations.Nullable;
*/
public class DefaultModulesProvider implements ModulesProvider {
@NotNull
public static ModulesProvider createForProject(@Nullable Project project) {
return project == null ? EMPTY_MODULES_PROVIDER : new DefaultModulesProvider(project);
}
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
+1 -1
View File
@@ -391,7 +391,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp
}
}
private void runGlobalTools(AnalysisScope scope, InspectionManagerEx inspectionManager, List<Tools> globalTools) {
private void runGlobalTools(@NotNull AnalysisScope scope, @NotNull InspectionManagerEx inspectionManager, @NotNull List<Tools> globalTools) {
final List<InspectionToolWrapper> needRepeatSearchRequest = new ArrayList<InspectionToolWrapper>();
for (Tools tools : globalTools) {
platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java
+4
View File
@@ -19,6 +19,7 @@ import com.intellij.icons.AllIcons;
import com.intellij.ide.util.projectWizard.EmptyModuleBuilder;
import com.intellij.openapi.project.ProjectBundle;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -39,16 +40,19 @@ public class EmptyModuleType extends ModuleType<EmptyModuleBuilder> {
super(id);
}
@NotNull
@Override
public EmptyModuleBuilder createModuleBuilder() {
return new EmptyModuleBuilder();
}
@NotNull
@Override
public String getName() {
return ProjectBundle.message("module.type.empty.name");
}
@NotNull
@Override
public String getDescription() {
return ProjectBundle.message("module.type.empty.description");
platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java
+6 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.ide.util.projectWizard.ModuleWizardStep;
import com.intellij.ide.util.projectWizard.WizardContext;
import com.intellij.openapi.project.ProjectBundle;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -32,16 +33,19 @@ public class UnknownModuleType extends ModuleType {
myModuleType = moduleType;
}
@NotNull
@Override
public ModuleBuilder createModuleBuilder() {
return myModuleType.createModuleBuilder();
}
@NotNull
@Override
public String getName() {
return ProjectBundle.message("module.type.unknown.name", myModuleType.getName());
}
@NotNull
@Override
public String getDescription() {
return myModuleType.getDescription();
@@ -57,8 +61,9 @@ public class UnknownModuleType extends ModuleType {
return myModuleType.getIcon();
}
@NotNull
@Override
public ModuleWizardStep[] createWizardSteps(final WizardContext wizardContext, final ModuleBuilder moduleBuilder, final ModulesProvider modulesProvider) {
public ModuleWizardStep[] createWizardSteps(@NotNull final WizardContext wizardContext, @NotNull final ModuleBuilder moduleBuilder, @NotNull final ModulesProvider modulesProvider) {
return myModuleType.createWizardSteps(wizardContext, moduleBuilder, modulesProvider);
}
platform/lang-impl/src/com/intellij/openapi/module/WebModuleBuilder.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class WebModuleBuilder extends ModuleBuilder {
@Nullable
@Override
public ModuleWizardStep modifySettingsStep(SettingsStep settingsStep) {
public ModuleWizardStep modifySettingsStep(@NotNull SettingsStep settingsStep) {
if (myTemplate == null) {
return super.modifySettingsStep(settingsStep);
}
platform/lang-impl/src/com/intellij/openapi/module/WebModuleType.java
+1
View File
@@ -13,6 +13,7 @@ public class WebModuleType extends WebModuleTypeBase<ModuleBuilder> {
return (WebModuleType)ModuleTypeManager.getInstance().findByID(WEB_MODULE);
}
@NotNull
@Override
public ModuleBuilder createModuleBuilder() {
return new WebModuleBuilder();
platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java
+3
View File
@@ -19,6 +19,7 @@ import com.intellij.icons.AllIcons;
import com.intellij.ide.util.projectWizard.ModuleBuilder;
import com.intellij.openapi.project.ProjectBundle;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -32,11 +33,13 @@ public abstract class WebModuleTypeBase<T extends ModuleBuilder> extends ModuleT
super(WEB_MODULE);
}
@NotNull
@Override
public String getName() {
return ProjectBundle.message("module.web.title");
}
@NotNull
@Override
public String getDescription() {
return ProjectBundle.message("module.web.description");
plugins/devkit/src/module/PluginModuleType.java
+4 -1
View File
@@ -54,14 +54,17 @@ public class PluginModuleType extends ModuleType<PluginModuleBuilder> {
return get(module) instanceof PluginModuleType;
}
@NotNull
public PluginModuleBuilder createModuleBuilder() {
return new PluginModuleBuilder();
}
@NotNull
public String getName() {
return DevKitBundle.message("module.title");
}
@NotNull
public String getDescription() {
return DevKitBundle.message("module.description");
}
@@ -117,7 +120,7 @@ public class PluginModuleType extends ModuleType<PluginModuleBuilder> {
}
@Override
public boolean isValidSdk(final Module module, final Sdk projectSdk) {
public boolean isValidSdk(@NotNull final Module module, final Sdk projectSdk) {
return JavaModuleType.isValidJavaSdk(module);
}
plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java
+2 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.ide.util.projectWizard.ModuleWizardStep;
import com.intellij.ide.util.projectWizard.WizardContext;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import icons.JetgroovyIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.mvc.GroovySdkForNewModuleWizardStep;
import org.jetbrains.plugins.groovy.mvc.MvcFramework;
@@ -47,7 +48,7 @@ public class GroovyAwareModuleBuilder extends JavaModuleBuilder {
}
@Override
public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, ModulesProvider modulesProvider) {
public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) {
return new ModuleWizardStep[]{new GroovySdkForNewModuleWizardStep(this, wizardContext, getFramework())};
}
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleBuilder.java
+2 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.ide.util.projectWizard.SdkSettingsStep;
import com.intellij.ide.util.projectWizard.SettingsStep;
import com.intellij.openapi.projectRoots.SdkTypeId;
import com.intellij.openapi.util.Condition;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.config.GroovyAwareModuleBuilder;
@@ -44,7 +45,7 @@ public class MvcModuleBuilder extends GroovyAwareModuleBuilder {
@Nullable
@Override
public ModuleWizardStep modifySettingsStep(SettingsStep settingsStep) {
public ModuleWizardStep modifySettingsStep(@NotNull SettingsStep settingsStep) {
return new SdkSettingsStep(settingsStep, this, new Condition<SdkTypeId>() {
@Override
public boolean value(SdkTypeId sdkType) {
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java
+2 -1
View File
@@ -35,6 +35,7 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import icons.MavenIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.model.MavenArchetype;
import org.jetbrains.idea.maven.model.MavenId;
import org.jetbrains.idea.maven.project.MavenEnvironmentForm;
@@ -119,7 +120,7 @@ public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuil
}
@Override
public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, ModulesProvider modulesProvider) {
public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) {
return new ModuleWizardStep[]{
new MavenModuleWizardStep(wizardContext.getProject(), this, wizardContext),
new SelectPropertiesStep(wizardContext.getProject(), this)