in progress...

[jalview.git] / forester / java / src / org / forester / archaeopteryx / tools / ImageLoader.java

diff --git a/forester/java/src/org/forester/archaeopteryx/tools/ImageLoader.java b/forester/java/src/org/forester/archaeopteryx/tools/ImageLoader.java
index 6e6b4e0..899d8ce 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/tools/ImageLoader.java
+++ b/forester/java/src/org/forester/archaeopteryx/tools/ImageLoader.java
@@ -35,8 +35,8 @@ import java.util.List;
 
 import javax.imageio.ImageIO;
 
+import org.forester.archaeopteryx.AptxConstants;
 import org.forester.archaeopteryx.AptxUtil;
-import org.forester.archaeopteryx.Constants;
 import org.forester.archaeopteryx.TreePanel;
 import org.forester.phylogeny.PhylogenyNode;
 import org.forester.phylogeny.data.Taxonomy;
@@ -74,8 +74,10 @@ public class ImageLoader implements Runnable {
                     && !node.getNodeData().getTaxonomy().getUris().isEmpty() ) {
                 final List<Uri> us = new ArrayList<Uri>();
                 for( final Taxonomy t : node.getNodeData().getTaxonomies() ) {
-                    for( final Uri uri : t.getUris() ) {
-                        us.add( uri );
+                    if ( t.getUris() != null ) {
+                        for( final Uri uri : t.getUris() ) {
+                            us.add( uri );
+                        }
                     }
                 }
                 for( final Uri uri : us ) {
@@ -96,20 +98,20 @@ public class ImageLoader implements Runnable {
                                 bi = ImageIO.read( uri.getValue().toURL() );
                             }
                             catch ( final MalformedURLException e ) {
-                                AptxUtil.printWarningMessage( Constants.PRG_NAME,
+                                AptxUtil.printWarningMessage( AptxConstants.PRG_NAME,
                                                               "could not load image from \"" + uri.getValue()
-                                                                      + "\": Malformed URL Exception: "
-                                                                      + e.getLocalizedMessage() );
+                                                              + "\": Malformed URL Exception: "
+                                                              + e.getLocalizedMessage() );
                             }
                             catch ( final IOException e ) {
-                                AptxUtil.printWarningMessage( Constants.PRG_NAME,
+                                AptxUtil.printWarningMessage( AptxConstants.PRG_NAME,
                                                               "could not load image from \"" + uri.getValue()
-                                                                      + "\": IO Exception: " + e.getLocalizedMessage() );
+                                                              + "\": IO Exception: " + e.getLocalizedMessage() );
                             }
                             catch ( final CMMException e ) {
-                                AptxUtil.printWarningMessage( Constants.PRG_NAME,
+                                AptxUtil.printWarningMessage( AptxConstants.PRG_NAME,
                                                               "could not load image from \"" + uri.getValue()
-                                                                      + "\": CMMException: " + e.getLocalizedMessage() );
+                                                              + "\": CMMException: " + e.getLocalizedMessage() );
                             }
                             if ( bi != null ) {
                                 image_map.put( uri_str, bi );