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
inprogress
[jalview.git]
/
forester
/
java
/
src
/
org
/
forester
/
archaeopteryx
/
TreePanel.java
diff --git
a/forester/java/src/org/forester/archaeopteryx/TreePanel.java
b/forester/java/src/org/forester/archaeopteryx/TreePanel.java
index
06520d1
..
8bc57e2
100644
(file)
--- a/
forester/java/src/org/forester/archaeopteryx/TreePanel.java
+++ b/
forester/java/src/org/forester/archaeopteryx/TreePanel.java
@@
-524,11
+524,10
@@
public final class TreePanel extends JPanel implements ActionListener, MouseWhee
initNodeData();
if ( recalc_longest_ext_node_info ) {
calculateLongestExtNodeInfo();
initNodeData();
if ( recalc_longest_ext_node_info ) {
calculateLongestExtNodeInfo();
- while ( getLongestExtNodeInfo() > y / 2 && getTreeFontSet().getLargeFont().getSize() > 2 ) {
+ while ( ( getLongestExtNodeInfo() > y / 2 ) && ( getTreeFontSet().getLargeFont().getSize() > 2 ) ) {
getMainPanel().getTreeFontSet().decreaseFontSize();
calculateLongestExtNodeInfo();
}
getMainPanel().getTreeFontSet().decreaseFontSize();
calculateLongestExtNodeInfo();
}
-
}
int ext_nodes = _phylogeny.getRoot().getNumberOfExternalNodes();
final int max_depth = PhylogenyMethods.calculateMaxDepth( _phylogeny );
}
int ext_nodes = _phylogeny.getRoot().getNumberOfExternalNodes();
final int max_depth = PhylogenyMethods.calculateMaxDepth( _phylogeny );
@@
-2467,7
+2466,7
@@
public final class TreePanel extends JPanel implements ActionListener, MouseWhee
errorMessageNoCutCopyPasteInUnrootedDisplay();
return;
}
errorMessageNoCutCopyPasteInUnrootedDisplay();
return;
}
- if ( node.isRoot() && node.getNumberOfDescendants() != 1 ) {
+ if ( node.isRoot() && ( node.getNumberOfDescendants() != 1 ) ) {
JOptionPane.showMessageDialog( this,
"Cannot delete entire tree",
"Attempt to delete entire tree",
JOptionPane.showMessageDialog( this,
"Cannot delete entire tree",
"Attempt to delete entire tree",