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

cleanup

Browse Source
This commit is contained in:
Konstantin Bulenkov
2016-04-14 22:03:49 +02:00
parent 320aeb7b5e
commit 9ae7d8bea4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
+7 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -751,7 +751,7 @@ public final class IdeKeyEventDispatcher implements Disposable {
final List<AnAction> readOnlyActions = Collections.unmodifiableList(actions);
for (ActionPromoter promoter : ActionPromoter.EP_NAME.getExtensions()) {
final List<AnAction> promoted = promoter.promote(readOnlyActions, myContext.getDataContext());
if (promoted.isEmpty()) continue;
if (promoted == null || promoted.isEmpty()) continue;
actions.removeAll(promoted);
actions.addAll(0, promoted);
@@ -910,14 +910,16 @@ public final class IdeKeyEventDispatcher implements Disposable {
private static class ActionListCellRenderer extends ColoredListCellRenderer {
@Override
protected void customizeCellRenderer(final JList list, final Object value, final int index, final boolean selected, final boolean hasFocus) {
if (value == null) return;
protected void customizeCellRenderer(@NotNull final JList list, final Object value, final int index, final boolean selected, final boolean hasFocus) {
if (value instanceof Pair) {
//noinspection unchecked
final Pair<AnAction, KeyStroke> pair = (Pair<AnAction, KeyStroke>) value;
append(KeymapUtil.getShortcutText(new KeyboardShortcut(pair.getSecond(), null)), SimpleTextAttributes.GRAY_ATTRIBUTES);
appendTextPadding(30);
final String text = pair.getFirst().getTemplatePresentation().getText();
append(text, SimpleTextAttributes.REGULAR_ATTRIBUTES);
if (text != null) {
append(text, SimpleTextAttributes.REGULAR_ATTRIBUTES);
}
}
}
}