Skip to content

Commit 05b8e82

Browse files
guusdkguusdk
committed
Addressing review feedback
1 parent 0734d54 commit 05b8e82

File tree

12 files changed

+114
-83
lines changed

12 files changed

+114
-83
lines changed

‎core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,14 @@ public static ImageIcon getImageIcon(String imageName) {
6060
try {
6161
final String iconURI = getString(imageName);
6262
final URL imageURL = cl.getResource(iconURI);
63-
return new ImageIcon(imageURL);
64-
} catch (Throwable t) {
65-
Log.warning(imageName + " not found.", t);
63+
if (imageURL != null) {
64+
return new ImageIcon(imageURL);
65+
} else {
66+
Log.warning(imageName + " not found.");
67+
}
68+
}
69+
catch (Exception e) {
70+
Log.warning("Unable to load image " + imageName, e);
6671
}
6772
return null;
6873
}

‎core/src/main/java/org/jivesoftware/resource/Default.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ public static ImageIcon getImageIcon(String imageName) {
208208
cache.put(imageName, icon);
209209
return icon;
210210
}
211-
catch (Throwable t) {
212-
Log.warning(imageName + " not found.", t);
211+
catch (Exception e) {
212+
Log.warning(imageName + " not found.", e);
213213
}
214214
return null;
215215
}

‎core/src/main/java/org/jivesoftware/resource/SoundsRes.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,14 @@ public static ImageIcon getImageIcon(String imageName) {
5757
try {
5858
final String iconURI = getString(imageName);
5959
final URL imageURL = cl.getResource(iconURI);
60-
return new ImageIcon(imageURL);
61-
} catch (Throwable t) {
62-
Log.warning(imageName + " not found.", t);
60+
if (imageURL != null) {
61+
return new ImageIcon(imageURL);
62+
} else {
63+
Log.warning(imageName + " not found.");
64+
}
65+
}
66+
catch (Exception e) {
67+
Log.warning("Unable to load image " + imageName, e);
6368
}
6469
return null;
6570
}

‎core/src/main/java/org/jivesoftware/resource/SparkRes.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,16 @@ public static String getString(String propertyName) {
353353

354354
public static ImageIcon getImageIcon(String imageName) {
355355
try {
356-
final URL imageURL = getURL(imageName);
357-
return new ImageIcon(imageURL);
358-
} catch (Throwable t) {
359-
Log.warning(imageName + " not found.", t);
356+
final String iconURI = getString(imageName);
357+
final URL imageURL = cl.getResource(iconURI);
358+
if (imageURL != null) {
359+
return new ImageIcon(imageURL);
360+
} else {
361+
Log.warning(imageName + " not found.");
362+
}
363+
}
364+
catch (Exception e) {
365+
Log.warning("Unable to load image " + imageName, e);
360366
}
361367
return null;
362368
}

‎plugins/fastpath/src/main/java/org/jivesoftware/fastpath/resources/FastpathRes.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,14 @@ public static ImageIcon getImageIcon(String imageName) {
266266
try {
267267
final String iconURI = getString(imageName);
268268
final URL imageURL = cl.getResource(iconURI);
269-
return new ImageIcon(imageURL);
269+
if (imageURL != null) {
270+
return new ImageIcon(imageURL);
271+
} else {
272+
Log.warning(imageName + " not found.");
273+
}
270274
}
271-
catch (Throwable t) {
272-
Log.warning(imageName + " not found.", t);
275+
catch (Exception e) {
276+
Log.warning("Unable to load image " + imageName, e);
273277
}
274278
return null;
275279
}

‎plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCallUI.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,8 @@ else if (ModelUtil.hasLength(firstName)) {
206206
avatarLabel.validate();
207207
avatarLabel.repaint();
208208
}
209-
catch (Throwable t) {
210-
// no issue
211-
Log.warning("Unable to generate image from avatar", t);
209+
catch (Exception e) {
210+
Log.warning("Unable to generate image from avatar", e);
212211
}
213212
}
214213

‎plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePhoneRes.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,19 @@ public static final ImageIcon getImageIcon(String imageName) {
4848
try {
4949
final String iconURI = JinglePhoneRes.getString(imageName);
5050
final URL imageURL = JinglePhoneRes.cl.getResource(iconURI);
51-
return new ImageIcon(imageURL);
51+
if (imageURL != null) {
52+
return new ImageIcon(imageURL);
53+
} else {
54+
Log.warning(imageName + " not found.");
55+
}
5256
}
53-
catch (Throwable t) {
54-
Log.warning(imageName + " not found.", t);
57+
catch (Exception e) {
58+
Log.warning("Unable to load image " + imageName, e);
5559
}
5660
return null;
5761
}
5862

5963
public static final URL getURL(String propertyName) {
6064
return JinglePhoneRes.cl.getResource(JinglePhoneRes.getString(propertyName));
6165
}
62-
63-
6466
}

‎plugins/otr/src/main/java/org/jivesoftware/spark/otrplug/util/OTRResources.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,15 @@ public static final String getString(String propertyName) {
4747
public static ImageIcon getIcon(String fileName) {
4848
try {
4949
final ClassLoader cl = OTRResources.class.getClassLoader();
50-
ImageIcon icon = new ImageIcon(cl.getResource(fileName));
51-
return icon;
52-
} catch (Throwable t) {
53-
Log.warning(fileName + " not found.", t);
50+
final URL imageURL = cl.getResource(fileName);
51+
if (imageURL != null) {
52+
return new ImageIcon(imageURL);
53+
} else {
54+
Log.warning(imageName + " not found.");
55+
}
56+
}
57+
catch (Exception e) {
58+
Log.warning("Unable to load image " + imageName, e);
5459
}
5560
return null;
5661
}

‎plugins/reversi/src/main/java/org/jivesoftware/game/reversi/ReversiRes.java‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,48 @@
1010
import javax.swing.ImageIcon;
1111

1212
public class ReversiRes {
13-
private static PropertyResourceBundle prb;
14-
public static final String REVERSI_ICON = "REVERSI_ICON";
15-
public static final String REVERSI_BOARD="REVERSI_BOARD";
16-
public static final String REVERSI_SCORE_WHITE="REVERSI_SCORE_WHITE";
17-
public static final String REVERSI_SCORE_BLACK="REVERSI_SCORE_BLACK";
18-
public static final String REVERSI_LABEL_BLACK="REVERSI_LABEL_BLACK";
19-
public static final String REVERSI_LABEL_WHITE="REVERSI_LABEL_WHITE";
20-
public static final String REVERSI_RESIGN="REVERSI_RESIGN";
21-
public static final String REVERSI_YOU="REVERSI_YOU";
22-
public static final String REVERSI_THEM="REVERSI_THEM";
23-
24-
25-
26-
private ReversiRes() {
27-
28-
}
29-
30-
private static final ClassLoader cl = ReversiRes.class.getClassLoader();
31-
32-
static {
33-
ReversiRes.prb = (PropertyResourceBundle) ResourceBundle.getBundle("reversi", new UTF8Control());
34-
}
35-
36-
public static String getString(String propertyName) {
37-
return ReversiRes.prb.getString(propertyName);
38-
}
39-
40-
public static ImageIcon getImageIcon(String imageName) {
41-
try {
42-
final String iconURI = ReversiRes.getString(imageName);
43-
final URL imageURL = ReversiRes.cl.getResource(iconURI);
44-
return new ImageIcon(imageURL);
45-
}
46-
catch (Throwable t) {
47-
Log.warning(imageName + " not found.", t);
13+
private static PropertyResourceBundle prb;
14+
public static final String REVERSI_ICON = "REVERSI_ICON";
15+
public static final String REVERSI_BOARD="REVERSI_BOARD";
16+
public static final String REVERSI_SCORE_WHITE="REVERSI_SCORE_WHITE";
17+
public static final String REVERSI_SCORE_BLACK="REVERSI_SCORE_BLACK";
18+
public static final String REVERSI_LABEL_BLACK="REVERSI_LABEL_BLACK";
19+
public static final String REVERSI_LABEL_WHITE="REVERSI_LABEL_WHITE";
20+
public static final String REVERSI_RESIGN="REVERSI_RESIGN";
21+
public static final String REVERSI_YOU="REVERSI_YOU";
22+
public static final String REVERSI_THEM="REVERSI_THEM";
23+
24+
private ReversiRes() {
25+
26+
}
27+
28+
private static final ClassLoader cl = ReversiRes.class.getClassLoader();
29+
30+
static {
31+
ReversiRes.prb = (PropertyResourceBundle) ResourceBundle.getBundle("reversi", new UTF8Control());
32+
}
33+
34+
public static String getString(String propertyName) {
35+
return ReversiRes.prb.getString(propertyName);
36+
}
37+
38+
public static ImageIcon getImageIcon(String imageName) {
39+
try {
40+
final String iconURI = ReversiRes.getString(imageName);
41+
final URL imageURL = ReversiRes.cl.getResource(iconURI);
42+
if (imageURL != null) {
43+
return new ImageIcon(imageURL);
44+
} else {
45+
Log.warning(imageName + " not found.");
4846
}
49-
return null;
50-
}
51-
52-
public static URL getURL(String propertyName) {
53-
return ReversiRes.cl.getResource(ReversiRes.getString(propertyName));
54-
}
55-
47+
}
48+
catch (Exception e) {
49+
Log.warning("Unable to load image " + imageName, e);
50+
}
51+
return null;
52+
}
53+
54+
public static URL getURL(String propertyName) {
55+
return ReversiRes.cl.getResource(ReversiRes.getString(propertyName));
56+
}
5657
}

‎plugins/sip/src/main/java/org/jivesoftware/spark/plugin/phone/resource/PhoneRes.java‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,18 @@ public static final URL getURL(String propertyName) {
6969
}
7070

7171
public static final Image getImage(String imageName) {
72-
try {
73-
final String iconURI = getString(imageName);
74-
final URL imageURL = cl.getResource(iconURI);
75-
return new ImageIcon(imageURL).getImage();
76-
}
77-
catch (Exception ex) {
78-
Log.error(imageName + " not found.");
79-
}
80-
return null;
81-
}
72+
try {
73+
final String iconURI = getString(imageName);
74+
final URL imageURL = cl.getResource(iconURI);
75+
if (imageURL != null) {
76+
return new ImageIcon(imageURL);
77+
} else {
78+
Log.warning(imageName + " not found.");
79+
}
80+
}
81+
catch (Exception e) {
82+
Log.warning("Unable to load image " + imageName, e);
83+
}
84+
return null;
85+
}
8286
}

0 commit comments

Comments
 (0)