From 5dd2b0eb889e370f8da21829647f3afbf32082d4 Mon Sep 17 00:00:00 2001 From: Artem Bochkarev Date: Thu, 12 Jul 2018 17:39:20 +0700 Subject: [PATCH] MacBook touch bar: remove errors logging because plugins can replace editor-headers so that components don't contain action group for touchbar fixed EA-124125 - assert: ProjectData.findEditorDataByComponent fixed EA-124353 - assert: TouchBar.createItem --- .../src/com/intellij/ui/mac/touchbar/ProjectData.java | 2 +- .../com/intellij/ui/mac/touchbar/TBItemAnActionButton.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ProjectData.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ProjectData.java index 10d630d7371c..7c817b7cc6ca 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ProjectData.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ProjectData.java @@ -148,7 +148,7 @@ class ProjectData { if (child == ecmp || SwingUtilities.isDescendingFrom(child, ecmp)) { // System.out.println("focused header: " + ecmp); if (editorData.containerSearch == null) { - LOG.error("focused header of editor: " + editorData.editor + ", but BarContainer wasn't created, header: " + ecmp); + // System.out.println("focused header of editor '" + editorData.editor + "', but BarContainer wasn't created (seems that ui-component doesn't contain actions for touchbar), header: " + ecmp); continue; } return editorData; diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemAnActionButton.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemAnActionButton.java index 4bae3f73dd62..4f6aeec6ef4b 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemAnActionButton.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemAnActionButton.java @@ -20,8 +20,6 @@ import java.awt.event.KeyEvent; import static java.awt.event.ComponentEvent.COMPONENT_FIRST; class TBItemAnActionButton extends TBItemButton { - private static final boolean LOG_ICON_ERRORS = System.getProperty("touchbar.log.icon.errors", "false").equals("true"); - public static final int SHOWMODE_IMAGE_ONLY = 0; public static final int SHOWMODE_TEXT_ONLY = 1; public static final int SHOWMODE_IMAGE_TEXT = 2; @@ -113,8 +111,7 @@ class TBItemAnActionButton extends TBItemButton { if (icon == null) icon = IconLoader.getDisabledIcon(presentation.getIcon()); } - if (icon == null && LOG_ICON_ERRORS) - LOG.error("can't get icon, action " + myActionId + ", presentation = " + _printPresentation(presentation)); + // if (icon == null) System.out.println("WARN: can't obtain icon, action " + myActionId + ", presentation = " + _printPresentation(presentation)); } boolean isSelected = false;