From bee311bce7b31ed173db3fe4ad84a063463dd354 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 13 Apr 2017 08:00:07 +0200 Subject: [PATCH] =?UTF-8?q?cleanup=20=E2=80=94=20default=20implementation?= =?UTF-8?q?=20of=20RunProfileWithCompileBeforeLaunchOption.getModules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intellij/javadoc/JavadocGeneratorRunProfile.java | 7 +------ .../RunProfileWithCompileBeforeLaunchOption.java | 6 ++++-- .../configurations/RuntimeConfiguration.java | 10 +--------- .../junit/RuntimeConfigurationProducer.java | 9 +-------- .../src/com/intellij/tools/ToolRunProfile.java | 9 +-------- .../sm/runner/MockRuntimeConfiguration.java | 12 +++--------- .../ant/config/execution/AntRunConfiguration.java | 9 +-------- .../gradle/action/GradleRerunFailedTestsAction.java | 8 +------- .../idea/maven/execution/MavenRunConfiguration.java | 7 ------- 9 files changed, 13 insertions(+), 64 deletions(-) diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocGeneratorRunProfile.java b/java/java-impl/src/com/intellij/javadoc/JavadocGeneratorRunProfile.java index cfff53105259..f36fe20cca2f 100644 --- a/java/java-impl/src/com/intellij/javadoc/JavadocGeneratorRunProfile.java +++ b/java/java-impl/src/com/intellij/javadoc/JavadocGeneratorRunProfile.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,11 +91,6 @@ public class JavadocGeneratorRunProfile implements ModuleRunProfile { return null; } - @NotNull - public Module[] getModules() { - return Module.EMPTY_ARRAY; - } - private static class MyJavaCommandLineState extends CommandLineState { private final AnalysisScope myGenerationOptions; private final Project myProject; diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunProfileWithCompileBeforeLaunchOption.java b/platform/lang-api/src/com/intellij/execution/configurations/RunProfileWithCompileBeforeLaunchOption.java index c3842a97725f..28c171279c45 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/RunProfileWithCompileBeforeLaunchOption.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/RunProfileWithCompileBeforeLaunchOption.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,5 +29,7 @@ public interface RunProfileWithCompileBeforeLaunchOption extends RunProfile { * @return modules to compile before run. Empty list to build project */ @NotNull - Module[] getModules(); + default Module[] getModules() { + return Module.EMPTY_ARRAY; + } } \ No newline at end of file diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java index 398415ab4d49..777e3e3e1da1 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,7 @@ package com.intellij.execution.configurations; -import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -29,12 +27,6 @@ public abstract class RuntimeConfiguration extends LocatableConfigurationBase im super(project, factory, name); } - @Override - @NotNull - public Module[] getModules() { - return Module.EMPTY_ARRAY; - } - @Override public RuntimeConfiguration clone() { return (RuntimeConfiguration)super.clone(); diff --git a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java index 3d0e08812b1b..a43e6f5766fc 100644 --- a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java +++ b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ import com.intellij.execution.configurations.*; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; -import com.intellij.openapi.module.Module; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.InvalidDataException; @@ -229,11 +228,5 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea public T getPeer() { return myConfig; } - - @Override - @NotNull - public Module[] getModules() { - return Module.EMPTY_ARRAY; - } } } diff --git a/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java b/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java index 94ffbb340422..e78034d7cb97 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,6 @@ import com.intellij.ide.macro.Macro; import com.intellij.ide.macro.MacroManager; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import org.jetbrains.annotations.NotNull; @@ -82,12 +81,6 @@ public class ToolRunProfile implements ModuleRunProfile{ return null; } - @Override - @NotNull - public Module[] getModules() { - return Module.EMPTY_ARRAY; - } - @Override public RunProfileState getState(@NotNull final Executor executor, @NotNull final ExecutionEnvironment env) { final Project project = env.getProject(); diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockRuntimeConfiguration.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockRuntimeConfiguration.java index 2ccb61c7c7f8..94fa7a434d94 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockRuntimeConfiguration.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockRuntimeConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ import com.intellij.execution.ExecutionException; import com.intellij.execution.Executor; import com.intellij.execution.configurations.*; import com.intellij.execution.runners.ExecutionEnvironment; -import com.intellij.openapi.module.Module; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.InvalidDataException; @@ -58,19 +57,14 @@ public class MockRuntimeConfiguration extends LocatableConfigurationBase impleme return null; } - @NotNull - @Override - public Module[] getModules() { - return Module.EMPTY_ARRAY; - } - private static class MockConfigurationFactory extends ConfigurationFactory { public MockConfigurationFactory() { super(new MyConfigurationType()); } + @NotNull @Override - public RunConfiguration createTemplateConfiguration(Project project) { + public RunConfiguration createTemplateConfiguration(@NotNull Project project) { return new MockRuntimeConfiguration(project); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunConfiguration.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunConfiguration.java index 53e83c560a71..e5cf919e08ed 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunConfiguration.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ import com.intellij.lang.ant.config.AntConfiguration; import com.intellij.lang.ant.config.impl.BuildFileProperty; import com.intellij.lang.ant.config.impl.GlobalAntConfiguration; import com.intellij.lang.ant.config.impl.TargetChooserDialog; -import com.intellij.openapi.module.Module; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; @@ -65,12 +64,6 @@ public class AntRunConfiguration extends LocatableConfigurationBase implements R return configuration; } - @NotNull - @Override - public Module[] getModules() { - return Module.EMPTY_ARRAY; - } - @NotNull @Override public SettingsEditor getConfigurationEditor() { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleRerunFailedTestsAction.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleRerunFailedTestsAction.java index f26953d12bf5..aa20ce84e4d1 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleRerunFailedTestsAction.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleRerunFailedTestsAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,12 +56,6 @@ public class GradleRerunFailedTestsAction extends JavaRerunFailedTestsAction { ExternalSystemRunConfiguration configuration = (ExternalSystemRunConfiguration)myConsoleProperties.getConfiguration(); final List failedTests = getFailedTests(configuration.getProject()); return new MyRunProfile(configuration) { - @NotNull - @Override - public Module[] getModules() { - return Module.EMPTY_ARRAY; - } - @Nullable @Override public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment environment) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java index 9adfe36a0619..6ea2399638fa 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java @@ -23,7 +23,6 @@ import com.intellij.execution.process.ProcessAdapter; import com.intellij.execution.process.ProcessEvent; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; -import com.intellij.openapi.module.Module; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.options.SettingsEditorGroup; import com.intellij.openapi.project.Project; @@ -111,12 +110,6 @@ public class MavenRunConfiguration extends LocatableConfigurationBase implements MavenProjectsManager.getInstance(getProject()).updateProjectTargetFolders(); } - @Override - @NotNull - public Module[] getModules() { - return Module.EMPTY_ARRAY; - } - @Nullable public MavenGeneralSettings getGeneralSettings() { return mySettings.myGeneralSettings;