mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 12:09:14 +00:00
8361610: Avoid wasted work in ImageIcon(Image) for setting description
Reviewed-by: kizune, aivanov
This commit is contained in:
parent
21efd25c11
commit
e5077660c4
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -209,8 +209,10 @@ public class ImageIcon implements Icon, Serializable, Accessible {
|
||||
* @param description a brief textual description of the image
|
||||
*/
|
||||
public ImageIcon(Image image, String description) {
|
||||
this(image);
|
||||
this.image = image;
|
||||
this.description = description;
|
||||
|
||||
loadImage(image);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -222,12 +224,17 @@ public class ImageIcon implements Icon, Serializable, Accessible {
|
||||
* @see java.awt.Image#getProperty
|
||||
*/
|
||||
public ImageIcon (Image image) {
|
||||
this.image = image;
|
||||
Object o = image.getProperty("comment", imageObserver);
|
||||
if (o instanceof String) {
|
||||
description = (String) o;
|
||||
}
|
||||
loadImage(image);
|
||||
this(image, getImageComment(image));
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the {@code "comment"} property of the image
|
||||
* if the value of the property is a sting}
|
||||
* @param image the image to get the {@code "comment"} property
|
||||
*/
|
||||
private static String getImageComment(Image image) {
|
||||
Object o = image.getProperty("comment", null);
|
||||
return (o instanceof String) ? (String) o : null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user