X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=c5650f5a973013c65c436c11991d76b7bd60a390;hb=aec85d6dfc1dd5970a50a53dc9d161635d1e9960;hp=9e2e582eb4f69674b8857cfd41b40e5f8a2b5a36;hpb=cb5d856b1304448cae13a333cbd9017f81520d90;p=jalview.git
diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 9e2e582..c5650f5 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * 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.
+ * 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 .
+ * 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;
@@ -609,7 +611,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (tree == null)
{
- g.drawString(MessageManager.getString("label.calculating_tree") + "....", 20, getHeight() / 2);
+ g.drawString(MessageManager.getString("label.calculating_tree")
+ + "....", 20, getHeight() / 2);
}
else
{
@@ -667,9 +670,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);
@@ -751,7 +757,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (SwingUtilities.isRightMouseButton(evt))
{
Color col = JColorChooser.showDialog(this,
- "Select Sub-Tree Colour", highlightNode.color);
+ MessageManager.getString("label.select_subtree_colour"), highlightNode.color);
if (col != null)
{
setColor(highlightNode, col);
@@ -791,7 +797,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (ob instanceof SequenceNode)
{
highlightNode = (SequenceNode) ob;
- this.setToolTipText("" + MessageManager.getString("label.highlightnode"));
+ this.setToolTipText(""
+ + MessageManager.getString("label.highlightnode"));
repaint();
}