From 707e4b1534519ab13eefb8e9703822384f01b450 Mon Sep 17 00:00:00 2001
From: "cmzmasek@gmail.com"
<cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Date: Tue, 18 Nov 2014 23:15:24 +0000
Subject: [PATCH] clean up + move to java1.8
---
forester/java/src/org/forester/archaeopteryx/Constants.java | 2 +-
forester/java/src/org/forester/archaeopteryx/TreePanel.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/forester/java/src/org/forester/archaeopteryx/Constants.java b/forester/java/src/org/forester/archaeopteryx/Constants.java
index 1a63bcf..144c607 100644
--- a/forester/java/src/org/forester/archaeopteryx/Constants.java
+++ b/forester/java/src/org/forester/archaeopteryx/Constants.java
@@ -43,7 +43,7 @@ public final class Constants {
public final static boolean ALLOW_DDBJ_BLAST = false;
public final static String PRG_NAME = "Archaeopteryx";
final static String VERSION = "0.9901 beta";
- final static String PRG_DATE = "141014";
+ final static String PRG_DATE = "141118";
final static String DEFAULT_CONFIGURATION_FILE_NAME = "_aptx_configuration_file";
final static String[] DEFAULT_FONT_CHOICES = { "Arial", "Helvetica",
"Verdana", "Tahoma", "Dialog", "Lucida Sans", "SansSerif", "Sans-serif", "Sans" };
diff --git a/forester/java/src/org/forester/archaeopteryx/TreePanel.java b/forester/java/src/org/forester/archaeopteryx/TreePanel.java
index 107a557..4d50d28 100644
--- a/forester/java/src/org/forester/archaeopteryx/TreePanel.java
+++ b/forester/java/src/org/forester/archaeopteryx/TreePanel.java
@@ -520,7 +520,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
calculateLongestExtNodeInfo();
}
}
- _length_of_longest_text = calcLengthOfLongestText();
+ //_length_of_longest_text = calcLengthOfLongestText();
int ext_nodes = _phylogeny.getRoot().getNumberOfExternalNodes();
final int max_depth = PhylogenyMethods.calculateMaxDepth( _phylogeny );
if ( ext_nodes == 1 ) {
@@ -659,7 +659,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
}
if ( sum >= max_length ) {
_longest_ext_node_info = max_length;
- return;
+ // return; //FIXME why?
}
if ( sum > longest ) {
longest = sum;
@@ -672,6 +672,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
else {
_longest_ext_node_info = longest;
}
+ _length_of_longest_text = calcLengthOfLongestText();
}
final void calculateScaleDistance() {
--
1.7.10.2