From f541853c60f6a992c92396c65a65ef93ca12c3ec Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 2 Aug 2013 12:25:57 +0400 Subject: [PATCH] notnull --- .../util/newProjectWizard/StepSequence.java | 2 +- .../modes/CreateFromScratchMode.java | 11 ++++++++-- .../modes/CreateFromSourcesMode.java | 2 +- .../modes/CreateFromTemplateMode.java | 2 +- .../newProjectWizard/modes/ImportImlMode.java | 2 +- .../newProjectWizard/modes/ImportMode.java | 2 +- .../newProjectWizard/modes/WizardMode.java | 5 +++-- .../util/projectWizard/JavaSettingsStep.java | 2 +- .../ProjectWizardStepFactoryImpl.java | 4 ++-- .../util/projectWizard/SdkSettingsStep.java | 2 +- .../templates/TemplateModuleBuilder.java | 2 +- .../openapi/module/JavaModuleType.java | 17 +++++++++----- .../util/projectWizard/JavaModuleBuilder.java | 3 ++- .../ProjectWizardStepFactory.java | 6 ++--- .../wizard/AbstractExternalModuleBuilder.java | 6 ++--- .../projectWizard/AbstractModuleBuilder.java | 5 +++-- .../ide/util/projectWizard/ModuleBuilder.java | 5 +++-- .../intellij/openapi/module/ModuleType.java | 22 +++++++++++-------- .../configuration/DefaultModulesProvider.java | 1 + .../ex/GlobalInspectionContextImpl.java | 2 +- .../openapi/module/EmptyModuleType.java | 4 ++++ .../openapi/module/UnknownModuleType.java | 7 +++++- .../openapi/module/WebModuleBuilder.java | 2 +- .../openapi/module/WebModuleType.java | 1 + .../openapi/module/WebModuleTypeBase.java | 3 +++ .../devkit/src/module/PluginModuleType.java | 5 ++++- .../config/GroovyAwareModuleBuilder.java | 3 ++- .../plugins/groovy/mvc/MvcModuleBuilder.java | 3 ++- .../maven/wizards/MavenModuleBuilder.java | 3 ++- 29 files changed, 87 insertions(+), 47 deletions(-) diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java index dc7336b7e13d..3b3acf09fb0c 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java @@ -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))); diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java index cac536b463e2..bc10c316e6d7 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java @@ -40,18 +40,21 @@ public class CreateFromScratchMode extends WizardMode { @NonNls private final Map myBuildersMap = new HashMap(); + @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 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(); diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromSourcesMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromSourcesMode.java index 961eb77adb1b..ac14c7266120 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromSourcesMode.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromSourcesMode.java @@ -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; diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java index e8f8c9057d78..81aff5b35919 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java @@ -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 map = getTemplatesMap(context); StepSequence sequence = new StepSequence(); for (ProjectTemplate template : map.values()) { diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java index 5a88ab894cc5..80b977447eae 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java @@ -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; } diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportMode.java index 6c94172ff4f4..27474cc2c098 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportMode.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportMode.java @@ -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)); diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/WizardMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/WizardMode.java index bf490a881515..0fe5c08f789a 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/WizardMode.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/WizardMode.java @@ -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; } diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java index 8c6f0dca6cc0..3ac5962fbd30 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java @@ -52,7 +52,7 @@ public class JavaSettingsStep extends SdkSettingsStep { private TextFieldWithBrowseButton mySourcePath; private JPanel myPanel; - public JavaSettingsStep(SettingsStep settingsStep, ModuleBuilder moduleBuilder, @NotNull Condition sdkFilter) { + public JavaSettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, @NotNull Condition sdkFilter) { super(settingsStep, moduleBuilder, sdkFilter); mySourcePath.setText(PropertiesComponent.getInstance().getValue(MODULE_SOURCE_ROOT_KEY, DEFAULT_MODULE_SOURCE_ROOT_PATH)); myModuleBuilder = moduleBuilder; diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java index 0d16ad55d443..2674cd69ffdb 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactoryImpl.java @@ -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 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 sdkFilter) { + public ModuleWizardStep createJavaSettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, @NotNull Condition sdkFilter) { return new JavaSettingsStep(settingsStep, moduleBuilder, sdkFilter); } } diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java index 2e5710a1fa42..1c069bfccfcd 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java @@ -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 sdkFilter) { + public SdkSettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, @NotNull Condition sdkFilter) { myModuleBuilder = moduleBuilder; myWizardContext = settingsStep.getContext(); diff --git a/java/idea-ui/src/com/intellij/platform/templates/TemplateModuleBuilder.java b/java/idea-ui/src/com/intellij/platform/templates/TemplateModuleBuilder.java index 4b0727abd148..6d5aa8c1f980 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/TemplateModuleBuilder.java +++ b/java/idea-ui/src/com/intellij/platform/templates/TemplateModuleBuilder.java @@ -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.emptyMap()); return builder.createWizardSteps(wizardContext, modulesProvider); diff --git a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java index 4fb49778d67a..a86e3a6b7e7c 100644 --- a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java +++ b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java @@ -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 { 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 { 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 steps = new ArrayList(); final ModuleWizardStep supportForFrameworksStep = wizardFactory.createSupportForFrameworksStep(wizardContext, moduleBuilder, modulesProvider); @@ -91,7 +96,7 @@ public class JavaModuleType extends ModuleType { @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() { @Override public boolean value(SdkTypeId sdkType) { @@ -118,13 +123,13 @@ public class JavaModuleType extends ModuleType { } @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; } } diff --git a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java index b7224d01c327..655dc956c399 100644 --- a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java +++ b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java @@ -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); } diff --git a/java/openapi/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactory.java b/java/openapi/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactory.java index 9cb5fa0896dc..ddb43f8048c9 100644 --- a/java/openapi/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactory.java +++ b/java/openapi/src/com/intellij/ide/util/projectWizard/ProjectWizardStepFactory.java @@ -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 sdkFilter); + public abstract ModuleWizardStep createJavaSettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, @NotNull Condition sdkFilter); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalModuleBuilder.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalModuleBuilder.java index e5923127ec1d..b29ddff9714d 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalModuleBuilder.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalModuleBuilder.java @@ -111,7 +111,7 @@ public abstract class AbstractExternalModuleBuilder(myExternalProjectSettingsControl)}; @@ -164,13 +164,13 @@ public abstract class AbstractExternalModuleBuildernull as an indication that no external system config file has been created diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java index c3729f28421c..665b59337c61 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java @@ -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; } diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java index f35f54cc33e8..f14cd7aaf063 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java @@ -59,6 +59,7 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder { private final EventDispatcher myDispatcher = EventDispatcher.create(ModuleBuilderListener.class); private Map myAvailableFrameworks; + @NotNull public static List getAllBuilders() { final ArrayList result = new ArrayList(); 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; diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java index 48674d281811..a98a0d8622b8 100644 --- a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java +++ b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java @@ -30,15 +30,19 @@ import javax.swing.*; public abstract class ModuleType { 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 { 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 { 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 { 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 { } } - public boolean isValidSdk(final Module module, @Nullable final Sdk projectSdk) { + public boolean isValidSdk(@NotNull Module module, @Nullable final Sdk projectSdk) { return true; } diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java index d4d16f61e693..8277777321a4 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java @@ -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); } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java index f53380e69c4c..370fabdb6c93 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java @@ -391,7 +391,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp } } - private void runGlobalTools(AnalysisScope scope, InspectionManagerEx inspectionManager, List globalTools) { + private void runGlobalTools(@NotNull AnalysisScope scope, @NotNull InspectionManagerEx inspectionManager, @NotNull List globalTools) { final List needRepeatSearchRequest = new ArrayList(); for (Tools tools : globalTools) { diff --git a/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java b/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java index ecd6d1b1a4f2..654705c1f3cd 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java @@ -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 { 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"); diff --git a/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java b/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java index 4336e6fdc024..9c312618dd8d 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/UnknownModuleType.java @@ -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); } diff --git a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleBuilder.java b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleBuilder.java index c57513e1ecea..cee30d38edf2 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleBuilder.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleBuilder.java @@ -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); } diff --git a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleType.java b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleType.java index 52bafb251fd4..0975a2cbba66 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleType.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleType.java @@ -13,6 +13,7 @@ public class WebModuleType extends WebModuleTypeBase { return (WebModuleType)ModuleTypeManager.getInstance().findByID(WEB_MODULE); } + @NotNull @Override public ModuleBuilder createModuleBuilder() { return new WebModuleBuilder(); diff --git a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java index c818a157809a..f52b26f8b7fe 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java @@ -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 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"); diff --git a/plugins/devkit/src/module/PluginModuleType.java b/plugins/devkit/src/module/PluginModuleType.java index 855f4b1e343c..56bc22db96f6 100644 --- a/plugins/devkit/src/module/PluginModuleType.java +++ b/plugins/devkit/src/module/PluginModuleType.java @@ -54,14 +54,17 @@ public class PluginModuleType extends ModuleType { 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 { } @Override - public boolean isValidSdk(final Module module, final Sdk projectSdk) { + public boolean isValidSdk(@NotNull final Module module, final Sdk projectSdk) { return JavaModuleType.isValidJavaSdk(module); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java index ff5f811bcfea..427708680b9d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java @@ -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())}; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleBuilder.java index 8bf6e07c8fa4..2b3176bac36c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleBuilder.java @@ -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() { @Override public boolean value(SdkTypeId sdkType) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java index 4933ee3469c1..6133b9e207d0 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java @@ -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)