From 00ed32bc16f0f978a0b52b40aedcb7cf387b473a Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 25 Feb 2005 20:13:01 +0300 Subject: [PATCH] add icons --- icons/src/general/favorites.png | Bin 0 -> 637 bytes .../general/toolWindowModuleDependencies.png | Bin 0 -> 734 bytes .../AddNewFavoritesListAction.java | 18 +++++++- .../AddToFavoritesAction.java | 11 +++-- .../DeleteFromFavoritesAction.java | 16 ++----- .../FavoritesTreeNodeDescriptor.java | 39 +++++++++++++++--- .../favoritesTreeView/FavoritesViewImpl.java | 7 ++-- .../FavoritesViewSelectInTarget.java | 2 +- .../SendToFavoritesAction.java | 10 ++++- .../DependenciesAnalyzeManager.java | 2 +- 10 files changed, 72 insertions(+), 33 deletions(-) create mode 100644 icons/src/general/favorites.png create mode 100644 icons/src/general/toolWindowModuleDependencies.png diff --git a/icons/src/general/favorites.png b/icons/src/general/favorites.png new file mode 100644 index 0000000000000000000000000000000000000000..d1d8bea222b6281034ba59144c5e2e401a7bafe1 GIT binary patch literal 637 zcmV-@0)qXCP)&s6u1H5J1>$imc7|kYiwBX2|nmlmqe66#xVfi@^VXd7|8Z{8hw$FfcMP zF)%YT3o|eSWj>Gcf#k#K6G%kD)pBr#{1<&kPLTzA$`v@RcEXwJrld05QG&&bo2R zgjJ6izTIPB`27s1;R!^;pLYxl|2_f@`VRCc3&X#k{}~pZm3ahG4-i1i0?LLbAH3rF z_vFGpWjoau!VHXG7#RM(2WkT0PeArxhM!O0GIVZ|xV7!3$ixp!Op^cth*?6(fZ+!t zOU&^*E5j~OKmY^~a_FfwC;XNJ zYxoUx*3Vx+=dm#`u<$ZO>phcW_|G5%4n{e#?{8y^I+fNAdL_B-N!_usHj(-e5G0+NTR1qd(z XYGKL3vqK2-00000NkvXXu0mjf!-O9} literal 0 HcmV?d00001 diff --git a/icons/src/general/toolWindowModuleDependencies.png b/icons/src/general/toolWindowModuleDependencies.png new file mode 100644 index 0000000000000000000000000000000000000000..88a6fd71e1c6ef24f82588ec0e29383521a5ef80 GIT binary patch literal 734 zcmV<40wMj0P)U;ybt{GhvnDPFQTj8{TA&3i30=>3l8-HcCwdmIUD{GRnh#<@b~uz zhSNtLo9(===zr_8nk_&8Vb!E5@_2%u1COY*q6ovQ$M+ci|K()RH|1hrWO``x`iwvc zKmajebCs>ehZqfWYldrAUNKBt$GvjVcCH6szp^o?YKt+5bG{A*2p|ki7BY7hyZV?h z|NHxcVc)5r4{m-`iFoowZ0bJ-b_Na}VFnh)zkC1z1b3bc@0$`n_U}5fT#s$eoczh~ z;n^347oQ|w0{L}HLT^iz^sN{!pS;HK`iJlqfB*t%67W#HdMnhOO_Y!469X%s9s{Sa zJOdL8H-qlQhvxS#UpAN5)Mj90m1H<_^6;ORzl>V}0su7t%Krp89^JEJT}>4U0nY&C z;qU$TFdN8jY(i4-8f0P|+*rN1)W QQ2+n{07*qoM6N<$f~Cw$)&Kwi literal 0 HcmV?d00001 diff --git a/source/com/intellij/ide/favoritesTreeView/AddNewFavoritesListAction.java b/source/com/intellij/ide/favoritesTreeView/AddNewFavoritesListAction.java index 016beaef7c02..3b1205872574 100644 --- a/source/com/intellij/ide/favoritesTreeView/AddNewFavoritesListAction.java +++ b/source/com/intellij/ide/favoritesTreeView/AddNewFavoritesListAction.java @@ -7,14 +7,22 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.InputValidator; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.IconLoader; +import com.intellij.openapi.wm.ToolWindowId; +import com.intellij.openapi.wm.ToolWindowManager; +import com.intellij.ui.LayeredIcon; /** * User: anna * Date: Feb 24, 2005 */ public class AddNewFavoritesListAction extends AnAction{ + public static LayeredIcon ourIcon = new LayeredIcon(2); + static { + ourIcon.setIcon(IconLoader.getIcon("/general/favorites.png"), 1); + ourIcon.setIcon(IconLoader.getIcon("/general/add.png"), 0, 2, 2); + } public AddNewFavoritesListAction() { - super("Add New Favorites List", "Add New Favorites List", IconLoader.getIcon("/general/toolWindowMessages.png")); + super("Add New Favorites List", "Add New Favorites List", ourIcon); } public void actionPerformed(AnActionEvent e) { @@ -33,6 +41,12 @@ public class AddNewFavoritesListAction extends AnAction{ return inputString != null && inputString.trim().length() > 0; } }); - FavoritesViewImpl.getInstance(project).addNewFavoritesList(s); + final FavoritesViewImpl favoritesView = FavoritesViewImpl.getInstance(project); + final FavoritesTreeViewPanel favoritesTreeViewPanel = favoritesView.addNewFavoritesList(s); + final ToolWindowManager windowManager = ToolWindowManager.getInstance(project); + windowManager.getToolWindow(ToolWindowId.FAVORITES_VIEW).activate(null); + favoritesView.setSelectedContent(favoritesView.getContent(favoritesTreeViewPanel)); } + + } diff --git a/source/com/intellij/ide/favoritesTreeView/AddToFavoritesAction.java b/source/com/intellij/ide/favoritesTreeView/AddToFavoritesAction.java index 0002dacb0e22..43a2897be834 100644 --- a/source/com/intellij/ide/favoritesTreeView/AddToFavoritesAction.java +++ b/source/com/intellij/ide/favoritesTreeView/AddToFavoritesAction.java @@ -7,8 +7,6 @@ import com.intellij.ide.projectView.impl.ModuleGroup; import com.intellij.ide.projectView.impl.PackageViewPane; import com.intellij.ide.projectView.impl.nodes.*; import com.intellij.ide.util.treeView.AbstractTreeNode; -import com.intellij.j2ee.module.view.J2EEProjectViewPane; -import com.intellij.j2ee.module.view.nodes.J2EENodeDescriptor; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataConstants; @@ -49,6 +47,10 @@ public class AddToFavoritesAction extends AnAction { final DataContext dataContext = e.getDataContext(); Project project = (Project)dataContext.getData(DataConstants.PROJECT); final AbstractTreeNode[] nodes = createNodes(dataContext); + addNodes(project, nodes); + } + + public void addNodes(final Project project, final AbstractTreeNode[] nodes) { final FavoritesViewImpl favoritesView = FavoritesViewImpl.getInstance(project); if (nodes != null) { final FavoritesTreeViewPanel favoritesTreeViewPanel = favoritesView.getFavoritesTreeViewPanel(myFavoritesList); @@ -81,10 +83,7 @@ public class AddToFavoritesAction extends AnAction { final String currentViewId = ProjectView.getInstance(project).getCurrentViewId(); AbstractProjectViewPane pane = ProjectView.getInstance(project).getProjectViewPaneById(currentViewId); - if (currentViewId.equals(J2EEProjectViewPane.ID)){ - J2EENodeDescriptor j2eeNodeDescriptor = (J2EENodeDescriptor)pane.getSelectedDescriptor(); - } - + //on psi element PsiElement psiElement = (PsiElement)dataContext.getData(DataConstants.PSI_ELEMENT); if (psiElement != null){ diff --git a/source/com/intellij/ide/favoritesTreeView/DeleteFromFavoritesAction.java b/source/com/intellij/ide/favoritesTreeView/DeleteFromFavoritesAction.java index fc9a3dcdec48..c59e542e89ad 100644 --- a/source/com/intellij/ide/favoritesTreeView/DeleteFromFavoritesAction.java +++ b/source/com/intellij/ide/favoritesTreeView/DeleteFromFavoritesAction.java @@ -11,7 +11,7 @@ import com.intellij.openapi.util.IconLoader; */ public class DeleteFromFavoritesAction extends AnAction { public DeleteFromFavoritesAction() { - super("Remove From Favorites", "Remove Selected Favorite", IconLoader.getIcon("/actions/cancel.png")); + super("Remove From Current Favorites", "Remove Selected Favorite", IconLoader.getIcon("/general/remove.png")); } public void actionPerformed(AnActionEvent e) { @@ -32,24 +32,14 @@ public class DeleteFromFavoritesAction extends AnAction { final FavoritesTreeViewPanel favoritesTreeViewPanel = FavoritesViewImpl.getInstance(project).getFavoritesTreeViewPanel(favoritesViewPane); for (int i = 0; selectedNodeDescriptors != null && i < selectedNodeDescriptors.length; i++) { FavoritesTreeNodeDescriptor selectedNodeDescriptor = selectedNodeDescriptors[i]; - selectedNodeDescriptor = getFavoritesRoot(selectedNodeDescriptor, project, favoritesViewPane); + selectedNodeDescriptor = FavoritesTreeNodeDescriptor.getFavoritesRoot(selectedNodeDescriptor, project, favoritesViewPane); if (selectedNodeDescriptor != null) { favoritesTreeViewPanel.removeFromFavorites((AbstractTreeNode)selectedNodeDescriptor.getElement()); } } } - private FavoritesTreeNodeDescriptor getFavoritesRoot(FavoritesTreeNodeDescriptor node, Project project, String favoritesViewPane) { - final FavoritesTreeViewPanel favoritesTreeViewPanel = FavoritesViewImpl.getInstance(project).getFavoritesTreeViewPanel(favoritesViewPane); - while (node.getParentDescriptor() != null && node.getParentDescriptor() instanceof FavoritesTreeNodeDescriptor) { - FavoritesTreeNodeDescriptor favoritesDescriptor = (FavoritesTreeNodeDescriptor)node.getParentDescriptor(); - if (favoritesDescriptor.getElement() == favoritesTreeViewPanel.getFavoritesTreeStructure().getRootElement()) { - return node; - } - node = favoritesDescriptor; - } - return node; - } + public void update(AnActionEvent e) { final DataContext dataContext = e.getDataContext(); diff --git a/source/com/intellij/ide/favoritesTreeView/FavoritesTreeNodeDescriptor.java b/source/com/intellij/ide/favoritesTreeView/FavoritesTreeNodeDescriptor.java index ef66e66a937c..d5f6008d48d6 100644 --- a/source/com/intellij/ide/favoritesTreeView/FavoritesTreeNodeDescriptor.java +++ b/source/com/intellij/ide/favoritesTreeView/FavoritesTreeNodeDescriptor.java @@ -9,13 +9,13 @@ import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.impl.ModuleUtil; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Iconable; import com.intellij.openapi.vcs.FileStatusManager; -import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiDirectory; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; +import com.intellij.psi.*; import com.intellij.psi.presentation.java.ClassPresentationUtil; +import javax.swing.*; + /** * User: anna * Date: Feb 15, 2005 @@ -35,12 +35,27 @@ public class FavoritesTreeNodeDescriptor extends NodeDescriptor nodesToAdd = new ArrayList(); + for (int i = 0; i < selectedNodeDescriptors.length; i++) { + final FavoritesTreeNodeDescriptor selectedNodeDescriptor = FavoritesTreeNodeDescriptor.getFavoritesRoot(selectedNodeDescriptors[i], project, currentTreeViewPanel.getName()); + nodesToAdd.add(selectedNodeDescriptor.getElement()); + } + favoritesView.getAddToFavoritesAction(myName).addNodes(project, nodesToAdd.toArray(new AbstractTreeNode[nodesToAdd.size()])); ((DeleteFromFavoritesAction)ActionManager.getInstance().getAction(IdeActions.REMOVE_FROM_FAVORITES)).removeNodes(selectedNodeDescriptors, project, currentTreeViewPanel.getName()); } diff --git a/source/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java b/source/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java index ce8316cd1333..7093fa23bfca 100644 --- a/source/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java +++ b/source/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java @@ -37,7 +37,7 @@ public class DependenciesAnalyzeManager implements ProjectComponent{ myContentManager.getComponent(), ToolWindowAnchor.RIGHT); - toolWindow.setIcon(IconLoader.getIcon("/general/toolWindowInspection.png")); + toolWindow.setIcon(IconLoader.getIcon("/general/toolWindowModuleDependencies.png")); new ContentManagerWatcher(toolWindow, myContentManager); } });