From 37077de511c30074f858bade6764d9eecb438bea Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 7 Dec 2016 18:59:57 +0100 Subject: [PATCH] deprecate RunManagerAdapter --- .../ExternalSystemRunManagerListener.java | 4 +-- .../view/ExternalProjectsViewImpl.java | 4 +-- .../execution/ExecutionTargetManagerImpl.java | 2 +- .../intellij/execution/RunManagerAdapter.java | 28 ++----------------- .../execution/RunManagerListener.java | 19 +++++++++---- .../startup/ProjectStartupRunner.java | 2 +- .../lang/ant/config/explorer/AntExplorer.java | 2 +- .../importProject/CloudGitRemoteDetector.java | 6 ++-- .../navigator/MavenProjectsNavigator.java | 10 +++---- 9 files changed, 29 insertions(+), 48 deletions(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemRunManagerListener.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemRunManagerListener.java index 1c4fc132e490..0426ef1f3a11 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemRunManagerListener.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemRunManagerListener.java @@ -16,8 +16,8 @@ package com.intellij.openapi.externalSystem.service.project.manage; import com.intellij.execution.RunManager; -import com.intellij.execution.RunManagerAdapter; import com.intellij.execution.RunManagerEx; +import com.intellij.execution.RunManagerListener; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.openapi.externalSystem.ExternalSystemManager; import com.intellij.openapi.externalSystem.model.execution.ExternalSystemTaskExecutionSettings; @@ -40,7 +40,7 @@ import static com.intellij.openapi.externalSystem.service.project.manage.Externa * @author Vladislav.Soroka * @since 11/14/2014 */ -class ExternalSystemRunManagerListener extends RunManagerAdapter { +class ExternalSystemRunManagerListener implements RunManagerListener { private ExternalProjectsManager myManager; private final Map> myMap; diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewImpl.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewImpl.java index 01b6475ec07d..dd60c3225fa7 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewImpl.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ExternalProjectsViewImpl.java @@ -53,9 +53,7 @@ import com.intellij.pom.Navigatable; import com.intellij.ui.PopupHandler; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.treeStructure.SimpleTree; -import com.intellij.util.Consumer; import com.intellij.util.DisposeAwareRunnable; -import com.intellij.util.Function; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; @@ -213,7 +211,7 @@ public class ExternalProjectsViewImpl extends SimpleToolWindowPanel implements D } }); - ((RunManagerEx)RunManager.getInstance(myProject)).addRunManagerListener(new RunManagerAdapter() { + ((RunManagerEx)RunManager.getInstance(myProject)).addRunManagerListener(new RunManagerListener() { private void changed() { scheduleStructureRequest(() -> { assert myStructure != null; diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java index adf20325d009..69c6e107230a 100644 --- a/platform/lang-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java @@ -42,7 +42,7 @@ public class ExecutionTargetManagerImpl extends ExecutionTargetManager implement public ExecutionTargetManagerImpl(@NotNull Project project, @NotNull RunManager runManager) { myProject = project; - ((RunManagerEx)runManager).addRunManagerListener(new RunManagerAdapter() { + ((RunManagerEx)runManager).addRunManagerListener(new RunManagerListener() { @Override public void runConfigurationChanged(@NotNull RunnerAndConfigurationSettings settings) { if (settings == RunManager.getInstance(myProject).getSelectedConfiguration()) { diff --git a/platform/lang-impl/src/com/intellij/execution/RunManagerAdapter.java b/platform/lang-impl/src/com/intellij/execution/RunManagerAdapter.java index 51fc72a8987b..a66ae064b65c 100644 --- a/platform/lang-impl/src/com/intellij/execution/RunManagerAdapter.java +++ b/platform/lang-impl/src/com/intellij/execution/RunManagerAdapter.java @@ -15,33 +15,9 @@ */ package com.intellij.execution; -import org.jetbrains.annotations.NotNull; - /** - * @author nik + * @deprecated Please use RunManagerListener directly */ +@Deprecated public abstract class RunManagerAdapter implements RunManagerListener { - @Override - public void runConfigurationSelected() { - } - - @Override - public void beforeRunTasksChanged() { - } - - @Override - public void runConfigurationAdded(@NotNull RunnerAndConfigurationSettings settings) { - } - - @Override - public void runConfigurationRemoved(@NotNull RunnerAndConfigurationSettings settings) { - } - - public void runConfigurationChanged(@NotNull RunnerAndConfigurationSettings settings) { - } - - @Override - public void runConfigurationChanged(@NotNull RunnerAndConfigurationSettings settings, String existingId) { - runConfigurationChanged(settings); - } } diff --git a/platform/lang-impl/src/com/intellij/execution/RunManagerListener.java b/platform/lang-impl/src/com/intellij/execution/RunManagerListener.java index d881febc00c6..6e102e2aa87a 100644 --- a/platform/lang-impl/src/com/intellij/execution/RunManagerListener.java +++ b/platform/lang-impl/src/com/intellij/execution/RunManagerListener.java @@ -20,15 +20,24 @@ import org.jetbrains.annotations.NotNull; import java.util.EventListener; public interface RunManagerListener extends EventListener { - void runConfigurationSelected(); + default void runConfigurationSelected() { + } - void beforeRunTasksChanged(); + default void beforeRunTasksChanged() { + } - void runConfigurationAdded(@NotNull RunnerAndConfigurationSettings settings); + default void runConfigurationAdded(@NotNull RunnerAndConfigurationSettings settings) { + } - void runConfigurationRemoved(@NotNull RunnerAndConfigurationSettings settings); + default void runConfigurationRemoved(@NotNull RunnerAndConfigurationSettings settings) { + } - void runConfigurationChanged(@NotNull RunnerAndConfigurationSettings settings, String existingId); + default void runConfigurationChanged(@NotNull RunnerAndConfigurationSettings settings, String existingId) { + runConfigurationChanged(settings); + } + + default void runConfigurationChanged(@NotNull RunnerAndConfigurationSettings settings) { + } default void beginUpdate() { } diff --git a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java index b9e043a86dd5..2d943f69e0e8 100644 --- a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java +++ b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java @@ -48,7 +48,7 @@ public class ProjectStartupRunner implements StartupActivity, DumbAware { final ProjectStartupTaskManager projectStartupTaskManager = ProjectStartupTaskManager.getInstance(project); if (projectStartupTaskManager.isEmpty()) return; - RunManagerImpl.getInstanceImpl(project).addRunManagerListener(new RunManagerAdapter() { + RunManagerImpl.getInstanceImpl(project).addRunManagerListener(new RunManagerListener() { @Override public void runConfigurationRemoved(@NotNull RunnerAndConfigurationSettings settings) { projectStartupTaskManager.delete(settings.getUniqueID()); diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java index 5f64ea732aab..935f6f1b4d21 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java @@ -161,7 +161,7 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider, myBuilder.queueUpdate(); } }, this); - RunManagerEx.getInstanceEx(myProject).addRunManagerListener(new RunManagerAdapter() { + RunManagerEx.getInstanceEx(myProject).addRunManagerListener(new RunManagerListener() { public void beforeRunTasksChanged() { myBuilder.queueUpdate(); } diff --git a/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitRemoteDetector.java b/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitRemoteDetector.java index def0660602cd..647bc3636e47 100644 --- a/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitRemoteDetector.java +++ b/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitRemoteDetector.java @@ -16,8 +16,8 @@ package com.intellij.remoteServer.util.importProject; import com.intellij.execution.RunManager; -import com.intellij.execution.RunManagerAdapter; import com.intellij.execution.RunManagerEx; +import com.intellij.execution.RunManagerListener; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.ide.actions.ImportModuleAction; @@ -26,7 +26,6 @@ import com.intellij.ide.util.newProjectWizard.AbstractProjectWizard; import com.intellij.ide.util.newProjectWizard.AddModuleWizard; import com.intellij.ide.util.newProjectWizard.StepSequence; import com.intellij.ide.util.projectWizard.ImportFromSourcesProvider; -import com.intellij.ide.wizard.Step; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; import com.intellij.openapi.components.AbstractProjectComponent; @@ -46,7 +45,6 @@ import com.intellij.remoteServer.impl.configuration.deployment.ModuleDeploymentS import com.intellij.remoteServer.util.CloudBundle; import com.intellij.remoteServer.util.CloudGitDeploymentDetector; import com.intellij.remoteServer.util.CloudNotifier; -import com.intellij.util.Function; import com.intellij.util.containers.hash.HashMap; import git4idea.repo.GitRepository; import git4idea.repo.GitRepositoryChangeListener; @@ -87,7 +85,7 @@ public class CloudGitRemoteDetector extends AbstractProjectComponent implements public void projectOpened() { myProject.getMessageBus().connect().subscribe(GitRepository.GIT_REPO_CHANGE, this); - myRunManager.addRunManagerListener(new RunManagerAdapter() { + myRunManager.addRunManagerListener(new RunManagerListener() { @Override public void runConfigurationAdded(@NotNull RunnerAndConfigurationSettings settings) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java index 39d8ebd6903d..33c38e9975c4 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java @@ -16,8 +16,8 @@ package org.jetbrains.idea.maven.navigator; import com.intellij.execution.RunManager; -import com.intellij.execution.RunManagerAdapter; import com.intellij.execution.RunManagerEx; +import com.intellij.execution.RunManagerListener; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.ide.util.treeView.TreeState; import com.intellij.openapi.actionSystem.*; @@ -213,7 +213,7 @@ public class MavenProjectsNavigator extends MavenSimpleProjectComponent implemen } }); - RunManagerEx.getInstanceEx(myProject).addRunManagerListener(new RunManagerAdapter() { + RunManagerEx.getInstanceEx(myProject).addRunManagerListener(new RunManagerListener() { @Override public void beforeRunTasksChanged() { scheduleStructureRequest(() -> myStructure.updateGoals()); @@ -227,7 +227,7 @@ public class MavenProjectsNavigator extends MavenSimpleProjectComponent implemen } }); - ((RunManagerEx)RunManager.getInstance(myProject)).addRunManagerListener(new RunManagerAdapter() { + ((RunManagerEx)RunManager.getInstance(myProject)).addRunManagerListener(new RunManagerListener() { private void changed() { scheduleStructureRequest(() -> myStructure.updateRunConfigurations()); } @@ -411,12 +411,12 @@ public class MavenProjectsNavigator extends MavenSimpleProjectComponent implemen @Override public void projectResolved(Pair projectWithChanges, NativeMavenProjectHolder nativeMavenProject) { - scheduleUpdateProjects(Collections.singletonList(projectWithChanges.first), Collections.emptyList()); + scheduleUpdateProjects(Collections.singletonList(projectWithChanges.first), Collections.emptyList()); } @Override public void pluginsResolved(MavenProject project) { - scheduleUpdateProjects(Collections.singletonList(project), Collections.emptyList()); + scheduleUpdateProjects(Collections.singletonList(project), Collections.emptyList()); } private void scheduleUpdateProjects(final List projects, final List deleted) {