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
JAL-1517 update copyright to version 2.8.2
[jalview.git]
/
src
/
jalview
/
gui
/
TreeCanvas.java
diff --git
a/src/jalview/gui/TreeCanvas.java
b/src/jalview/gui/TreeCanvas.java
index
900ef1d
..
81abf03
100755
(executable)
--- a/
src/jalview/gui/TreeCanvas.java
+++ b/
src/jalview/gui/TreeCanvas.java
@@
-1,5
+1,5
@@
/*
/*
- * 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.
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
@@
-667,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);
RenderingHints.VALUE_ANTIALIAS_ON);
g2.setColor(Color.white);
g2.fillRect(0, 0, width, height);
-
g2.setFont(font);
g2.setFont(font);
+ if (longestName==null || tree ==null)
+ {
+ g2.drawString("Calculating tree.",20,20);
+ }
offy = font.getSize() + 10;
fm = g2.getFontMetrics(font);
offy = font.getSize() + 10;
fm = g2.getFontMetrics(font);
@@
-791,9
+794,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (ob instanceof SequenceNode)
{
highlightNode = (SequenceNode) ob;
if (ob instanceof SequenceNode)
{
highlightNode = (SequenceNode) ob;
- this.setToolTipText("<html>Left click to select leaves"
- + "<br>Double-click to invert leaves"
- + "<br>Right click to change colour");
+ this.setToolTipText("<html>" + MessageManager.getString("label.highlightnode"));
repaint();
}
repaint();
}