This is an automated email from the ASF dual-hosted git repository. ebakke pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 5f828b3eb302124ba438c235053f7863417e8d30 Author: Eirik Bakke <[email protected]> AuthorDate: Sun Jun 2 14:31:59 2019 -0400 Don't have CachedHiDPIIcon extend from ImageIcon. This was left over from a previous experiment. Also fix a case where ImageUtilities.icon2Image could return null even when the icon is not null. (Include this fix in this PR rather than in the SVG support PR, to ensure I don't commit bugs if this one is merged before the other.) --- platform/openide.util.ui/src/org/openide/util/CachedHiDPIIcon.java | 3 +-- platform/openide.util.ui/src/org/openide/util/ImageUtilities.java | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/openide.util.ui/src/org/openide/util/CachedHiDPIIcon.java b/platform/openide.util.ui/src/org/openide/util/CachedHiDPIIcon.java index 107469c..b0bcffe 100644 --- a/platform/openide.util.ui/src/org/openide/util/CachedHiDPIIcon.java +++ b/platform/openide.util.ui/src/org/openide/util/CachedHiDPIIcon.java @@ -29,14 +29,13 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; import javax.swing.Icon; -import javax.swing.ImageIcon; /** * Abstract base class for {@link javax.swing.Icon} implementations that need to cache scaled bitmap * representations for HiDPI displays. Bitmaps for multiple HiDPI scaling factors can be cached at * the same time, e.g. for multi-monitor setups. Thread-safe. */ -abstract class CachedHiDPIIcon extends ImageIcon { +abstract class CachedHiDPIIcon implements Icon { /** * The maximum size of the cache, as a multiple of the size of the icon at 100% scaling. For * example, storing three images at 100%, 150%, and 200% scaling, respectively, yields a total diff --git a/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java b/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java index e7f8121..b133ad9 100644 --- a/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java +++ b/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java @@ -303,10 +303,11 @@ public final class ImageUtilities { } else if (icon instanceof IconImageIcon) { return icon2Image(((IconImageIcon) icon).getDelegateIcon()); } else if (icon instanceof ImageIcon) { - return ((ImageIcon) icon).getImage(); - } else { - return icon2ToolTipImage(icon); + Image ret = ((ImageIcon) icon).getImage(); + if (ret != null) + return ret; } + return icon2ToolTipImage(icon); } private static ToolTipImage icon2ToolTipImage(Icon icon) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
