applied copyright 2008

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

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 328f02a..a022408 100755 (executable)
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -1,17 +1,17 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
+ * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
@@ -204,14 +204,14 @@ public class TreeCanvas
         nodeLabel = new Format("%-.2f").form(node.dist);
       }
 
-      if (showBootstrap)
+      if (showBootstrap && node.bootstrap>-1)
       {
         if (showDistances)
         {
           nodeLabel = nodeLabel + " : ";
         }
 
-        nodeLabel = nodeLabel + String.valueOf(node.getBootstrap());
+        nodeLabel = nodeLabel + String.valueOf(node.bootstrap);
       }
 
       if (!nodeLabel.equals(""))
@@ -284,10 +284,26 @@ public class TreeCanvas
       g.drawLine( (int) (height * scale) + offx, ystart,
                  (int) (height * scale) + offx, yend);
 
+      String nodeLabel = "";
+
       if (showDistances && (node.dist > 0))
       {
-        g.drawString(new Format("%-.2f").form(node.dist).trim(), xstart + 2,
-                     ypos - 2);
+        nodeLabel = new Format("%-.2f").form(node.dist);
+      }
+
+      if (showBootstrap && node.bootstrap>-1)
+      {
+        if (showDistances)
+        {
+          nodeLabel = nodeLabel + " : ";
+        }
+
+        nodeLabel = nodeLabel + String.valueOf(node.bootstrap);
+      }
+
+      if (!nodeLabel.equals(""))
+      {
+        g.drawString(nodeLabel, xstart + 2, ypos - 2);
       }
     }
   }
@@ -847,7 +863,7 @@ public class TreeCanvas
                                            av.alignment.getWidth() - 1);
 
       sg.setName("JTreeGroup:" + sg.hashCode());
-
+      sg.setIdColour(col);
       AlignmentPanel[] aps = getAssociatedPanels();
       for (int a = 0; a < aps.length; a++)
       {