From ec12eb6e609b88c1ea51f643c173e56e0aa70880 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Wed, 24 Jun 2015 15:22:34 +0300 Subject: [PATCH] refactor DarculaLaf.loadIcon() --- .../ide/ui/laf/darcula/DarculaLaf.java | 4 +-- .../intellij/MacIntelliJBorderPainter.java | 16 +++++------ .../ui/laf/intellij/MacIntelliJButtonUI.java | 28 +++++++++---------- .../laf/intellij/MacIntelliJCheckBoxUI.java | 4 +-- .../laf/intellij/MacIntelliJComboBoxUI.java | 6 ++-- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java index 1f729b7d1ae3..4be38db9bcdd 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java @@ -438,7 +438,7 @@ public class DarculaLaf extends BasicLookAndFeel { return true; } - public static Icon loadIcon(String path) { - return IconLoader.findIcon(path, DarculaLaf.class, true); + public static Icon loadIcon(String iconName) { + return IconLoader.findIcon("/com/intellij/ide/ui/laf/icons/" + iconName, DarculaLaf.class, true); } } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJBorderPainter.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJBorderPainter.java index 6b563ac26a68..abf0910eb891 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJBorderPainter.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJBorderPainter.java @@ -25,14 +25,14 @@ import java.awt.*; */ @SuppressWarnings("UnnecessaryLocalVariable") public class MacIntelliJBorderPainter { - private static final Icon L = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/macBorderLeft.png"); - private static final Icon R = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/macBorderRight.png"); - private static final Icon T = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/macBorderTop.png"); - private static final Icon B = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/macBorderBottom.png"); - private static final Icon TL = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/macBorderTopLeft.png"); - private static final Icon TR = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/macBorderTopRight.png"); - private static final Icon BL = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/macBorderBottomLeft.png"); - private static final Icon BR = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/macBorderBottomRight.png"); + private static final Icon L = DarculaLaf.loadIcon("macBorderLeft.png"); + private static final Icon R = DarculaLaf.loadIcon("macBorderRight.png"); + private static final Icon T = DarculaLaf.loadIcon("macBorderTop.png"); + private static final Icon B = DarculaLaf.loadIcon("macBorderBottom.png"); + private static final Icon TL = DarculaLaf.loadIcon("macBorderTopLeft.png"); + private static final Icon TR = DarculaLaf.loadIcon("macBorderTopRight.png"); + private static final Icon BL = DarculaLaf.loadIcon("macBorderBottomLeft.png"); + private static final Icon BR = DarculaLaf.loadIcon("macBorderBottomRight.png"); public static void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { g = g.create(x,y,width,height); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJButtonUI.java index 777104f441b7..3c422c9f6301 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJButtonUI.java @@ -34,20 +34,20 @@ public class MacIntelliJButtonUI extends DarculaButtonUI { private static Rectangle textRect = new Rectangle(); private static Rectangle iconRect = new Rectangle(); - private static final Icon LEFT = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/buttonLeft.png"); - private static final Icon RIGHT = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/buttonRight.png"); - private static final Icon MIDDLE = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/buttonMiddle.png"); - private static final Icon LEFT_SELECTED = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/selectedButtonLeft.png"); - private static final Icon RIGHT_SELECTED = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/selectedButtonRight.png"); - private static final Icon MIDDLE_SELECTED = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/selectedButtonMiddle.png"); - private static final Icon LEFT_FOCUSED = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/focusedButtonLeft.png"); - private static final Icon RIGHT_FOCUSED = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/focusedButtonRight.png"); - private static final Icon MIDDLE_FOCUSED = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/focusedButtonMiddle.png"); - private static final Icon LEFT_SELECTED_FOCUSED = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/focusedSelectedButtonLeft.png"); - private static final Icon RIGHT_SELECTED_FOCUSED = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/focusedSelectedButtonRight.png"); - private static final Icon MIDDLE_SELECTED_FOCUSED = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/focusedSelectedButtonMiddle.png"); - private static final Icon HELP_BUTTON = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/helpButton.png"); - private static final Icon HELP_BUTTON_FOCUSED = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/focusedHelpButton.png"); + private static final Icon LEFT = DarculaLaf.loadIcon("buttonLeft.png"); + private static final Icon RIGHT = DarculaLaf.loadIcon("buttonRight.png"); + private static final Icon MIDDLE = DarculaLaf.loadIcon("buttonMiddle.png"); + private static final Icon LEFT_SELECTED = DarculaLaf.loadIcon("selectedButtonLeft.png"); + private static final Icon RIGHT_SELECTED = DarculaLaf.loadIcon("selectedButtonRight.png"); + private static final Icon MIDDLE_SELECTED = DarculaLaf.loadIcon("selectedButtonMiddle.png"); + private static final Icon LEFT_FOCUSED = DarculaLaf.loadIcon("focusedButtonLeft.png"); + private static final Icon RIGHT_FOCUSED = DarculaLaf.loadIcon("focusedButtonRight.png"); + private static final Icon MIDDLE_FOCUSED = DarculaLaf.loadIcon("focusedButtonMiddle.png"); + private static final Icon LEFT_SELECTED_FOCUSED = DarculaLaf.loadIcon("focusedSelectedButtonLeft.png"); + private static final Icon RIGHT_SELECTED_FOCUSED = DarculaLaf.loadIcon("focusedSelectedButtonRight.png"); + private static final Icon MIDDLE_SELECTED_FOCUSED = DarculaLaf.loadIcon("focusedSelectedButtonMiddle.png"); + private static final Icon HELP_BUTTON = DarculaLaf.loadIcon("helpButton.png"); + private static final Icon HELP_BUTTON_FOCUSED = DarculaLaf.loadIcon("focusedHelpButton.png"); @SuppressWarnings({"MethodOverridesStaticMethodOfSuperclass", "UnusedDeclaration"}) public static ComponentUI createUI(JComponent c) { diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJCheckBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJCheckBoxUI.java index 077a788f0e79..d63d4659fcc8 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJCheckBoxUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJCheckBoxUI.java @@ -27,8 +27,8 @@ import java.awt.*; */ public class MacIntelliJCheckBoxUI extends IntelliJCheckBoxUI { public static final Icon DEFAULT_ICON = EmptyIcon.create(14); - public static final Icon CHECKED_ICON = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/checkboxSelectedMac.png"); - public static final Icon UNCHECKED_ICON = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/checkboxMac.png"); + public static final Icon CHECKED_ICON = DarculaLaf.loadIcon("checkboxSelectedMac.png"); + public static final Icon UNCHECKED_ICON = DarculaLaf.loadIcon("checkboxMac.png"); @SuppressWarnings({"MethodOverridesStaticMethodOfSuperclass", "UnusedDeclaration"}) public static ComponentUI createUI(JComponent c) { diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJComboBoxUI.java index a1a31e86577d..afa203c66ae2 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJComboBoxUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJComboBoxUI.java @@ -36,9 +36,9 @@ import java.awt.event.KeyEvent; * @author Konstantin Bulenkov */ public class MacIntelliJComboBoxUI extends BasicComboBoxUI { - private static final Icon COMBOBOX = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/comboboxMac.png"); - private static final Icon COMBOBOX_LEFT = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/comboboxLeft.png"); - private static final Icon COMBOBOX_TOP_BOTTOM = DarculaLaf.loadIcon("/com/intellij/ide/ui/laf/icons/comboboxTopBottom.png"); + private static final Icon COMBOBOX = DarculaLaf.loadIcon("comboboxMac.png"); + private static final Icon COMBOBOX_LEFT = DarculaLaf.loadIcon("comboboxLeft.png"); + private static final Icon COMBOBOX_TOP_BOTTOM = DarculaLaf.loadIcon("comboboxTopBottom.png"); private final JComboBox myComboBox; public MacIntelliJComboBoxUI(JComboBox comboBox) {