git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
f3e9aa9
..
7b51d56
100644
(file)
--- a/
forester/java/src/org/forester/archaeopteryx/tools/ImageLoader.java
+++ b/
forester/java/src/org/forester/archaeopteryx/tools/ImageLoader.java
@@
-21,7
+21,7
@@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
//
// Contact: phylosoft @ gmail . com
// 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;
package org.forester.archaeopteryx.tools;
@@
-34,9
+34,9
@@
import java.util.List;
import javax.imageio.ImageIO;
import javax.imageio.ImageIO;
+import org.forester.archaeopteryx.AptxUtil;
import org.forester.archaeopteryx.Constants;
import org.forester.archaeopteryx.TreePanel;
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;
import org.forester.phylogeny.PhylogenyNode;
import org.forester.phylogeny.data.Taxonomy;
import org.forester.phylogeny.data.Uri;
@@
-46,6
+46,7
@@
public class ImageLoader implements Runnable {
private final TreePanel _tp;
private static final BufferedImage PLACEHOLDER = new BufferedImage( 1, 1, BufferedImage.TYPE_INT_RGB );
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;
public ImageLoader( final TreePanel tp ) {
_tp = tp;
@@
-82,18
+83,18
@@
public class ImageLoader implements Runnable {
|| uri_str.endsWith( ".gif" ) || uri_str.endsWith( ".bmp" ) ) ) {
image_map.put( uri_str, PLACEHOLDER );
BufferedImage bi = null;
|| 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 ) {
}
try {
bi = ImageIO.read( uri.getValue().toURL() );
}
catch ( final MalformedURLException e ) {
- Util.printWarningMessage( Constants.PRG_NAME, "\"" + uri.getValue()
+ AptxUtil.printWarningMessage( Constants.PRG_NAME, "\"" + uri.getValue()
+ "\": Malformed URL Exception: " + e.getLocalizedMessage() );
}
catch ( final IOException e ) {
+ "\": Malformed URL Exception: " + e.getLocalizedMessage() );
}
catch ( final IOException e ) {
- Util.printWarningMessage( Constants.PRG_NAME, "\"" + uri.getValue()
+ AptxUtil.printWarningMessage( Constants.PRG_NAME, "\"" + uri.getValue()
+ "\": IO Exception: " + e.getLocalizedMessage() );
}
if ( bi != null ) {
+ "\": IO Exception: " + e.getLocalizedMessage() );
}
if ( bi != null ) {