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
searhc of domains only when domains are shown!
[jalview.git]
/
forester
/
java
/
src
/
org
/
forester
/
archaeopteryx
/
NodePanel.java
diff --git
a/forester/java/src/org/forester/archaeopteryx/NodePanel.java
b/forester/java/src/org/forester/archaeopteryx/NodePanel.java
index
4cfb7b2
..
c7a9ce8
100644
(file)
--- a/
forester/java/src/org/forester/archaeopteryx/NodePanel.java
+++ b/
forester/java/src/org/forester/archaeopteryx/NodePanel.java
@@
-50,6
+50,7
@@
import org.forester.phylogeny.data.Date;
import org.forester.phylogeny.data.Distribution;
import org.forester.phylogeny.data.Event;
import org.forester.phylogeny.data.PhylogenyData;
import org.forester.phylogeny.data.Distribution;
import org.forester.phylogeny.data.Event;
import org.forester.phylogeny.data.PhylogenyData;
+import org.forester.phylogeny.data.PhylogenyDataUtil;
import org.forester.phylogeny.data.Point;
import org.forester.phylogeny.data.PropertiesMap;
import org.forester.phylogeny.data.Property;
import org.forester.phylogeny.data.Point;
import org.forester.phylogeny.data.PropertiesMap;
import org.forester.phylogeny.data.Property;
@@
-237,7
+238,7
@@
class NodePanel extends JPanel implements TreeSelectionListener {
final DefaultMutableTreeNode category = new DefaultMutableTreeNode( name );
top.add( category );
addSubelement( category, NODE_NAME, phylogeny_node.getName() );
final DefaultMutableTreeNode category = new DefaultMutableTreeNode( name );
top.add( category );
addSubelement( category, NODE_NAME, phylogeny_node.getName() );
- if ( phylogeny_node.getDistanceToParent() != PhylogenyNode.DISTANCE_DEFAULT ) {
+ if ( phylogeny_node.getDistanceToParent() != PhylogenyDataUtil.BRANCH_LENGTH_DEFAULT ) {
addSubelement( category,
NODE_BRANCH_LENGTH,
ForesterUtil.FORMATTER_6.format( phylogeny_node.getDistanceToParent() ) );
addSubelement( category,
NODE_BRANCH_LENGTH,
ForesterUtil.FORMATTER_6.format( phylogeny_node.getDistanceToParent() ) );
@@
-261,10
+262,6
@@
class NodePanel extends JPanel implements TreeSelectionListener {
if ( no_tax > 0 ) {
addSubelement( category, "External nodes without taxonomy", String.valueOf( no_tax ) );
}
if ( no_tax > 0 ) {
addSubelement( category, "External nodes without taxonomy", String.valueOf( no_tax ) );
}
- //TODO remove me... maybe make me into a method?
- //for( final Taxonomy taxonomy : distinct_tax.keySet() ) {
- // System.out.println( taxonomy + ": " + distinct_tax.get( taxonomy ) );
- //}
}
}
if ( !phylogeny_node.isRoot() ) {
}
}
if ( !phylogeny_node.isRoot() ) {
@@
-360,7
+357,7
@@
class NodePanel extends JPanel implements TreeSelectionListener {
top.add( category );
for( final String key : properties_map.keySet() ) {
final Property prop = properties_map.get( key );
top.add( category );
for( final String key : properties_map.keySet() ) {
final Property prop = properties_map.get( key );
- category.add( new DefaultMutableTreeNode( prop.getRef() + " " + prop.getValue() + " " + prop.getUnit()
+ category.add( new DefaultMutableTreeNode( prop.getRef() + "=" + prop.getValue() + " " + prop.getUnit()
+ " [" + prop.getAppliesTo().toString() + "]" ) );
}
}
+ " [" + prop.getAppliesTo().toString() + "]" ) );
}
}