From 20e3cc86adfa98933806996fd6c3e856f102ab55 Mon Sep 17 00:00:00 2001 From: "Nikolay.Tropin" Date: Wed, 18 Dec 2019 18:13:48 +0300 Subject: [PATCH] fix raw type in all implementations of RunProfileState.execute GitOrigin-RevId: 4ffa418429f3f874af75564706c2db2e201da984 --- .../impl/src/com/intellij/debugger/engine/RemoteStateState.java | 2 +- .../com/intellij/execution/JavaTestFrameworkRunnableState.java | 2 +- .../service/RemoteExternalSystemCommunicationManager.java | 2 +- .../service/execution/ExternalSystemRunnableState.java | 2 +- .../com/intellij/execution/configurations/CommandLineState.java | 2 +- .../intellij/execution/configuration/EmptyRunProfileState.java | 2 +- platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java | 2 +- .../com/intellij/execution/impl/FakeRunConfiguration.java | 2 +- .../intellij/remoteServer/impl/runtime/DeployToServerState.java | 2 +- .../execution/testframework/sm/SMTestRunnerConnectionUtil.java | 2 +- .../sm/runner/history/ImportedTestRunnableState.java | 2 +- .../intellij/lang/ant/config/execution/AntRunProfileState.java | 2 +- .../jetbrains/idea/maven/execution/MavenRunConfiguration.java | 2 +- .../org/jetbrains/idea/maven/server/MavenServerManager.java | 2 +- .../src/com/intellij/sh/run/ShRunConfigurationProfileState.java | 2 +- .../src/com/intellij/uiDesigner/actions/PreviewFormAction.java | 2 +- python/src/com/jetbrains/python/run/PythonCommandLineState.java | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/RemoteStateState.java b/java/debugger/impl/src/com/intellij/debugger/engine/RemoteStateState.java index d70d6243512c..b2ab1092c325 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/RemoteStateState.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/RemoteStateState.java @@ -31,7 +31,7 @@ public class RemoteStateState implements RemoteState { } @Override - public ExecutionResult execute(final Executor executor, @NotNull final ProgramRunner runner) throws ExecutionException { + public ExecutionResult execute(final Executor executor, @NotNull final ProgramRunner runner) throws ExecutionException { ConsoleViewImpl consoleView = new ConsoleViewImpl(myProject, false); RemoteDebugProcessHandler process = new RemoteDebugProcessHandler(myProject, myAutoRestart); consoleView.attachToProcess(process); diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java index 8a6666979ab1..9c70a7795215 100644 --- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java +++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java @@ -146,7 +146,7 @@ public abstract class JavaTestFrameworkRunnableState runner) throws ExecutionException { final RunnerSettings runnerSettings = getRunnerSettings(); final SMTRunnerConsoleProperties testConsoleProperties = getConfiguration().createTestConsoleProperties(executor); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/RemoteExternalSystemCommunicationManager.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/RemoteExternalSystemCommunicationManager.java index 3dc0c11c1e04..a5ec15934476 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/RemoteExternalSystemCommunicationManager.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/RemoteExternalSystemCommunicationManager.java @@ -170,7 +170,7 @@ public final class RemoteExternalSystemCommunicationManager implements ExternalS @Override @NotNull - public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { + public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { ProcessHandler processHandler = startProcess(); return new DefaultExecutionResult(processHandler); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunnableState.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunnableState.java index 26a4a7ae7a5c..1f2214ab9aa8 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunnableState.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunnableState.java @@ -113,7 +113,7 @@ public class ExternalSystemRunnableState extends UserDataHolderBase implements R @Nullable @Override - public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { + public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { if (myProject.isDisposed()) return null; String jvmParametersSetup = getJvmParametersSetup(); diff --git a/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java b/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java index 4283a5d6e172..298b67303d1c 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java @@ -57,7 +57,7 @@ public abstract class CommandLineState implements RunProfileState { @Override @NotNull - public ExecutionResult execute(@NotNull final Executor executor, @NotNull final ProgramRunner runner) throws ExecutionException { + public ExecutionResult execute(@NotNull final Executor executor, @NotNull final ProgramRunner runner) throws ExecutionException { final ProcessHandler processHandler = startProcess(); final ConsoleView console = createConsole(executor); if (console != null) { diff --git a/platform/lang-impl/src/com/intellij/execution/configuration/EmptyRunProfileState.java b/platform/lang-impl/src/com/intellij/execution/configuration/EmptyRunProfileState.java index 5622adc1a2db..8da98acaff16 100644 --- a/platform/lang-impl/src/com/intellij/execution/configuration/EmptyRunProfileState.java +++ b/platform/lang-impl/src/com/intellij/execution/configuration/EmptyRunProfileState.java @@ -15,7 +15,7 @@ public final class EmptyRunProfileState implements RunProfileState { @Nullable @Override - public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) { + public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) { return null; } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java b/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java index cf4532e82605..2205841bc9b8 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java @@ -93,7 +93,7 @@ public class ToolRunProfile implements ModuleRunProfile{ @Override @NotNull - public ExecutionResult execute(@NotNull final Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { + public ExecutionResult execute(@NotNull final Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { final ExecutionResult result = super.execute(executor, runner); final ProcessHandler processHandler = result.getProcessHandler(); if (processHandler != null) { diff --git a/platform/lang-impl/testSources/com/intellij/execution/impl/FakeRunConfiguration.java b/platform/lang-impl/testSources/com/intellij/execution/impl/FakeRunConfiguration.java index 92a1f69426a3..5fb7ab3b3064 100644 --- a/platform/lang-impl/testSources/com/intellij/execution/impl/FakeRunConfiguration.java +++ b/platform/lang-impl/testSources/com/intellij/execution/impl/FakeRunConfiguration.java @@ -60,7 +60,7 @@ public class FakeRunConfiguration extends LocatableConfigurationBase { public class FakeRunProfileState implements RunProfileState { @Nullable @Override - public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) { + public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) { return new DefaultExecutionResult(null, new FakeProcessHandler(mySurviveSoftKill)); } } diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/DeployToServerState.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/DeployToServerState.java index 143f66610178..1c889342e7a7 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/DeployToServerState.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/DeployToServerState.java @@ -54,7 +54,7 @@ public class DeployToServerState runner) throws ExecutionException { final ServerConnection connection = ServerConnectionManager.getInstance().getOrCreateConnection(myServer); final Project project = myEnvironment.getProject(); RemoteServersView.getInstance(project).showServerConnection(connection); diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java index 54acf51c905e..796d6d7ff69c 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java @@ -52,7 +52,7 @@ public class SMTestRunnerConnectionUtil { * // ... * * @Override - * public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { + * public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { * ProcessHandler processHandler = startProcess(); * RunConfiguration runConfiguration = getConfiguration(); * ExecutionEnvironment environment = getEnvironment(); diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestRunnableState.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestRunnableState.java index 13839ff88c2d..823fc03f25a1 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestRunnableState.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/history/ImportedTestRunnableState.java @@ -33,7 +33,7 @@ public class ImportedTestRunnableState implements RunProfileState, HistoryTestRu @Nullable @Override - public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) { + public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) { final MyEmptyProcessHandler handler = new MyEmptyProcessHandler(); final SMTRunnerConsoleProperties properties = myRunProfile.getProperties(); RunProfile configuration; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunProfileState.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunProfileState.java index 60b0c0e1a237..5682ef780dad 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunProfileState.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunProfileState.java @@ -27,7 +27,7 @@ public class AntRunProfileState implements RunProfileState { @Nullable @Override - public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) { + public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) { final RunProfile profile = myEnvironment.getRunProfile(); if (profile instanceof AntRunConfiguration) { final AntRunConfiguration runConfig = (AntRunConfiguration)profile; 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 341030605bee..f9b1db8a7b6b 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 @@ -379,7 +379,7 @@ public class MavenRunConfiguration extends LocatableConfigurationBase implements @NotNull @Override - public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { + public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { final ProcessHandler processHandler = startProcess(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java index 4a51a9b74300..a6fc60217d0d 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java @@ -794,7 +794,7 @@ public class MavenServerManager extends MavenRemoteObjectWrapper im @NotNull @Override - public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { + public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { ProcessHandler processHandler = startProcess(); return new DefaultExecutionResult(processHandler); } diff --git a/plugins/sh/src/com/intellij/sh/run/ShRunConfigurationProfileState.java b/plugins/sh/src/com/intellij/sh/run/ShRunConfigurationProfileState.java index 59cbb6b70e86..c92d402f062f 100644 --- a/plugins/sh/src/com/intellij/sh/run/ShRunConfigurationProfileState.java +++ b/plugins/sh/src/com/intellij/sh/run/ShRunConfigurationProfileState.java @@ -39,7 +39,7 @@ public class ShRunConfigurationProfileState implements RunProfileState { @Nullable @Override - public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { + public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { Key userDataKey = ShBeforeRunTaskProvider.getRunBeforeUserDataKey(myRunConfiguration); Boolean userDataValue = myProject.getUserData(userDataKey); boolean isRunBeforeConfig = userDataValue != null && userDataValue.booleanValue(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java index 8c9f71c52807..fe45e13121dc 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java @@ -362,7 +362,7 @@ public final class PreviewFormAction extends AnAction{ @Override @NotNull - public ExecutionResult execute(@NotNull final Executor executor, @NotNull final ProgramRunner runner) throws ExecutionException { + public ExecutionResult execute(@NotNull final Executor executor, @NotNull final ProgramRunner runner) throws ExecutionException { try { ExecutionResult executionResult = super.execute(executor, runner); executionResult.getProcessHandler().addProcessListener(new ProcessAdapter() { diff --git a/python/src/com/jetbrains/python/run/PythonCommandLineState.java b/python/src/com/jetbrains/python/run/PythonCommandLineState.java index e56bc3570ece..09d1e6b8c1e0 100644 --- a/python/src/com/jetbrains/python/run/PythonCommandLineState.java +++ b/python/src/com/jetbrains/python/run/PythonCommandLineState.java @@ -128,7 +128,7 @@ public abstract class PythonCommandLineState extends CommandLineState { @NotNull @Override - public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { + public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException { return execute(executor, (CommandLinePatcher[])null); }