mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-29 11:47:01 +00:00
Code Issues Projects Releases Wiki Activity

Addressing review feedback

Browse Source
This commit is contained in:
Guus der Kinderen 2025-10-10 11:01:22 +02:00
parent 0734d54743
commit 05b8e82499
12 changed files with 109 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java
View File

@ -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;
}

4
core/src/main/java/org/jivesoftware/resource/Default.java
View File

@ -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;
}

11
core/src/main/java/org/jivesoftware/resource/SoundsRes.java
View File

@ -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;
}

14
core/src/main/java/org/jivesoftware/resource/SparkRes.java
View File

@ -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;
}

10
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/resources/FastpathRes.java
View File

@ -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;
}

5
plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/IncomingCallUI.java
View File

@ -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);
}
}

12
plugins/jingle/src/main/java/org/jivesoftware/sparkplugin/JinglePhoneRes.java
View File

@ -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));
}
}

13
plugins/otr/src/main/java/org/jivesoftware/spark/otrplug/util/OTRResources.java
View File

@ -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;
}

75
plugins/reversi/src/main/java/org/jivesoftware/game/reversi/ReversiRes.java
View File

@ -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));
}
}

24
plugins/sip/src/main/java/org/jivesoftware/spark/plugin/phone/resource/PhoneRes.java
View File

@ -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;
}
}

4
plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/call/IncomingCallUI.java
View File

@ -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);
}
}

4
plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/call/OutgoingCallUI.java
View File

@ -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);
}
}