X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2Ftools%2FImageLoader.java;h=6e6b4e05b1d6b42c36d6bb70159aaf9d7d3dd57c;hb=226d82be9b70ce0c67b5b1055654d484073ea184;hp=f3e9aa98371b407fd2bbea7c43c647f051297f66;hpb=0f295917c869b17a9322af3e738e3527ba9b31d4;p=jalview.git

diff --git a/forester/java/src/org/forester/archaeopteryx/tools/ImageLoader.java b/forester/java/src/org/forester/archaeopteryx/tools/ImageLoader.java
index f3e9aa9..6e6b4e0 100644
--- a/forester/java/src/org/forester/archaeopteryx/tools/ImageLoader.java
+++ b/forester/java/src/org/forester/archaeopteryx/tools/ImageLoader.java
@@ -21,10 +21,11 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.archaeopteryx.tools;
 
+import java.awt.color.CMMException;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -34,9 +35,9 @@ import java.util.List;
 
 import javax.imageio.ImageIO;
 
+import org.forester.archaeopteryx.AptxUtil;
 import org.forester.archaeopteryx.Constants;
 import org.forester.archaeopteryx.TreePanel;
-import org.forester.archaeopteryx.Util;
 import org.forester.phylogeny.PhylogenyNode;
 import org.forester.phylogeny.data.Taxonomy;
 import org.forester.phylogeny.data.Uri;
@@ -46,11 +47,17 @@ public class ImageLoader implements Runnable {
 
     private final TreePanel            _tp;
     private static final BufferedImage PLACEHOLDER = new BufferedImage( 1, 1, BufferedImage.TYPE_INT_RGB );
+    private final static boolean       DEBUG       = false;
 
     public ImageLoader( final TreePanel tp ) {
         _tp = tp;
     }
 
+    @Override
+    public void run() {
+        load();
+    }
+
     private void load() {
         Hashtable<String, BufferedImage> image_map = null;
         if ( _tp.getImageMap() != null ) {
@@ -82,19 +89,27 @@ public class ImageLoader implements Runnable {
                                         || uri_str.endsWith( ".gif" ) || uri_str.endsWith( ".bmp" ) ) ) {
                             image_map.put( uri_str, PLACEHOLDER );
                             BufferedImage bi = null;
-                            if ( !Constants.__RELEASE && !Constants.__SNAPSHOT_RELEASE ) {
-                                System.out.println( "accessing:" + uri );
+                            if ( DEBUG ) {
+                                System.out.println( "accessing: " + uri );
                             }
                             try {
                                 bi = ImageIO.read( uri.getValue().toURL() );
                             }
                             catch ( final MalformedURLException e ) {
-                                Util.printWarningMessage( Constants.PRG_NAME, "\"" + uri.getValue()
-                                        + "\": Malformed URL Exception: " + e.getLocalizedMessage() );
+                                AptxUtil.printWarningMessage( Constants.PRG_NAME,
+                                                              "could not load image from \"" + uri.getValue()
+                                                                      + "\": Malformed URL Exception: "
+                                                                      + e.getLocalizedMessage() );
                             }
                             catch ( final IOException e ) {
-                                Util.printWarningMessage( Constants.PRG_NAME, "\"" + uri.getValue()
-                                        + "\": IO Exception: " + e.getLocalizedMessage() );
+                                AptxUtil.printWarningMessage( Constants.PRG_NAME,
+                                                              "could not load image from \"" + uri.getValue()
+                                                                      + "\": IO Exception: " + e.getLocalizedMessage() );
+                            }
+                            catch ( final CMMException e ) {
+                                AptxUtil.printWarningMessage( Constants.PRG_NAME,
+                                                              "could not load image from \"" + uri.getValue()
+                                                                      + "\": CMMException: " + e.getLocalizedMessage() );
                             }
                             if ( bi != null ) {
                                 image_map.put( uri_str, bi );
@@ -109,9 +124,4 @@ public class ImageLoader implements Runnable {
             }
         }
     }
-
-    @Override
-    public void run() {
-        load();
-    }
 }