From 22c4dac8c239f73ce0876c3028cdd60b49a08e10 Mon Sep 17 00:00:00 2001 From: Egor Ushakov Date: Wed, 9 Apr 2025 19:12:54 +0200 Subject: [PATCH] [debugger] do not use obsolete API GitOrigin-RevId: f429e48e1fee3a45a486eb80da18409ab8568175 --- .../JavaTestFrameworkRunnableState.java | 2 +- .../execution/impl/DefaultJavaProgramRunner.java | 6 +++--- .../execution/impl/JavaDebuggerAutoAttach.java | 4 ++-- .../intellij/execution/jshell/JShellHandler.java | 2 +- .../TestDiscoveryDataSocketListener.java | 6 +++--- .../testframework/SearchForTestsTask.java | 6 +++--- .../service/execution/ForkedDebuggerThread.java | 16 ++++++++-------- .../debugger/DebuggerBreakpointTestUtils.kt | 6 +++--- .../com/intellij/debugger/DebuggerTestCase.java | 8 ++++---- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java index 429b9f5fbfa7..36d7840d50ed 100644 --- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java +++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java @@ -292,7 +292,7 @@ public abstract class JavaTestFrameworkRunnableState(is, Response.class); myMessageWriter = new MessageWriter<>(processHandler.getProcessInput()); - processHandler.addProcessListener(new ProcessAdapter() { + processHandler.addProcessListener(new ProcessListener() { @Override public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType) { if (outputType == ProcessOutputTypes.STDOUT) { diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryDataSocketListener.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryDataSocketListener.java index c2c55810fd0b..7423eefb3ccc 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryDataSocketListener.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryDataSocketListener.java @@ -1,9 +1,9 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.execution.testDiscovery; -import com.intellij.execution.process.ProcessAdapter; import com.intellij.execution.process.ProcessEvent; import com.intellij.execution.process.ProcessHandler; +import com.intellij.execution.process.ProcessListener; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; @@ -75,7 +75,7 @@ public class TestDiscoveryDataSocketListener { } void attach(ProcessHandler handler) { - handler.addProcessListener(new ProcessAdapter() { + handler.addProcessListener(new ProcessListener() { @Override public void processTerminated(@NotNull ProcessEvent event) { myClosed = true; diff --git a/java/execution/impl/src/com/intellij/execution/testframework/SearchForTestsTask.java b/java/execution/impl/src/com/intellij/execution/testframework/SearchForTestsTask.java index cf5e4c04b65f..a3727747b557 100644 --- a/java/execution/impl/src/com/intellij/execution/testframework/SearchForTestsTask.java +++ b/java/execution/impl/src/com/intellij/execution/testframework/SearchForTestsTask.java @@ -1,11 +1,11 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.execution.testframework; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.ExecutionException; import com.intellij.execution.process.OSProcessHandler; -import com.intellij.execution.process.ProcessAdapter; import com.intellij.execution.process.ProcessEvent; +import com.intellij.execution.process.ProcessListener; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.application.NonBlockingReadAction; @@ -88,7 +88,7 @@ public abstract class SearchForTestsTask extends Task.Backgroundable { } public void attachTaskToProcess(final OSProcessHandler handler) { - handler.addProcessListener(new ProcessAdapter() { + handler.addProcessListener(new ProcessListener() { @Override public void processTerminated(final @NotNull ProcessEvent event) { handler.removeProcessListener(this); diff --git a/java/execution/impl/src/com/intellij/openapi/externalSystem/service/execution/ForkedDebuggerThread.java b/java/execution/impl/src/com/intellij/openapi/externalSystem/service/execution/ForkedDebuggerThread.java index 99ed814637a7..021dd772efb9 100644 --- a/java/execution/impl/src/com/intellij/openapi/externalSystem/service/execution/ForkedDebuggerThread.java +++ b/java/execution/impl/src/com/intellij/openapi/externalSystem/service/execution/ForkedDebuggerThread.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.externalSystem.service.execution; import com.intellij.build.BuildView; @@ -19,9 +19,9 @@ import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.executors.DefaultDebugExecutor; import com.intellij.execution.impl.ConsoleViewImpl; import com.intellij.execution.impl.EditorHyperlinkSupport; -import com.intellij.execution.process.ProcessAdapter; import com.intellij.execution.process.ProcessEvent; import com.intellij.execution.process.ProcessHandler; +import com.intellij.execution.process.ProcessListener; import com.intellij.execution.remote.RemoteConfiguration; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ExecutionEnvironmentBuilder; @@ -86,7 +86,7 @@ class ForkedDebuggerThread extends Thread { myMainExecutionEnvironment = mainExecutionEnvironment; myMainRunnableState = mainRunnableState; - myMainProcessHandler.addProcessListener(new ProcessAdapter() { + myMainProcessHandler.addProcessListener(new ProcessListener() { @Override public void processTerminated(@NotNull ProcessEvent event) { closeSocket(); @@ -159,7 +159,7 @@ class ForkedDebuggerThread extends Thread { return; } - myMainProcessHandler.addProcessListener(new ProcessAdapter() { + myMainProcessHandler.addProcessListener(new ProcessListener() { @Override public void processTerminated(@NotNull ProcessEvent event) { StreamUtil.closeStream(stream); @@ -230,7 +230,7 @@ class ForkedDebuggerThread extends Thread { private void stopForkedProcessWhenMainProcessTerminated(@Nullable ProcessHandler processHandler) { if (processHandler != null) { - myMainProcessHandler.addProcessListener(new ProcessAdapter() { + myMainProcessHandler.addProcessListener(new ProcessListener() { @Override public void processWillTerminate(@NotNull ProcessEvent event, boolean willBeDestroyed) { myMainProcessHandler.removeProcessListener(this); @@ -243,7 +243,7 @@ class ForkedDebuggerThread extends Thread { private void removeRunContentWhenProcessIsTerminated(@NotNull RunContentDescriptor descriptor) { ProcessHandler processHandler = descriptor.getProcessHandler(); if (processHandler != null) { - processHandler.addProcessListener(new ProcessAdapter() { + processHandler.addProcessListener(new ProcessListener() { @Override public void processTerminated(@NotNull ProcessEvent event) { final ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject); @@ -269,7 +269,7 @@ class ForkedDebuggerThread extends Thread { private void initTerminateForkedProcessHandler(@Nullable ProcessHandler processHandler) { if (processHandler != null) { - processHandler.addProcessListener(new ProcessAdapter() { + processHandler.addProcessListener(new ProcessListener() { @Override public void processWillTerminate(@NotNull ProcessEvent event, boolean willBeDestroyed) { if (!willBeDestroyed) { @@ -329,7 +329,7 @@ class ForkedDebuggerThread extends Thread { } } - private class MyForkedProcessListener extends ProcessAdapter { + private class MyForkedProcessListener implements ProcessListener { private final @NotNull RunContentDescriptor myDescriptor; private final @NotNull String myProcessName; private @Nullable RangeHighlighter myHyperlink; diff --git a/java/testFramework/src/com/intellij/debugger/DebuggerBreakpointTestUtils.kt b/java/testFramework/src/com/intellij/debugger/DebuggerBreakpointTestUtils.kt index 9f30542186d5..7426a3c589b9 100644 --- a/java/testFramework/src/com/intellij/debugger/DebuggerBreakpointTestUtils.kt +++ b/java/testFramework/src/com/intellij/debugger/DebuggerBreakpointTestUtils.kt @@ -1,8 +1,8 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.debugger -import com.intellij.execution.process.ProcessAdapter import com.intellij.execution.process.ProcessEvent +import com.intellij.execution.process.ProcessListener import com.intellij.util.ConcurrencyUtil /** @@ -58,7 +58,7 @@ import com.intellij.util.ConcurrencyUtil fun ExecutionWithDebuggerToolsTestCase.processBreakpoints(test: suspend SequenceScope.() -> Unit) { val executor = ConcurrencyUtil.newSingleThreadExecutor("DebuggerTestExecutor") - debugProcess.addProcessListener(object : ProcessAdapter() { + debugProcess.addProcessListener(object : ProcessListener { override fun processTerminated(event: ProcessEvent) { executor.shutdown() } diff --git a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java index 5aa7e3530136..96f4f0be05a2 100644 --- a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java +++ b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java @@ -21,9 +21,9 @@ import com.intellij.execution.ExecutionException; import com.intellij.execution.Executor; import com.intellij.execution.configurations.*; import com.intellij.execution.executors.DefaultDebugExecutor; -import com.intellij.execution.process.ProcessAdapter; import com.intellij.execution.process.ProcessEvent; import com.intellij.execution.process.ProcessHandler; +import com.intellij.execution.process.ProcessListener; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ExecutionEnvironmentBuilder; import com.intellij.execution.target.TargetEnvironmentRequest; @@ -228,7 +228,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas }, ModalityState.any()); myDebugProcess = myDebuggerSession.getProcess(); - myDebugProcess.addProcessListener(new ProcessAdapter() { + myDebugProcess.addProcessListener(new ProcessListener() { @Override public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType) { print(event.getText(), outputType); @@ -287,7 +287,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas DebuggerSession debuggerSession = attachVirtualMachine(myRunnableState, myExecutionEnvironment, debugParameters, false); final ProcessHandler processHandler = debuggerSession.getProcess().getProcessHandler(); - debuggerSession.getProcess().addProcessListener(new ProcessAdapter() { + debuggerSession.getProcess().addProcessListener(new ProcessListener() { @Override public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType) { print(event.getText(), outputType); @@ -340,7 +340,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas catch (ExecutionException e) { fail(e.getMessage()); } - debuggerSession.getProcess().getProcessHandler().addProcessListener(new ProcessAdapter() { + debuggerSession.getProcess().getProcessHandler().addProcessListener(new ProcessListener() { @Override public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType) { print(event.getText(), outputType);