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

structure view: support actions on groups (IDEA-170415)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-04-13 14:03:16 +02:00
parent e561e921da
commit a6553fa223
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
+10 -7
View File
@@ -251,7 +251,16 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
if (selectionPaths == null) return null;
List<Object> result = new ArrayList<>();
for (TreePath selectionPath : selectionPaths) {
ContainerUtil.addIfNotNull(result, getNodeTreeValue((DefaultMutableTreeNode)selectionPath.getLastPathComponent()));
Object value = getNodeValue((DefaultMutableTreeNode)selectionPath.getLastPathComponent());
if (value instanceof StructureViewTreeElement) {
ContainerUtil.addIfNotNull(result, ((StructureViewTreeElement)value).getValue());
}
else if (value instanceof Group) {
((Group)value).getChildren().stream()
.filter(element -> element instanceof StructureViewTreeElement)
.map(element -> ((StructureViewTreeElement)element).getValue())
.forEach(element -> ContainerUtil.addIfNotNull(result, element));
}
}
return ArrayUtil.toObjectArray(result);
}
@@ -275,12 +284,6 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre
return userObject instanceof AbstractTreeNode ? ((AbstractTreeNode)userObject).getValue() : null;
}
@Nullable
private static Object getNodeTreeValue(DefaultMutableTreeNode mutableTreeNode) {
Object value = getNodeValue(mutableTreeNode);
return value instanceof StructureViewTreeElement ? ((StructureViewTreeElement)value).getValue() : null;
}
private void addTreeMouseListeners() {
EditSourceOnDoubleClickHandler.install(getTree());
CustomizationUtil.installPopupHandler(getTree(), IdeActions.GROUP_STRUCTURE_VIEW_POPUP, ActionPlaces.STRUCTURE_VIEW_POPUP);