diff --git a/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java b/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java index 61778b85..ac98e2f1 100644 --- a/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java +++ b/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java @@ -60,9 +60,14 @@ public class ConfigurationRes { try { final String iconURI = getString(imageName); final URL imageURL = cl.getResource(iconURI); - return new ImageIcon(imageURL); - } catch (Throwable t) { - Log.warning(imageName + " not found.", t); + if (imageURL != null) { + return new ImageIcon(imageURL); + } else { + Log.warning(imageName + " not found."); + } + } + catch (Exception e) { + Log.warning("Unable to load image " + imageName, e); } return null; } diff --git a/core/src/main/java/org/jivesoftware/resource/Default.java b/core/src/main/java/org/jivesoftware/resource/Default.java index 2ba04300..44175e0f 100644 --- a/core/src/main/java/org/jivesoftware/resource/Default.java +++ b/core/src/main/java/org/jivesoftware/resource/Default.java @@ -208,8 +208,8 @@ public class Default { cache.put(imageName, icon); return icon; } - catch (Throwable t) { - Log.warning(imageName + " not found.", t); + catch (Exception e) { + Log.warning(imageName + " not found.", e); } return null; } diff --git a/core/src/main/java/org/jivesoftware/resource/SoundsRes.java b/core/src/main/java/org/jivesoftware/resource/SoundsRes.java index 3e9adc7c..b60a7793 100644 --- a/core/src/main/java/org/jivesoftware/resource/SoundsRes.java +++ b/core/src/main/java/org/jivesoftware/resource/SoundsRes.java @@ -57,9 +57,14 @@ public class SoundsRes { try { final String iconURI = getString(imageName); final URL imageURL = cl.getResource(iconURI); - return new ImageIcon(imageURL); - } catch (Throwable t) { - Log.warning(imageName + " not found.", t); + if (imageURL != null) { + return new ImageIcon(imageURL); + } else { + Log.warning(imageName + " not found."); + } + } + catch (Exception e) { + Log.warning("Unable to load image " + imageName, e); } return null; } diff --git a/core/src/main/java/org/jivesoftware/resource/SparkRes.java b/core/src/main/java/org/jivesoftware/resource/SparkRes.java index a0ce7745..0b5002db 100644 --- a/core/src/main/java/org/jivesoftware/resource/SparkRes.java +++ b/core/src/main/java/org/jivesoftware/resource/SparkRes.java @@ -353,10 +353,16 @@ public class SparkRes { public static ImageIcon getImageIcon(String imageName) { try { - final URL imageURL = getURL(imageName); - return new ImageIcon(imageURL); - } catch (Throwable t) { - Log.warning(imageName + " not found.", t); + final String iconURI = getString(imageName); + final URL imageURL = cl.getResource(iconURI); + if (imageURL != null) { + return new ImageIcon(imageURL); + } else { + Log.warning(imageName + " not found."); + } + } + catch (Exception e) { + Log.warning("Unable to load image " + imageName, e); } return null; } diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/resources/FastpathRes.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/resources/FastpathRes.java index d4ed8330..9a918437 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/resources/FastpathRes.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/resources/FastpathRes.java @@ -266,10 +266,14 @@ public class FastpathRes { try { final String iconURI = getString(imageName); final URL imageURL = cl.getResource(iconURI); - return new ImageIcon(imageURL); + if (imageURL != null) { + return new ImageIcon(imageURL); + } else { + Log.warning(imageName + " not found."); + } } - catch (Throwable t) { - Log.warning(imageName + " not found.", t); + catch (Exception e) { + Log.warning("Unable to load image " + imageName, e); } return null; } diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCallUI.java b/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCallUI.java index 0a6aed86..fe42265e 100644 --- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCallUI.java +++ b/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCallUI.java @@ -206,9 +206,8 @@ public class IncomingCallUI extends JPanel { avatarLabel.validate(); avatarLabel.repaint(); } - catch (Throwable t) { - // no issue - Log.warning("Unable to generate image from avatar", t); + catch (Exception e) { + Log.warning("Unable to generate image from avatar", e); } } diff --git a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePhoneRes.java b/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePhoneRes.java index d3f2dc14..edb388fa 100644 --- a/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePhoneRes.java +++ b/plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePhoneRes.java @@ -48,10 +48,14 @@ public class JinglePhoneRes { try { final String iconURI = JinglePhoneRes.getString(imageName); final URL imageURL = JinglePhoneRes.cl.getResource(iconURI); - return new ImageIcon(imageURL); + if (imageURL != null) { + return new ImageIcon(imageURL); + } else { + Log.warning(imageName + " not found."); + } } - catch (Throwable t) { - Log.warning(imageName + " not found.", t); + catch (Exception e) { + Log.warning("Unable to load image " + imageName, e); } return null; } @@ -59,6 +63,4 @@ public class JinglePhoneRes { public static final URL getURL(String propertyName) { return JinglePhoneRes.cl.getResource(JinglePhoneRes.getString(propertyName)); } - - } diff --git a/plugins/otr/src/main/java/org/jivesoftware/spark/otrplug/util/OTRResources.java b/plugins/otr/src/main/java/org/jivesoftware/spark/otrplug/util/OTRResources.java index 18028f97..f526ba6a 100644 --- a/plugins/otr/src/main/java/org/jivesoftware/spark/otrplug/util/OTRResources.java +++ b/plugins/otr/src/main/java/org/jivesoftware/spark/otrplug/util/OTRResources.java @@ -47,10 +47,15 @@ public class OTRResources { public static ImageIcon getIcon(String fileName) { try { final ClassLoader cl = OTRResources.class.getClassLoader(); - ImageIcon icon = new ImageIcon(cl.getResource(fileName)); - return icon; - } catch (Throwable t) { - Log.warning(fileName + " not found.", t); + final URL imageURL = cl.getResource(fileName); + if (imageURL != null) { + return new ImageIcon(imageURL); + } else { + Log.warning(imageName + " not found."); + } + } + catch (Exception e) { + Log.warning("Unable to load image " + imageName, e); } return null; } diff --git a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/ReversiRes.java b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/ReversiRes.java index 30c73b2a..531072da 100644 --- a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/ReversiRes.java +++ b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/ReversiRes.java @@ -10,47 +10,48 @@ import java.util.ResourceBundle; import javax.swing.ImageIcon; public class ReversiRes { - private static PropertyResourceBundle prb; - public static final String REVERSI_ICON = "REVERSI_ICON"; - public static final String REVERSI_BOARD="REVERSI_BOARD"; - public static final String REVERSI_SCORE_WHITE="REVERSI_SCORE_WHITE"; - public static final String REVERSI_SCORE_BLACK="REVERSI_SCORE_BLACK"; - public static final String REVERSI_LABEL_BLACK="REVERSI_LABEL_BLACK"; - public static final String REVERSI_LABEL_WHITE="REVERSI_LABEL_WHITE"; - public static final String REVERSI_RESIGN="REVERSI_RESIGN"; - public static final String REVERSI_YOU="REVERSI_YOU"; - public static final String REVERSI_THEM="REVERSI_THEM"; - - - - private ReversiRes() { + private static PropertyResourceBundle prb; + public static final String REVERSI_ICON = "REVERSI_ICON"; + public static final String REVERSI_BOARD="REVERSI_BOARD"; + public static final String REVERSI_SCORE_WHITE="REVERSI_SCORE_WHITE"; + public static final String REVERSI_SCORE_BLACK="REVERSI_SCORE_BLACK"; + public static final String REVERSI_LABEL_BLACK="REVERSI_LABEL_BLACK"; + public static final String REVERSI_LABEL_WHITE="REVERSI_LABEL_WHITE"; + public static final String REVERSI_RESIGN="REVERSI_RESIGN"; + public static final String REVERSI_YOU="REVERSI_YOU"; + public static final String REVERSI_THEM="REVERSI_THEM"; - } + private ReversiRes() { - private static final ClassLoader cl = ReversiRes.class.getClassLoader(); + } - static { - ReversiRes.prb = (PropertyResourceBundle) ResourceBundle.getBundle("reversi", new UTF8Control()); - } - - public static String getString(String propertyName) { - return ReversiRes.prb.getString(propertyName); - } + private static final ClassLoader cl = ReversiRes.class.getClassLoader(); - public static ImageIcon getImageIcon(String imageName) { - try { - final String iconURI = ReversiRes.getString(imageName); - final URL imageURL = ReversiRes.cl.getResource(iconURI); - return new ImageIcon(imageURL); - } - catch (Throwable t) { - Log.warning(imageName + " not found.", t); + static { + ReversiRes.prb = (PropertyResourceBundle) ResourceBundle.getBundle("reversi", new UTF8Control()); + } + + public static String getString(String propertyName) { + return ReversiRes.prb.getString(propertyName); + } + + public static ImageIcon getImageIcon(String imageName) { + try { + final String iconURI = ReversiRes.getString(imageName); + final URL imageURL = ReversiRes.cl.getResource(iconURI); + if (imageURL != null) { + return new ImageIcon(imageURL); + } else { + Log.warning(imageName + " not found."); } - return null; - } + } + catch (Exception e) { + Log.warning("Unable to load image " + imageName, e); + } + return null; + } - public static URL getURL(String propertyName) { - return ReversiRes.cl.getResource(ReversiRes.getString(propertyName)); - } - + public static URL getURL(String propertyName) { + return ReversiRes.cl.getResource(ReversiRes.getString(propertyName)); + } } diff --git a/plugins/sip/src/main/java/org/jivesoftware/spark/plugin/phone/resource/PhoneRes.java b/plugins/sip/src/main/java/org/jivesoftware/spark/plugin/phone/resource/PhoneRes.java index 35fb7660..d506df97 100644 --- a/plugins/sip/src/main/java/org/jivesoftware/spark/plugin/phone/resource/PhoneRes.java +++ b/plugins/sip/src/main/java/org/jivesoftware/spark/plugin/phone/resource/PhoneRes.java @@ -69,14 +69,18 @@ public class PhoneRes { } public static final Image getImage(String imageName) { - try { - final String iconURI = getString(imageName); - final URL imageURL = cl.getResource(iconURI); - return new ImageIcon(imageURL).getImage(); - } - catch (Exception ex) { - Log.error(imageName + " not found."); - } - return null; - } + try { + final String iconURI = getString(imageName); + final URL imageURL = cl.getResource(iconURI); + if (imageURL != null) { + return new ImageIcon(imageURL); + } else { + Log.warning(imageName + " not found."); + } + } + catch (Exception e) { + Log.warning("Unable to load image " + imageName, e); + } + return null; + } } diff --git a/plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/call/IncomingCallUI.java b/plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/call/IncomingCallUI.java index 6438eefe..1996b502 100644 --- a/plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/call/IncomingCallUI.java +++ b/plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/call/IncomingCallUI.java @@ -220,8 +220,8 @@ public class IncomingCallUI extends JPanel { avatarLabel.validate(); avatarLabel.repaint(); } - catch (Throwable t) { - Log.warning("Unable to generate image from avatar", t); + catch (Exception e) { + Log.warning("Unable to generate image from avatar", e); } } diff --git a/plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/call/OutgoingCallUI.java b/plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/call/OutgoingCallUI.java index 0eb8578e..e41b3182 100644 --- a/plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/call/OutgoingCallUI.java +++ b/plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/call/OutgoingCallUI.java @@ -203,8 +203,8 @@ public class OutgoingCallUI extends JPanel { avatarLabel.validate(); avatarLabel.repaint(); } - catch (Throwable t) { - Log.warning("Unable to generate image from avatar", t); + catch (Exception e) { + Log.warning("Unable to generate image from avatar", e); } }