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

RunProfileState.getRunnerSettings() doesn't need to be in the interface; enough to have implementations in subclasses which need it

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-07-22 18:13:23 +02:00
parent aacaeb5b4d
commit 13a827c47b
9 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
+3 -3
View File
@@ -55,16 +55,16 @@ public class GenericDebuggerRunner extends JavaPatchableProgramRunner<GenericDeb
ExecutionEnvironment env) throws ExecutionException {
if (state instanceof JavaCommandLine) {
final JavaParameters parameters = ((JavaCommandLine)state).getJavaParameters();
runCustomPatchers(parameters, state.getRunnerSettings(), executor);
runCustomPatchers(parameters, env.getRunnerSettings(), executor);
RemoteConnection connection = DebuggerManagerImpl.createDebugParameters(parameters, true, DebuggerSettings.getInstance().DEBUGGER_TRANSPORT, "", false);
return attachVirtualMachine(project, executor, state, contentToReuse, env, connection, true);
}
if (state instanceof PatchedRunnableState) {
final RemoteConnection connection = doPatch(new JavaParameters(), state.getRunnerSettings());
final RemoteConnection connection = doPatch(new JavaParameters(), env.getRunnerSettings());
return attachVirtualMachine(project, executor, state, contentToReuse, env, connection, true);
}
if (state instanceof RemoteState) {
final RemoteConnection connection = createRemoteDebugConnection((RemoteState)state, state.getRunnerSettings());
final RemoteConnection connection = createRemoteDebugConnection((RemoteState)state, env.getRunnerSettings());
return attachVirtualMachine(project, executor, state, contentToReuse, env, connection, false);
}
java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
boolean shouldAddDefaultActions = true;
if (state instanceof JavaCommandLine) {
final JavaParameters parameters = ((JavaCommandLine)state).getJavaParameters();
patch(parameters, state.getRunnerSettings(), true);
patch(parameters, env.getRunnerSettings(), true);
final ProcessProxy proxy = ProcessProxyFactory.getInstance().createCommandLineProxy((JavaCommandLine)state);
executionResult = state.execute(executor, this);
if (proxy != null && executionResult != null) {
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java
-5
View File
@@ -207,11 +207,6 @@ public class ExternalSystemRunConfiguration extends RunConfigurationBase impleme
});
return new DefaultExecutionResult(console, processHandler);
}
@Override
public RunnerSettings getRunnerSettings() {
return null;
}
}
private static class MyProcessHandler extends ProcessHandler {
platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java
-1
View File
@@ -47,7 +47,6 @@ public abstract class CommandLineState implements RunProfileState {
return myEnvironment;
}
@Override
public RunnerSettings getRunnerSettings() {
return myEnvironment.getRunnerSettings();
}
platform/lang-api/src/com/intellij/execution/configurations/RunProfileState.java
-2
View File
@@ -25,6 +25,4 @@ import org.jetbrains.annotations.Nullable;
public interface RunProfileState {
@Nullable
ExecutionResult execute(final Executor executor, @NotNull ProgramRunner runner) throws ExecutionException;
RunnerSettings getRunnerSettings();
}
platform/lang-impl/src/com/intellij/execution/configuration/EmptyRunProfileState.java
-6
View File
@@ -4,7 +4,6 @@ import com.intellij.execution.ExecutionException;
import com.intellij.execution.ExecutionResult;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.RunProfileState;
import com.intellij.execution.configurations.RunnerSettings;
import com.intellij.execution.runners.ProgramRunner;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -20,9 +19,4 @@ public final class EmptyRunProfileState implements RunProfileState {
public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) throws ExecutionException {
return null;
}
@Override
public RunnerSettings getRunnerSettings() {
return null;
}
}
platform/remote-servers/impl/src/com/intellij/remoteServer/run/DeployToServerRunConfiguration.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class DeployToServerRunConfiguration<C extends ServerConfiguration> exten
throw new ExecutionException("Deployment is not selected");
}
return new DeployToServerState(env, myDeployer, server, myDeploymentSource);
return new DeployToServerState(myDeployer, server, myDeploymentSource);
}
@Override
platform/remote-servers/impl/src/com/intellij/remoteServer/run/DeployToServerState.java
+1 -11
View File
@@ -19,8 +19,6 @@ import com.intellij.execution.ExecutionException;
import com.intellij.execution.ExecutionResult;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.RunProfileState;
import com.intellij.execution.configurations.RunnerSettings;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.remoteServer.configuration.RemoteServer;
import com.intellij.remoteServer.configuration.ServerConfiguration;
@@ -33,16 +31,13 @@ import org.jetbrains.annotations.Nullable;
* @author nik
*/
public class DeployToServerState<C extends ServerConfiguration> implements RunProfileState {
private final ExecutionEnvironment myExecutionEnvironment;
@NotNull private final Deployer<C> myDeployer;
@NotNull private final RemoteServer<C> myServer;
@NotNull private final DeploymentSource mySource;
public DeployToServerState(@NotNull ExecutionEnvironment executionEnvironment,
@NotNull Deployer<C> deployer,
public DeployToServerState(@NotNull Deployer<C> deployer,
@NotNull RemoteServer<C> server,
@NotNull DeploymentSource deploymentSource) {
myExecutionEnvironment = executionEnvironment;
myDeployer = deployer;
myServer = server;
mySource = deploymentSource;
@@ -54,9 +49,4 @@ public class DeployToServerState<C extends ServerConfiguration> implements RunPr
myDeployer.startDeployment(myServer, mySource);
return null;
}
@Override
public RunnerSettings getRunnerSettings() {
return myExecutionEnvironment.getRunnerSettings();
}
}
plugins/junit/src/com/intellij/execution/junit/TestObject.java
-1
View File
@@ -127,7 +127,6 @@ public abstract class TestObject implements JavaCommandLine {
public abstract String suggestActionName();
@Override
public RunnerSettings getRunnerSettings() {
return myEnvironment.getRunnerSettings();
}