midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BF [ 2768070 ] - Recursive calls to loadImage in CompiereUtils

This commit is contained in:
mjudd 2009-04-16 09:15:16 +00:00
parent 6e73ead053
commit 20064c8f1a
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
base/src/org/compiere/plaf/CompiereUtils.java
View File

@ -247,9 +247,13 @@ public class CompiereUtils
Image image = null; Image image = null;
try try
{ {
File file = new File(path); // if path is null then return null
URI url = file.toURI(); if(!path.equals(null))
image = loadImage(url.toString()); {
File file = new File(path);
URI url = file.toURI();
image = loadImage(url);
}
} }
catch (SecurityException e) catch (SecurityException e)
{ {
@ -265,10 +269,10 @@ public class CompiereUtils
* @return loaded image at path or url * @return loaded image at path or url
* @see java.io.File#toURL() * @see java.io.File#toURL()
*/ */
public static synchronized Image loadImage(URL url) public static synchronized Image loadImage(URI url)
{ {
Image image = null; Image image = null;
image = Toolkit.getDefaultToolkit().getImage(url); image = Toolkit.getDefaultToolkit().getImage(url.toString());
if (image != null) if (image != null)
{ {
s_tracker.addImage(image, 0); s_tracker.addImage(image, 0);
@ -349,7 +353,7 @@ public class CompiereUtils
try try
{ {
URI url = file.toURI(); URI url = file.toURI();
image = loadBufferedImage(url.toString(), imageType); image = loadBufferedImage(url, imageType);
} }
catch (SecurityException e) catch (SecurityException e)
{ {
@ -369,13 +373,13 @@ public class CompiereUtils
* @return loaded image at path or url * @return loaded image at path or url
* @see java.awt.image.BufferedImage * @see java.awt.image.BufferedImage
*/ */
public static synchronized BufferedImage loadBufferedImage(URL url, int imageType) public static synchronized BufferedImage loadBufferedImage(URI url, int imageType)
{ {
BufferedImage image = null; BufferedImage image = null;
// Special handling for JPEG images to avoid extra processing if possible. // Special handling for JPEG images to avoid extra processing if possible.
if (url == null || !url.toString().toLowerCase().endsWith(".jpg")) if (url == null || !url.toString().toLowerCase().endsWith(".jpg"))
{ {
Image tmpImage = loadImage(url); Image tmpImage = loadImage(url.toString());
if (tmpImage != null) if (tmpImage != null)
{ {
image = new BufferedImage(tmpImage.getWidth(null), tmpImage.getHeight(null), imageType); image = new BufferedImage(tmpImage.getWidth(null), tmpImage.getHeight(null), imageType);
@ -410,7 +414,7 @@ public class CompiereUtils
* @param url URL where the image file is located. * @param url URL where the image file is located.
* @return loaded image at path or url * @return loaded image at path or url
*/ */
public static synchronized BufferedImage loadBufferedJPEGImage (URL url) public static synchronized BufferedImage loadBufferedJPEGImage (URI url)
{ {
BufferedImage image = null; BufferedImage image = null;
if (url != null) if (url != null)
@ -418,7 +422,7 @@ public class CompiereUtils
InputStream in = null; InputStream in = null;
try try
{ {
in = url.openStream(); in = url.toURL().openStream();
JPEGImageDecoder decoder = JPEGCodec.createJPEGDecoder(in); JPEGImageDecoder decoder = JPEGCodec.createJPEGDecoder(in);
image = decoder.decodeAsBufferedImage(); image = decoder.decodeAsBufferedImage();
} }

8
client/src/org/compiere/grid/ed/VStringBeanInfo.java
View File

@ -69,13 +69,13 @@ public class VStringBeanInfo extends SimpleBeanInfo
{ {
switch (iconKind) { switch (iconKind) {
case BeanInfo.ICON_COLOR_16x16: case BeanInfo.ICON_COLOR_16x16:
return iconColor16x16Filename != null ? loadImage(iconColor16x16Filename) : null; return loadImage(iconColor16x16Filename);
case BeanInfo.ICON_COLOR_32x32: case BeanInfo.ICON_COLOR_32x32:
return iconColor32x32Filename != null ? loadImage(iconColor32x32Filename) : null; return loadImage(iconColor32x32Filename);
case BeanInfo.ICON_MONO_16x16: case BeanInfo.ICON_MONO_16x16:
return iconMono16x16Filename != null ? loadImage(iconMono16x16Filename) : null; return loadImage(iconMono16x16Filename);
case BeanInfo.ICON_MONO_32x32: case BeanInfo.ICON_MONO_32x32:
return iconMono32x32Filename != null ? loadImage(iconMono32x32Filename) : null; return loadImage(iconMono32x32Filename);
} }
return null; return null;
} }

8
client/src/org/compiere/grid/ed/VTextBeanInfo.java
View File

@ -81,13 +81,13 @@ public class VTextBeanInfo extends SimpleBeanInfo
{ {
switch (iconKind) { switch (iconKind) {
case BeanInfo.ICON_COLOR_16x16: case BeanInfo.ICON_COLOR_16x16:
return iconColor16x16Filename != null ? loadImage(iconColor16x16Filename) : null; return loadImage(iconColor16x16Filename);
case BeanInfo.ICON_COLOR_32x32: case BeanInfo.ICON_COLOR_32x32:
return iconColor32x32Filename != null ? loadImage(iconColor32x32Filename) : null; return loadImage(iconColor32x32Filename);
case BeanInfo.ICON_MONO_16x16: case BeanInfo.ICON_MONO_16x16:
return iconMono16x16Filename != null ? loadImage(iconMono16x16Filename) : null; return loadImage(iconMono16x16Filename);
case BeanInfo.ICON_MONO_32x32: case BeanInfo.ICON_MONO_32x32:
return iconMono32x32Filename != null ? loadImage(iconMono32x32Filename) : null; return loadImage(iconMono32x32Filename);
} }
return null; return null;
} }