MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ModuleListeners cleanup

Browse Source
This commit is contained in:
nik
2012-05-05 11:54:19 +04:00
parent 257b4fcb07
commit f381f209b4
4 changed files with 16 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
+2 -7
View File
@@ -41,6 +41,7 @@ import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.ModuleAdapter;
import com.intellij.openapi.project.ModuleListener;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootManager;
@@ -110,13 +111,7 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
myModuleManager = moduleManager;
myExcludedEntriesConfiguration = new ExcludedEntriesConfiguration();
Disposer.register(project, myExcludedEntriesConfiguration);
project.getMessageBus().connect(project).subscribe(ProjectTopics.MODULES, new ModuleListener() {
public void modulesRenamed(Project project, List<Module> modules) {
}
public void moduleRemoved(Project project, Module module) {
}
project.getMessageBus().connect(project).subscribe(ProjectTopics.MODULES, new ModuleAdapter() {
public void beforeModuleRemoved(Project project, Module module) {
myProcessedModules.remove(module);
myModuleNames.remove(module.getName());
java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java
+6 -12
View File
@@ -7,9 +7,12 @@ import com.intellij.openapi.module.ModifiableModuleModel;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.StdModuleTypes;
import com.intellij.openapi.project.ModuleListener;
import com.intellij.openapi.project.ModuleAdapter;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.roots.ContentEntry;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.roots.ex.ProjectRootManagerEx;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.LocalFileSystem;
@@ -186,7 +189,7 @@ public class MultiModuleEditingTest extends ModuleTestCase {
}
private class MyModuleListener implements ModuleListener {
private static class MyModuleListener extends ModuleAdapter {
private final List<String> myLog = new ArrayList<String>();
@Override
@@ -194,20 +197,11 @@ public class MultiModuleEditingTest extends ModuleTestCase {
myLog.add("-" + module.getName());
}
@Override
public void modulesRenamed(Project project, List<Module> modules) {
// write something
}
@Override
public void moduleAdded(Project project, Module module) {
myLog.add("+" + module.getName());
}
@Override
public void beforeModuleRemoved(Project project, Module module) {
}
public void assertCorrectEvents(String[][] expected) {
int runningIndex = 0;
for (int chunkIndex = 0; chunkIndex < expected.length; chunkIndex++) {
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
+2 -13
View File
@@ -55,6 +55,7 @@ import com.intellij.openapi.module.EmptyModuleType;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModuleType;
import com.intellij.openapi.project.ModuleAdapter;
import com.intellij.openapi.project.ModuleListener;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
@@ -278,23 +279,11 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
}
});
connection.subscribe(ProjectTopics.MODULES, new ModuleListener() {
connection.subscribe(ProjectTopics.MODULES, new ModuleAdapter() {
@Override
public void moduleAdded(Project project, Module module) {
fail("Adding modules is not permitted in LightIdeaTestCase.");
}
@Override
public void beforeModuleRemoved(Project project, Module module) {
}
@Override
public void moduleRemoved(Project project, Module module) {
}
@Override
public void modulesRenamed(Project project, List<Module> modules) {
}
});
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureSynchronizer.java
+6 -12
View File
@@ -25,11 +25,14 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.project.DumbAwareRunnable;
import com.intellij.openapi.project.ModuleListener;
import com.intellij.openapi.project.ModuleAdapter;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.ModificationTracker;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Trinity;
import com.intellij.openapi.vfs.*;
import com.intellij.openapi.vfs.impl.BulkVirtualFileListenerAdapter;
import com.intellij.openapi.wm.ToolWindow;
@@ -89,20 +92,11 @@ public class MvcModuleStructureSynchronizer extends AbstractProjectComponent {
}
});
connection.subscribe(ProjectTopics.MODULES, new ModuleListener() {
connection.subscribe(ProjectTopics.MODULES, new ModuleAdapter() {
public void moduleAdded(Project project, Module module) {
queue(SyncAction.UpdateProjectStructure, module);
queue(SyncAction.CreateAppStructureIfNeeded, module);
}
public void beforeModuleRemoved(Project project, Module module) {
}
public void moduleRemoved(Project project, Module module) {
}
public void modulesRenamed(Project project, List<Module> modules) {
}
});
connection.subscribe(VirtualFileManager.VFS_CHANGES, new BulkVirtualFileListenerAdapter(new VirtualFileAdapter() {