diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java index 862bfd23eca1..c26edf504eb5 100644 --- a/platform/util/src/com/intellij/openapi/util/IconLoader.java +++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java @@ -174,7 +174,9 @@ public final class IconLoader { @Nullable public static Icon findIcon(URL url) { - if (url == null) return null; + if (url == null) { + return null; + } Icon icon = ourIconsCache.get(url); if (icon == null) { icon = new CachedImageIcon(url); diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/SizedIcon.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/SizedIcon.java index 7564eec28be5..018d6ebdfadf 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/SizedIcon.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/SizedIcon.java @@ -26,18 +26,16 @@ public class SizedIcon implements Icon { private final int myHeight; private final Image myImage; - public SizedIcon(int maxWidth, int maxHeight, ImageIcon icon) { - myWidth = Math.min(maxWidth, icon.getIconWidth()); - myHeight = Math.min(maxHeight, icon.getIconHeight()); - myImage = icon.getImage(); - } - public SizedIcon(int maxWidth, int maxHeight, Image image) { myWidth = Math.min(maxWidth, image.getWidth(null)); myHeight = Math.min(maxHeight, image.getHeight(null)); myImage = image; } + public SizedIcon(int maxWidth, int maxHeight, ImageIcon icon) { + this(maxWidth, maxHeight, icon.getImage()); + } + @Override public void paintIcon(Component c, Graphics g, int x, int y) { g.drawImage(myImage, x, y, myWidth, myHeight, null);