From cffb77f9758bb756538d698a7a7a35e54a2335ed Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 17 Oct 2011 12:38:11 +0200 Subject: [PATCH] avoid initializing AWT event loop in Kotlin compiler --- .../com/intellij/openapi/util/IconLoader.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java index a02813340427..897438fb65d7 100644 --- a/platform/util/src/com/intellij/openapi/util/IconLoader.java +++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java @@ -45,12 +45,6 @@ public final class IconLoader { */ private static final Map ourIcon2DisabledIcon = new WeakHashMap(200); - /** - * To get disabled icon with paint it into the image. Some icons require - * not null component to paint. - */ - private static final JComponent ourFakeComponent = new JLabel(); - private static final ImageIcon EMPTY_ICON = new ImageIcon(new BufferedImage(1, 1, BufferedImage.TYPE_3BYTE_BGR)) { @NonNls public String toString() { @@ -154,7 +148,7 @@ public final class IconLoader { @Nullable private static Icon checkIcon(final Image image, URL url) { - if (image == null || image.getHeight(ourFakeComponent) < 1) { // image wasn't loaded or broken + if (image == null || image.getHeight(LabelHolder.ourFakeComponent) < 1) { // image wasn't loaded or broken return null; } @@ -192,7 +186,7 @@ public final class IconLoader { graphics.setColor(UIUtil.TRANSPARENT_COLOR); graphics.fillRect(0, 0, icon.getIconWidth(), icon.getIconHeight()); - icon.paintIcon(ourFakeComponent, graphics, 0, 0); + icon.paintIcon(LabelHolder.ourFakeComponent, graphics, 0, 0); graphics.dispose(); @@ -342,4 +336,12 @@ public final class IconLoader { return "icon path=" + myPath + " class=" + myCallerClass; } } + + private static class LabelHolder { + /** + * To get disabled icon with paint it into the image. Some icons require + * not null component to paint. + */ + private static final JComponent ourFakeComponent = new JLabel(); + } }