stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7124339: [macosx] setIconImage is not endlessly tolerant to the broken image-arguments

Browse Source 
Reviewed-by: alexsch, leonidr
This commit is contained in:
Sergey Bylokhov 2013-08-07 19:57:18 +04:00
parent eede95c5cf
commit 5fe59d132c
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
View File

@ -830,18 +830,19 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
// UTILITY METHODS // UTILITY METHODS
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
/* /**
* Find image to install into Title or into Application icon. * Find image to install into Title or into Application icon. First try
* First try icons installed for toplevel. If there is no icon * icons installed for toplevel. Null is returned, if there is no icon and
* use default Duke image. * default Duke image should be used.
* This method shouldn't return null.
*/ */
private CImage getImageForTarget() { private CImage getImageForTarget() {
List<Image> icons = target.getIconImages(); CImage icon = null;
if (icons == null || icons.size() == 0) { try {
return null; icon = CImage.getCreator().createFromImages(target.getIconImages());
} catch (Exception ignored) {
// Perhaps the icon passed into Java is broken. Skipping this icon.
} }
return CImage.getCreator().createFromImages(icons); return icon;
} }
/* /*