deprecate RunManagerAdapter

This commit is contained in:
Vladimir Krivosheev
2016-12-08 09:09:05 +01:00
parent 60f3999ae3
commit 37077de511
9 changed files with 29 additions and 48 deletions
@@ -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<Integer, Pair<String, RunnerAndConfigurationSettings>> myMap;
@@ -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;
@@ -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()) {
@@ -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);
}
}
@@ -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() {
}
@@ -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());
@@ -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();
}
@@ -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) {
@@ -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<MavenProject, MavenProjectChanges> projectWithChanges,
NativeMavenProjectHolder nativeMavenProject) {
scheduleUpdateProjects(Collections.singletonList(projectWithChanges.first), Collections.<MavenProject>emptyList());
scheduleUpdateProjects(Collections.singletonList(projectWithChanges.first), Collections.emptyList());
}
@Override
public void pluginsResolved(MavenProject project) {
scheduleUpdateProjects(Collections.singletonList(project), Collections.<MavenProject>emptyList());
scheduleUpdateProjects(Collections.singletonList(project), Collections.emptyList());
}
private void scheduleUpdateProjects(final List<MavenProject> projects, final List<MavenProject> deleted) {