diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
| commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
| download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java')
| -rw-r--r-- | platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java index ae1e5336e9fe..efcdd148d57b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java @@ -357,7 +357,7 @@ public final class ToolWindowImpl implements ToolWindowEx { ApplicationManager.getApplication().assertIsDispatchThread(); final Icon oldIcon = getIcon(); if (oldIcon != icon && !(icon instanceof LayeredIcon) && (icon.getIconHeight() != 13 || icon.getIconWidth() != 13)) { - LOG.warn("ToolWindow icons should be 13x13. Please fix " + icon); + LOG.warn("ToolWindow icons should be 13x13. Please fix ToolWindow (ID: " + getId() + ") or icon " + icon); } getSelectedContent().setIcon(icon); myIcon = icon; |