X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=81abf03de39d1da25e3b0d8ae81adf6b1a717ed7;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=f208d7713d65b58c40158e8374e5ef437456673a;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git
diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index f208d77..81abf03 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -1,19 +1,20 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview 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 3 of the License, or (at your option) any later version.
- *
+ *
* Jalview 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 Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
@@ -608,7 +609,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (tree == null)
{
- g.drawString("Calculating tree....", 20, getHeight() / 2);
+ g.drawString(MessageManager.getString("label.calculating_tree") + "....", 20, getHeight() / 2);
}
else
{
@@ -666,9 +667,12 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
RenderingHints.VALUE_ANTIALIAS_ON);
g2.setColor(Color.white);
g2.fillRect(0, 0, width, height);
-
g2.setFont(font);
+ if (longestName==null || tree ==null)
+ {
+ g2.drawString("Calculating tree.",20,20);
+ }
offy = font.getSize() + 10;
fm = g2.getFontMetrics(font);
@@ -790,9 +794,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (ob instanceof SequenceNode)
{
highlightNode = (SequenceNode) ob;
- this.setToolTipText("Left click to select leaves"
- + "
Double-click to invert leaves"
- + "
Right click to change colour");
+ this.setToolTipText("" + MessageManager.getString("label.highlightnode"));
repaint();
}
@@ -852,7 +854,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
{
aps[a].av.setSelectionGroup(null);
aps[a].av.getAlignment().deleteAllGroups();
- aps[a].av.sequenceColours = null;
+ aps[a].av.clearSequenceColours();
}
colourGroups();
}