MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 15:06:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

improve messages for action system errors

Browse Source 
See EA-922947 - T: Unsafe.unpark

GitOrigin-RevId: 9656515a3d16993cbec3e62c3cd0c984f596a135
This commit is contained in:
Gregory.Shrago
2023-10-12 17:55:29 +03:00
committed by intellij-monorepo-bot
parent 3a999c1f58
commit cdae8b8138
1 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
platform/platform-api/src/com/intellij/ui/mac/touchbar/Touchbar.java
View File

@@ -153,38 +153,7 @@ public final class Touchbar {
boolean useTextFromAction /*for optional buttons*/) {
Object anAct = action == null ? null : action.getValue(OptionAction.AN_ACTION);
if (anAct == null) {
anAct = new DumbAwareAction() {
{
setEnabledInModalContext(true);
if (useTextFromAction) {
Object name = action == null ? button.getText() : action.getValue(Action.NAME);
getTemplatePresentation().setText(name instanceof String ? (String)name : "");
}
}
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
if (action == null) {
button.doClick();
return;
}
// also can be used something like: ApplicationManager.getApplication().invokeLater(() -> jb.doClick(), ms)
action.actionPerformed(new ActionEvent(button, ActionEvent.ACTION_PERFORMED, null));
}
@Override
public void update(@NotNull AnActionEvent e) {
e.getPresentation().setEnabled(action == null ? button.isEnabled() : action.isEnabled());
if (!useTextFromAction) {
e.getPresentation().setText(DialogWrapper.extractMnemonic(button.getText()).second);
}
}
@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.EDT;
}
};
anAct = new MyAction(useTextFromAction, action, button);
}
if (!(anAct instanceof AnAction)) {
return null;
@@ -192,4 +161,50 @@ public final class Touchbar {
TouchbarActionCustomizations.setComponent((AnAction)anAct, button).setShowText(true).setShowImage(false);
return (AnAction)anAct;
}
private static class MyAction extends DumbAwareAction implements ActionWithDelegate<Object> {
final boolean useTextFromAction;
final @Nullable Action action;
final @NotNull JButton button;
MyAction(boolean useTextFromAction, @Nullable Action action, @NotNull JButton button) {
this.useTextFromAction = useTextFromAction;
this.action = action;
this.button = button;
setEnabledInModalContext(true);
if (useTextFromAction) {
Object name = action == null ? button.getText() : action.getValue(Action.NAME);
getTemplatePresentation().setText(name instanceof String ? (String)name : "");
}
}
@Override
public @NotNull Object getDelegate() {
return action == null ? button : action;
}
@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.EDT;
}
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
if (action == null) {
button.doClick();
return;
}
// also can be used something like: ApplicationManager.getApplication().invokeLater(() -> jb.doClick(), ms)
action.actionPerformed(new ActionEvent(button, ActionEvent.ACTION_PERFORMED, null));
}
@Override
public void update(@NotNull AnActionEvent e) {
e.getPresentation().setEnabled(action == null ? button.isEnabled() : action.isEnabled());
if (!useTextFromAction) {
e.getPresentation().setText(DialogWrapper.extractMnemonic(button.getText()).second);
}
}
}
}