From 3fe3ff39a8078982505f7d1be3ea4d622ce3d146 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 14 Feb 2005 20:38:52 +0300 Subject: [PATCH] cosmetics --- .../ModulesDependenciesPanel.java | 51 ++++--------------- 1 file changed, 10 insertions(+), 41 deletions(-) diff --git a/source/com/intellij/moduleDependencies/ModulesDependenciesPanel.java b/source/com/intellij/moduleDependencies/ModulesDependenciesPanel.java index 3a4a634076b8..3d62c64d641a 100644 --- a/source/com/intellij/moduleDependencies/ModulesDependenciesPanel.java +++ b/source/com/intellij/moduleDependencies/ModulesDependenciesPanel.java @@ -1,7 +1,5 @@ package com.intellij.moduleDependencies; -import com.intellij.compiler.Chunk; -import com.intellij.cyclicDependencies.CyclicDependenciesUtil; import com.intellij.cyclicDependencies.CyclicGraphUtil; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.TreeExpander; @@ -96,37 +94,19 @@ public class ModulesDependenciesPanel extends JPanel{ return toolbar.getComponent(); } - private void buildRightTree(){ - if (myLeftTree.getSelectionPath() != null && myLeftTree.getSelectionPath().getLastPathComponent() != null){ - final Object userObject = ((DefaultMutableTreeNode)myLeftTree.getSelectionPath().getLastPathComponent()).getUserObject(); - if (userObject != null && userObject instanceof MyUserObject){ - buildRightTree(((MyUserObject)userObject).getModule()); - } - } - } - private void buildRightTree(Module module){ final DefaultMutableTreeNode root = (DefaultMutableTreeNode)myRightTreeModel.getRoot(); root.removeAllChildren(); - final List> chunks = CyclicDependenciesUtil.buildChunks(myModulesGraph); - for (Iterator> iterator = chunks.iterator(); iterator.hasNext();) { - Chunk chunk = iterator.next(); - if (!chunk.containsNode(module)){ - continue; - } - /*final CyclicDependenciesUtil.GraphTraverser graphTraverser = - new CyclicDependenciesUtil.GraphTraverser(module, chunk, myMaxShownCyclesInRightTree, myModulesGraph);*/ - final Set> cycles = CyclicGraphUtil.getNodeCycles(myModulesGraph, module);//graphTraverser.convert(graphTraverser.traverse()); - int index = 1; - for (Iterator> cyclesIterator = cycles.iterator(); cyclesIterator.hasNext();) { - List modules = cyclesIterator.next(); - final DefaultMutableTreeNode cycle = new DefaultMutableTreeNode("Cycle" + Integer.toString(index++).toUpperCase()); - root.add(cycle); - cycle.add(new DefaultMutableTreeNode(new MyUserObject(false, module))); - for (Iterator inCycleIterator = modules.iterator(); inCycleIterator.hasNext();) { - Module module1 = inCycleIterator.next(); - cycle.add(new DefaultMutableTreeNode(new MyUserObject(false, module1))); - } + final Set> cycles = CyclicGraphUtil.getNodeCycles(myModulesGraph, module); + int index = 1; + for (Iterator> cyclesIterator = cycles.iterator(); cyclesIterator.hasNext();) { + List modules = cyclesIterator.next(); + final DefaultMutableTreeNode cycle = new DefaultMutableTreeNode("Cycle" + Integer.toString(index++).toUpperCase()); + root.add(cycle); + cycle.add(new DefaultMutableTreeNode(new MyUserObject(false, module))); + for (Iterator inCycleIterator = modules.iterator(); inCycleIterator.hasNext();) { + Module module1 = inCycleIterator.next(); + cycle.add(new DefaultMutableTreeNode(new MyUserObject(false, module1))); } } ((DefaultTreeModel)myRightTree.getModel()).reload(); @@ -307,17 +287,6 @@ public class ModulesDependenciesPanel extends JPanel{ myContent = content; } - private final class CloseAction extends AnAction { - - public CloseAction() { - super("Close", "Close Modules Dependencies Viewer", IconLoader.getIcon("/actions/cancel.png")); - } - - public void actionPerformed(AnActionEvent e) { - DependenciesAnalyzeManager.getInstance(myProject).closeContent(myContent); - } - } - private static class MyUserObject{ private boolean myInCycle; private Module myModule;