From e54c9f9d2765630907ab62d4063fd564b6e71f8b Mon Sep 17 00:00:00 2001 From: mjudd Date: Thu, 16 Apr 2009 10:11:52 +0000 Subject: [PATCH] revert of 9021 & 9022 as requested by Heng Sin Low --- base/src/org/compiere/plaf/CompiereColor.java | 2 +- base/src/org/compiere/plaf/CompiereUtils.java | 24 ++++++++----------- .../org/compiere/grid/ed/VStringBeanInfo.java | 8 +++---- .../org/compiere/grid/ed/VTextBeanInfo.java | 8 +++---- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/base/src/org/compiere/plaf/CompiereColor.java b/base/src/org/compiere/plaf/CompiereColor.java index 3d85f784b8..b5d530cc06 100644 --- a/base/src/org/compiere/plaf/CompiereColor.java +++ b/base/src/org/compiere/plaf/CompiereColor.java @@ -603,7 +603,7 @@ public class CompiereColor implements Serializable if (m_image == null) { URL url = getTextureURL(); - m_image = CompiereUtils.loadBufferedImage(url.toString(), BufferedImage.TYPE_INT_ARGB_PRE); + m_image = CompiereUtils.loadBufferedImage(url, BufferedImage.TYPE_INT_ARGB_PRE); } return m_image; } // getTextureImage diff --git a/base/src/org/compiere/plaf/CompiereUtils.java b/base/src/org/compiere/plaf/CompiereUtils.java index 6907c8eca6..f638ec952b 100644 --- a/base/src/org/compiere/plaf/CompiereUtils.java +++ b/base/src/org/compiere/plaf/CompiereUtils.java @@ -247,13 +247,9 @@ public class CompiereUtils Image image = null; try { - // if path is null then return null - if(!path.equals(null)) - { - File file = new File(path); - URI url = file.toURI(); - image = loadImage(url); - } + File file = new File(path); + URI url = file.toURI(); + image = loadImage(url.toString()); } catch (SecurityException e) { @@ -269,10 +265,10 @@ public class CompiereUtils * @return loaded image at path or url * @see java.io.File#toURL() */ - public static synchronized Image loadImage(URI url) + public static synchronized Image loadImage(URL url) { Image image = null; - image = Toolkit.getDefaultToolkit().getImage(url.toString()); + image = Toolkit.getDefaultToolkit().getImage(url); if (image != null) { s_tracker.addImage(image, 0); @@ -353,7 +349,7 @@ public class CompiereUtils try { URI url = file.toURI(); - image = loadBufferedImage(url, imageType); + image = loadBufferedImage(url.toString(), imageType); } catch (SecurityException e) { @@ -373,13 +369,13 @@ public class CompiereUtils * @return loaded image at path or url * @see java.awt.image.BufferedImage */ - public static synchronized BufferedImage loadBufferedImage(URI url, int imageType) + public static synchronized BufferedImage loadBufferedImage(URL url, int imageType) { BufferedImage image = null; // Special handling for JPEG images to avoid extra processing if possible. if (url == null || !url.toString().toLowerCase().endsWith(".jpg")) { - Image tmpImage = loadImage(url.toString()); + Image tmpImage = loadImage(url); if (tmpImage != null) { image = new BufferedImage(tmpImage.getWidth(null), tmpImage.getHeight(null), imageType); @@ -414,7 +410,7 @@ public class CompiereUtils * @param url URL where the image file is located. * @return loaded image at path or url */ - public static synchronized BufferedImage loadBufferedJPEGImage (URI url) + public static synchronized BufferedImage loadBufferedJPEGImage (URL url) { BufferedImage image = null; if (url != null) @@ -422,7 +418,7 @@ public class CompiereUtils InputStream in = null; try { - in = url.toURL().openStream(); + in = url.openStream(); JPEGImageDecoder decoder = JPEGCodec.createJPEGDecoder(in); image = decoder.decodeAsBufferedImage(); } diff --git a/client/src/org/compiere/grid/ed/VStringBeanInfo.java b/client/src/org/compiere/grid/ed/VStringBeanInfo.java index c94fa5606d..b75b9136db 100644 --- a/client/src/org/compiere/grid/ed/VStringBeanInfo.java +++ b/client/src/org/compiere/grid/ed/VStringBeanInfo.java @@ -69,13 +69,13 @@ public class VStringBeanInfo extends SimpleBeanInfo { switch (iconKind) { case BeanInfo.ICON_COLOR_16x16: - return loadImage(iconColor16x16Filename); + return iconColor16x16Filename != null ? loadImage(iconColor16x16Filename) : null; case BeanInfo.ICON_COLOR_32x32: - return loadImage(iconColor32x32Filename); + return iconColor32x32Filename != null ? loadImage(iconColor32x32Filename) : null; case BeanInfo.ICON_MONO_16x16: - return loadImage(iconMono16x16Filename); + return iconMono16x16Filename != null ? loadImage(iconMono16x16Filename) : null; case BeanInfo.ICON_MONO_32x32: - return loadImage(iconMono32x32Filename); + return iconMono32x32Filename != null ? loadImage(iconMono32x32Filename) : null; } return null; } diff --git a/client/src/org/compiere/grid/ed/VTextBeanInfo.java b/client/src/org/compiere/grid/ed/VTextBeanInfo.java index 3ada3af40f..14a4585c11 100644 --- a/client/src/org/compiere/grid/ed/VTextBeanInfo.java +++ b/client/src/org/compiere/grid/ed/VTextBeanInfo.java @@ -81,13 +81,13 @@ public class VTextBeanInfo extends SimpleBeanInfo { switch (iconKind) { case BeanInfo.ICON_COLOR_16x16: - return loadImage(iconColor16x16Filename); + return iconColor16x16Filename != null ? loadImage(iconColor16x16Filename) : null; case BeanInfo.ICON_COLOR_32x32: - return loadImage(iconColor32x32Filename); + return iconColor32x32Filename != null ? loadImage(iconColor32x32Filename) : null; case BeanInfo.ICON_MONO_16x16: - return loadImage(iconMono16x16Filename); + return iconMono16x16Filename != null ? loadImage(iconMono16x16Filename) : null; case BeanInfo.ICON_MONO_32x32: - return loadImage(iconMono32x32Filename); + return iconMono32x32Filename != null ? loadImage(iconMono32x32Filename) : null; } return null; }