diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java index a0d6e6b48763..33d8d6009b10 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java @@ -152,7 +152,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb myRequestManager = new RequestManagerImpl(this); NodeRendererSettings.getInstance().addListener(mySettingsListener); loadRenderers(); - myDebugProcessDispatcher.addListener(new DebugProcessAdapter() { + myDebugProcessDispatcher.addListener(new DebugProcessListener() { @Override public void paused(SuspendContext suspendContext) { myThreadBlockedMonitor.stopWatching( @@ -1927,7 +1927,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb semaphore.down(); final AtomicBoolean connectorIsReady = new AtomicBoolean(false); - myDebugProcessDispatcher.addListener(new DebugProcessAdapter() { + myDebugProcessDispatcher.addListener(new DebugProcessListener() { @Override public void connectorIsReady() { connectorIsReady.set(true); diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/RemoteDebugProcessHandler.java b/java/debugger/impl/src/com/intellij/debugger/engine/RemoteDebugProcessHandler.java index 84e3032ed579..a2d4a11fde5f 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/RemoteDebugProcessHandler.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/RemoteDebugProcessHandler.java @@ -30,7 +30,7 @@ public class RemoteDebugProcessHandler extends ProcessHandler{ public void startNotify() { final DebugProcess debugProcess = DebuggerManager.getInstance(myProject).getDebugProcess(this); - final DebugProcessAdapter listener = new DebugProcessAdapter() { + final DebugProcessListener listener = new DebugProcessListener() { //executed in manager thread public void processDetached(DebugProcess process, boolean closedByUser) { debugProcess.removeDebugProcessListener(this); diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java index 4694f9f4ac9f..ce0eebef450d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java @@ -214,7 +214,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent public DebuggerSession attachVirtualMachine(@NotNull DebugEnvironment environment) throws ExecutionException { ApplicationManager.getApplication().assertIsDispatchThread(); final DebugProcessEvents debugProcess = new DebugProcessEvents(myProject); - debugProcess.addDebugProcessListener(new DebugProcessAdapter() { + debugProcess.addDebugProcessListener(new DebugProcessListener() { @Override public void processAttached(final DebugProcess process) { process.removeDebugProcessListener(this); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java index f51e194a24b4..00e713335250 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java @@ -423,7 +423,7 @@ public abstract class Breakpoint
implements // need to delete the request immediately, see IDEA-133978 debugProcess.getRequestsManager().deleteRequest(this); - debugProcess.addDebugProcessListener(new DebugProcessAdapter() { + debugProcess.addDebugProcessListener(new DebugProcessListener() { @Override public void resumed(SuspendContext suspendContext) { removeBreakpoint(); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BatchEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BatchEvaluator.java index 599ad4770802..a17a98ca100e 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BatchEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BatchEvaluator.java @@ -55,7 +55,7 @@ public class BatchEvaluator { private BatchEvaluator(DebugProcess process) { myDebugProcess = process; - myDebugProcess.addDebugProcessListener(new DebugProcessAdapter() { + myDebugProcess.addDebugProcessListener(new DebugProcessListener() { public void processDetached(DebugProcess process, boolean closedByUser) { myBatchEvaluatorChecked = false; myBatchEvaluatorObject= null; diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessAdapter.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessAdapter.java index 16c43c2b27c7..e42296da2616 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessAdapter.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessAdapter.java @@ -20,40 +20,9 @@ import com.intellij.execution.configurations.RemoteConnection; import com.intellij.execution.configurations.RunProfileState; import com.sun.jdi.ThreadReference; -public class DebugProcessAdapter implements DebugProcessListener{ - //executed in manager thread - public void connectorIsReady() { - } - - //executed in manager thread - public void paused(SuspendContext suspendContext) { - - } - - //executed in manager thread - public void resumed(SuspendContext suspendContext) { - - } - - //executed in manager thread - public void processDetached(DebugProcess process, boolean closedByUser) { - - } - - //executed in manager thread - public void processAttached(DebugProcess process) { - - } - - //executed in manager thread - public void threadStarted(DebugProcess proc, ThreadReference thread) { - } - - //executed in manager thread - public void threadStopped(DebugProcess proc, ThreadReference thread) { - } - - public void attachException(RunProfileState state, ExecutionException exception, RemoteConnection remoteConnection) { - - } +/** + * @deprecated use {@link DebugProcessListener} + */ +@Deprecated +public class DebugProcessAdapter implements DebugProcessListener { } diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessListener.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessListener.java index e992f25b2595..ed606b555981 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessListener.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcessListener.java @@ -23,26 +23,34 @@ import com.sun.jdi.ThreadReference; import java.util.EventListener; -public interface DebugProcessListener extends EventListener{ +public interface DebugProcessListener extends EventListener { //executed in manager thread - void connectorIsReady(); + default void connectorIsReady() { + } //executed in manager thread - void paused(SuspendContext suspendContext); + default void paused(SuspendContext suspendContext) { + } //executed in manager thread - void resumed(SuspendContext suspendContext); + default void resumed(SuspendContext suspendContext) { + } //executed in manager thread - void processDetached(DebugProcess process, boolean closedByUser); + default void processDetached(DebugProcess process, boolean closedByUser) { + } //executed in manager thread - void processAttached(DebugProcess process); + default void processAttached(DebugProcess process) { + } - void attachException(RunProfileState state, ExecutionException exception, RemoteConnection remoteConnection); - - void threadStarted(DebugProcess proc, ThreadReference thread); - - void threadStopped(DebugProcess proc, ThreadReference thread); + default void attachException(RunProfileState state, ExecutionException exception, RemoteConnection remoteConnection) { + } + + default void threadStarted(DebugProcess proc, ThreadReference thread) { + } + + default void threadStopped(DebugProcess proc, ThreadReference thread) { + } } diff --git a/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfiguration.java b/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfiguration.java index b3f2f7e827c3..66905b544c94 100644 --- a/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfiguration.java +++ b/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfiguration.java @@ -17,8 +17,8 @@ package com.intellij.execution.scratch; import com.intellij.debugger.DebuggerManager; import com.intellij.debugger.engine.DebugProcess; -import com.intellij.debugger.engine.DebugProcessAdapter; import com.intellij.debugger.engine.DebugProcessImpl; +import com.intellij.debugger.engine.DebugProcessListener; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.ExecutionException; import com.intellij.execution.Executor; @@ -86,7 +86,7 @@ public class JavaScratchConfiguration extends ApplicationConfiguration { if (getRunnerSettings() instanceof DebuggingRunnerData) { final VirtualFile vFile = getConfiguration().getScratchVirtualFile(); if (vFile != null) { - DebuggerManager.getInstance(getProject()).addDebugProcessListener(handler, new DebugProcessAdapter() { + DebuggerManager.getInstance(getProject()).addDebugProcessListener(handler, new DebugProcessListener() { @Override public void processAttached(DebugProcess process) { if (vFile.isValid()) { diff --git a/java/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/deployment/debug/JavaDebuggerLauncherImpl.java b/java/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/deployment/debug/JavaDebuggerLauncherImpl.java index 200048ea7eed..6db57353a141 100644 --- a/java/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/deployment/debug/JavaDebuggerLauncherImpl.java +++ b/java/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/deployment/debug/JavaDebuggerLauncherImpl.java @@ -19,7 +19,7 @@ import com.intellij.debugger.DebugEnvironment; import com.intellij.debugger.DebugUIEnvironment; import com.intellij.debugger.DebuggerManager; import com.intellij.debugger.engine.DebugProcess; -import com.intellij.debugger.engine.DebugProcessAdapter; +import com.intellij.debugger.engine.DebugProcessListener; import com.intellij.debugger.engine.RemoteDebugProcessHandler; import com.intellij.debugger.ui.DebuggerPanelsManager; import com.intellij.execution.DefaultExecutionResult; @@ -69,7 +69,7 @@ public class JavaDebuggerLauncherImpl extends JavaDebuggerLauncher { if (serverMode) { serverModeHandler.attachRemote(); DebuggerManager.getInstance(executionEnvironment.getProject()) - .addDebugProcessListener(processHandler, new DebugProcessAdapter() { + .addDebugProcessListener(processHandler, new DebugProcessListener() { public void processDetached(DebugProcess process, boolean closedByUser) { try { serverModeHandler.detachRemote();