Skip to content

Commit c914ee1

Browse files
authored
[verifier] fix deprecated ProcessAdapter references (#8765)
Addresses deprecated `ProcessAdapter` references and avoids boilerplate by adding our own. Replaces #8670. See: #8764 --- - [x] I’ve reviewed the contributor guide and applied the relevant portions to this PR. <details> <summary>Contribution guidelines:</summary><br> - See our [contributor guide]([https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md) for general expectations for PRs. - Larger or significant changes should be discussed in an issue before creating a PR. - Dart contributions to our repos should follow the [Dart style guide](https://dart.dev/guides/language/effective-dart) and use `dart format`. - Java and Kotlin contributions should strive to follow Java and Kotlin best practices ([discussion](#8098)). </details>
1 parent 8b9e42c commit c914ee1

13 files changed

Lines changed: 25 additions & 13 deletions

src/io/flutter/actions/FlutterBuildActionGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.flutter.actions;
77

88
import com.intellij.execution.process.ColoredProcessHandler;
9-
import com.intellij.execution.process.ProcessAdapter;
109
import com.intellij.execution.process.ProcessEvent;
1110
import com.intellij.openapi.actionSystem.ActionUpdateThread;
1211
import com.intellij.openapi.actionSystem.AnAction;
@@ -26,6 +25,7 @@
2625
import io.flutter.sdk.FlutterSdk;
2726
import io.flutter.utils.FlutterModuleUtils;
2827
import io.flutter.utils.OpenApiUtils;
28+
import io.flutter.utils.ProcessAdapter;
2929
import io.flutter.utils.ProgressHelper;
3030
import org.jetbrains.annotations.NotNull;
3131
import org.jetbrains.annotations.Nullable;

src/io/flutter/actions/OpenInAndroidStudioAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.intellij.execution.ExecutionException;
99
import com.intellij.execution.configurations.GeneralCommandLine;
1010
import com.intellij.execution.process.ColoredProcessHandler;
11-
import com.intellij.execution.process.ProcessAdapter;
1211
import com.intellij.execution.process.ProcessEvent;
1312
import com.intellij.openapi.actionSystem.ActionUpdateThread;
1413
import com.intellij.openapi.actionSystem.AnAction;
@@ -34,6 +33,7 @@
3433
import io.flutter.pub.PubRoots;
3534
import io.flutter.sdk.FlutterSdk;
3635
import io.flutter.utils.OpenApiUtils;
36+
import io.flutter.utils.ProcessAdapter;
3737
import org.jetbrains.annotations.NotNull;
3838
import org.jetbrains.annotations.Nullable;
3939

src/io/flutter/actions/OpenInAppCodeAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.intellij.execution.ExecutionException;
99
import com.intellij.execution.configurations.GeneralCommandLine;
1010
import com.intellij.execution.process.ColoredProcessHandler;
11-
import com.intellij.execution.process.ProcessAdapter;
1211
import com.intellij.execution.process.ProcessEvent;
1312
import com.intellij.execution.process.ProcessOutputTypes;
1413
import com.intellij.openapi.actionSystem.ActionUpdateThread;
@@ -25,6 +24,7 @@
2524
import io.flutter.FlutterMessages;
2625
import io.flutter.sdk.FlutterSdk;
2726
import io.flutter.utils.OpenApiUtils;
27+
import io.flutter.utils.ProcessAdapter;
2828
import org.jetbrains.annotations.NotNull;
2929
import org.jetbrains.annotations.Nullable;
3030

src/io/flutter/actions/OpenInXcodeAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.intellij.execution.ExecutionException;
99
import com.intellij.execution.configurations.GeneralCommandLine;
1010
import com.intellij.execution.process.ColoredProcessHandler;
11-
import com.intellij.execution.process.ProcessAdapter;
1211
import com.intellij.execution.process.ProcessEvent;
1312
import com.intellij.openapi.actionSystem.ActionUpdateThread;
1413
import com.intellij.openapi.actionSystem.AnAction;
@@ -26,6 +25,7 @@
2625
import io.flutter.pub.PubRoot;
2726
import io.flutter.sdk.FlutterSdk;
2827
import io.flutter.utils.FlutterModuleUtils;
28+
import io.flutter.utils.ProcessAdapter;
2929
import io.flutter.utils.ProgressHelper;
3030
import org.jetbrains.annotations.NotNull;
3131
import org.jetbrains.annotations.Nullable;

src/io/flutter/android/AndroidEmulator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.intellij.execution.ExecutionException;
99
import com.intellij.execution.configurations.GeneralCommandLine;
1010
import com.intellij.execution.process.ColoredProcessHandler;
11-
import com.intellij.execution.process.ProcessAdapter;
1211
import com.intellij.execution.process.ProcessEvent;
1312
import com.intellij.execution.process.ProcessOutputTypes;
1413
import com.intellij.openapi.application.ApplicationManager;
@@ -21,6 +20,7 @@
2120
import io.flutter.FlutterMessages;
2221
import io.flutter.utils.MostlySilentColoredProcessHandler;
2322
import io.flutter.utils.OpenApiUtils;
23+
import io.flutter.utils.ProcessAdapter;
2424
import org.jetbrains.annotations.NotNull;
2525

2626
import java.lang.reflect.InvocationTargetException;

src/io/flutter/android/AndroidSdk.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.intellij.execution.ExecutionException;
99
import com.intellij.execution.configurations.GeneralCommandLine;
1010
import com.intellij.execution.process.ColoredProcessHandler;
11-
import com.intellij.execution.process.ProcessAdapter;
1211
import com.intellij.execution.process.ProcessEvent;
1312
import com.intellij.execution.process.ProcessOutputTypes;
1413
import com.intellij.openapi.diagnostic.Logger;
@@ -19,6 +18,7 @@
1918
import com.intellij.openapi.vfs.VirtualFile;
2019
import io.flutter.logging.PluginLogger;
2120
import io.flutter.settings.FlutterSettings;
21+
import io.flutter.utils.ProcessAdapter;
2222
import org.jetbrains.annotations.NotNull;
2323
import org.jetbrains.annotations.Nullable;
2424

src/io/flutter/console/FlutterConsole.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.intellij.execution.filters.TextConsoleBuilder;
99
import com.intellij.execution.filters.TextConsoleBuilderFactory;
1010
import com.intellij.execution.process.ColoredProcessHandler;
11-
import com.intellij.execution.process.ProcessAdapter;
1211
import com.intellij.execution.process.ProcessEvent;
1312
import com.intellij.execution.ui.ConsoleView;
1413
import com.intellij.execution.ui.ConsoleViewContentType;
@@ -23,6 +22,7 @@
2322
import com.intellij.ui.content.ContentFactory;
2423
import com.intellij.ui.content.ContentManager;
2524
import com.intellij.ui.content.MessageView;
25+
import io.flutter.utils.ProcessAdapter;
2626
import org.jetbrains.annotations.NotNull;
2727
import org.jetbrains.annotations.Nullable;
2828

src/io/flutter/console/FlutterConsoleFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.intellij.execution.filters.HyperlinkInfo;
1313
import com.intellij.execution.filters.OpenFileHyperlinkInfo;
1414
import com.intellij.execution.process.ColoredProcessHandler;
15-
import com.intellij.execution.process.ProcessAdapter;
1615
import com.intellij.execution.process.ProcessEvent;
1716
import com.intellij.openapi.editor.markup.EffectType;
1817
import com.intellij.openapi.editor.markup.TextAttributes;
@@ -26,10 +25,11 @@
2625
import io.flutter.FlutterUtils;
2726
import io.flutter.sdk.FlutterSdk;
2827
import io.flutter.utils.OpenApiUtils;
28+
import io.flutter.utils.ProcessAdapter;
2929
import org.jetbrains.annotations.NotNull;
3030
import org.jetbrains.annotations.Nullable;
3131

32-
import java.awt.*;
32+
import java.awt.Font;
3333
import java.util.Objects;
3434
import java.util.regex.Matcher;
3535
import java.util.regex.Pattern;

src/io/flutter/run/coverage/FlutterCoverageProgramRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.intellij.execution.configurations.RunProfileState;
1414
import com.intellij.execution.configurations.RunnerSettings;
1515
import com.intellij.execution.configurations.coverage.CoverageEnabledConfiguration;
16-
import com.intellij.execution.process.ProcessAdapter;
1716
import com.intellij.execution.process.ProcessEvent;
1817
import com.intellij.execution.process.ProcessHandler;
1918
import com.intellij.execution.runners.DefaultProgramRunnerKt;
@@ -28,6 +27,7 @@
2827
import io.flutter.run.test.TestConfig;
2928
import io.flutter.settings.FlutterSettings;
3029
import io.flutter.utils.OpenApiUtils;
30+
import io.flutter.utils.ProcessAdapter;
3131
import org.jetbrains.annotations.NonNls;
3232
import org.jetbrains.annotations.NotNull;
3333
import org.jetbrains.annotations.Nullable;

src/io/flutter/run/daemon/DaemonApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.google.gson.JsonObject;
1313
import com.google.gson.JsonPrimitive;
1414
import com.google.gson.JsonSyntaxException;
15-
import com.intellij.execution.process.ProcessAdapter;
1615
import com.intellij.execution.process.ProcessEvent;
1716
import com.intellij.execution.process.ProcessHandler;
1817
import com.intellij.execution.process.ProcessOutputTypes;
@@ -21,6 +20,7 @@
2120
import com.intellij.openapi.util.text.StringUtil;
2221
import io.flutter.logging.PluginLogger;
2322
import io.flutter.utils.JsonUtils;
23+
import io.flutter.utils.ProcessAdapter;
2424
import io.flutter.utils.StdoutJsonParser;
2525
import org.jetbrains.annotations.NotNull;
2626
import org.jetbrains.annotations.Nullable;

0 commit comments

Comments
 (0)