From c3152e78927afd5c932e0fef62f036074fd27554 Mon Sep 17 00:00:00 2001 From: "Dmitry.Krasilschikov" Date: Wed, 24 May 2017 17:40:17 +0300 Subject: [PATCH] RUBY-19607 generify AbstractNewProjectStep --- .../util/projectWizard/AbstractNewProjectStep.java | 14 +++++++------- .../TemplateProjectDirectoryGenerator.java | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/AbstractNewProjectStep.java b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/AbstractNewProjectStep.java index c3459642df88..3dae69d31cf6 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/AbstractNewProjectStep.java +++ b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/AbstractNewProjectStep.java @@ -55,17 +55,17 @@ import java.util.List; import static com.intellij.platform.ProjectTemplatesFactory.CUSTOM_GROUP; -public class AbstractNewProjectStep extends DefaultActionGroup implements DumbAware { +public class AbstractNewProjectStep extends DefaultActionGroup implements DumbAware { private static final Logger LOG = Logger.getInstance(AbstractNewProjectStep.class); - protected AbstractNewProjectStep(@NotNull Customization customization) { + protected AbstractNewProjectStep(@NotNull Customization customization) { super("Select Project Type", true); - AbstractCallback callback = customization.createCallback(); + AbstractCallback callback = customization.createCallback(); ProjectSpecificAction projectSpecificAction = customization.createProjectSpecificAction(callback); addProjectSpecificAction(projectSpecificAction); - DirectoryProjectGenerator[] generators = customization.getProjectGenerators(); + DirectoryProjectGenerator[] generators = customization.getProjectGenerators(); customization.setUpBasicAction(projectSpecificAction, generators); addAll(customization.getActions(generators, callback)); @@ -105,7 +105,7 @@ public class AbstractNewProjectStep extends DefaultActionGroup implements DumbAw @NotNull - protected DirectoryProjectGenerator[] getProjectGenerators() { + protected DirectoryProjectGenerator[] getProjectGenerators() { return Extensions.getExtensions(DirectoryProjectGenerator.EP_NAME); } @@ -122,13 +122,13 @@ public class AbstractNewProjectStep extends DefaultActionGroup implements DumbAw } @NotNull - public AnAction[] getActions(@NotNull DirectoryProjectGenerator generator, @NotNull AbstractCallback callback) { + public AnAction[] getActions(@NotNull DirectoryProjectGenerator generator, @NotNull AbstractCallback callback) { if (shouldIgnore(generator)) { return AnAction.EMPTY_ARRAY; } ProjectSettingsStepBase step = generator instanceof CustomStepProjectGenerator ? - ((ProjectSettingsStepBase)((CustomStepProjectGenerator)generator).createStep(generator, callback)) : + ((ProjectSettingsStepBase)((CustomStepProjectGenerator)generator).createStep(generator, callback)) : createProjectSpecificSettingsStep(generator, callback); ProjectSpecificAction projectSpecificAction = new ProjectSpecificAction(generator, step); diff --git a/platform/lang-impl/src/com/intellij/platform/templates/TemplateProjectDirectoryGenerator.java b/platform/lang-impl/src/com/intellij/platform/templates/TemplateProjectDirectoryGenerator.java index 5573a619e560..b3f4fe97b72f 100644 --- a/platform/lang-impl/src/com/intellij/platform/templates/TemplateProjectDirectoryGenerator.java +++ b/platform/lang-impl/src/com/intellij/platform/templates/TemplateProjectDirectoryGenerator.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; -public class TemplateProjectDirectoryGenerator extends DirectoryProjectGenerator { +public class TemplateProjectDirectoryGenerator extends DirectoryProjectGenerator { private final LocalArchivedTemplate myTemplate; private final ModuleBuilder myModuleBuilder; @@ -55,7 +55,7 @@ public class TemplateProjectDirectoryGenerator extends DirectoryProjectGenerator @Override public void generateProject(@NotNull Project newProject, @NotNull VirtualFile baseDir, - @Nullable Object settings, + @Nullable T settings, @NotNull Module module) { throw new IllegalStateException("Usn't supposed to be invoked, use generateProject(String, String) instead."); }