Merge branch 'releases/Release_2_11_3_Branch'

[jalview.git] / src / jalview / gui / TreePanel.java

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 2eff542..f708c48 100755 (executable)
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -181,7 +181,7 @@ public class TreePanel extends GTreePanel
 
     treeCanvas = new TreeCanvas(this, ap, scrollPane);
     scrollPane.setViewportView(treeCanvas);
-    
+
     if (columnWise)
     {
       bootstrapMenu.setVisible(false);
@@ -191,21 +191,20 @@ public class TreePanel extends GTreePanel
       sortAssocViews.setVisible(false);
     }
 
-
     addKeyListener(new KeyAdapter()
     {
       @Override
       public void keyPressed(KeyEvent e)
       {
         switch (e.getKeyCode())
-        { 
+        {
         case 27: // escape
           treeCanvas.clearSelectedLeaves();
           e.consume();
           break;
-          
+
         }
-        
+
       }
     });
     PaintRefresher.Register(this, ap.av.getSequenceSetId());
@@ -261,7 +260,7 @@ public class TreePanel extends GTreePanel
         {
           if (tree == null)
           {
-            System.out.println("tree is null");
+            jalview.bin.Console.outPrintln("tree is null");
             // TODO: deal with case when a change event is received whilst a
             // tree is still being calculated - should save reference for
             // processing message later.
@@ -269,7 +268,7 @@ public class TreePanel extends GTreePanel
           }
           if (evt.getNewValue() == null)
           {
-            System.out.println(
+            jalview.bin.Console.outPrintln(
                     "new alignment sequences vector value is null");
           }
 
@@ -392,7 +391,7 @@ public class TreePanel extends GTreePanel
                 ? new NJTree(av, sm, similarityParams)
                 : new AverageDistanceTree(av, sm, similarityParams);
         tree = new TreeModel(njtree);
-        // don't display distances for columnwise trees        
+        // don't display distances for columnwise trees
       }
       showDistances(!columnWise);
       tree.reCount(tree.getTopNode());
@@ -759,11 +758,15 @@ public class TreePanel extends GTreePanel
     String tree = MessageManager.getString("label.tree");
     ImageExporter exporter = new ImageExporter(writer, null, imageFormat,
             tree);
-    try {
-    exporter.doExport(null, this, width, height,
-            tree.toLowerCase(Locale.ROOT));
-    } catch (ImageOutputException ioex) {
-      Console.error("Unexpected error whilst writing "+imageFormat.toString(),ioex);
+    try
+    {
+      exporter.doExport(null, this, width, height,
+              tree.toLowerCase(Locale.ROOT));
+    } catch (ImageOutputException ioex)
+    {
+      Console.error(
+              "Unexpected error whilst writing " + imageFormat.toString(),
+              ioex);
     }
   }
 
@@ -896,7 +899,7 @@ public class TreePanel extends GTreePanel
       pg.close();
     } catch (Exception ex)
     {
-      System.err.println("Error writing tree as EPS");
+      jalview.bin.Console.errPrintln("Error writing tree as EPS");
       ex.printStackTrace();
     }
   }