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

diff: do not put duplicates into ActionGroup

Browse Source 
fix exception if DiffViewerWrapper and wrapped DiffViewer have same action on toolbar
This commit is contained in:
Aleksey Pivovarov
2016-06-29 14:05:21 +03:00
committed by Aleksey Pivovarov
parent db509daabd
commit 14c3a4de43
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+9 -8
View File
@@ -328,18 +328,19 @@ public class DiffUtil {
}
public static void addActionBlock(@NotNull DefaultActionGroup group, AnAction... actions) {
if (actions.length == 0) return;
if (group.getChildrenCount() != 0) group.addSeparator();
for (AnAction action : actions) {
if (action != null) group.add(action);
}
addActionBlock(group, Arrays.asList(actions));
}
public static void addActionBlock(@NotNull DefaultActionGroup group, @Nullable List<? extends AnAction> actions) {
if (actions == null || actions.isEmpty()) return;
if (group.getChildrenCount() != 0) group.addSeparator();
group.addAll(actions);
group.addSeparator();
AnAction[] children = group.getChildren(null);
for (AnAction action : actions) {
if (!ArrayUtil.contains(action, children)) {
group.add(action);
}
}
}
@NotNull