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

EA-67323 vcs: fix AIOOBE - common shortcuts can be empty

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-04-16 18:16:33 +03:00
parent 8d231f82ef
commit 9f389a1f72
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+8 -6
View File
@@ -64,6 +64,7 @@ import com.intellij.ui.content.ContentManager;
import com.intellij.ui.dualView.*;
import com.intellij.ui.table.TableView;
import com.intellij.util.*;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.text.DateFormatUtil;
import com.intellij.util.ui.*;
import org.jetbrains.annotations.NonNls;
@@ -764,12 +765,13 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
final MyDiffAction diffAction = new MyDiffAction();
result.add(diffAction);
if (!popup) {
diffAction.registerCustomShortcutSet(new CustomShortcutSet(
CommonShortcuts.getDiff().getShortcuts() [0],
CommonShortcuts.DOUBLE_CLICK_1.getShortcuts() [0]), myDualView.getFlatView());
diffAction.registerCustomShortcutSet(new CustomShortcutSet(
CommonShortcuts.getDiff().getShortcuts() [0],
CommonShortcuts.DOUBLE_CLICK_1.getShortcuts() [0]), myDualView.getTreeView());
List<Shortcut> shortcuts = new SmartList<Shortcut>();
ContainerUtil.addAll(shortcuts, CommonShortcuts.getDiff().getShortcuts());
ContainerUtil.addAll(shortcuts, CommonShortcuts.DOUBLE_CLICK_1.getShortcuts());
CustomShortcutSet shortcutSet = new CustomShortcutSet(ContainerUtil.toArray(shortcuts, new Shortcut[shortcuts.size()]));
diffAction.registerCustomShortcutSet(shortcutSet, myDualView.getFlatView());
diffAction.registerCustomShortcutSet(shortcutSet, myDualView.getTreeView());
}
else {
diffAction.registerCustomShortcutSet(CommonShortcuts.getDiff(), this);