Changeset 489 for trunk/src_apollo/org/apollo/io/IconRepository.java

Timestamp:

10/23/13 15:57:55 (11 years ago)

Author:

davidb

Message:

Changes made when making Apollo run as an applet

File:

• trunk/src_apollo/org/apollo/io/IconRepository.java (modified) (1 diff)

trunk/src_apollo/org/apollo/io/IconRepository.java

@@ -59 +59 @@
                 if (icon == null) {
                         try {
-                                
-                                URL url = ClassLoader.getSystemResource("org/apollo/icons/" + name);
-                                
+                                URL url;
+                                ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+                                if (classLoader!=null) {
+                                    // Applet friendly
+                                    url = classLoader.getResource("org/apollo/icons/" + name);
+                                }
+                                else {
+                                    url = ClassLoader.getSystemResource("org/apollo/icons/" + name);
+                                }
+
                                 if (url != null) {
                                         icon = new ImageIcon(url);