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 fb4ac82..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.PhylogenyDataUtil;
 import org.forester.phylogeny.data.Point;
 import org.forester.phylogeny.data.PropertiesMap;
 import org.forester.phylogeny.data.Property;
@@ -209,13 +210,12 @@ class NodePanel extends JPanel implements TreeSelectionListener {
             }
         }
     }
-    
+
     private static void addLineage( final DefaultMutableTreeNode top,
-                                 final List<String> lineage,
-                                 final DefaultMutableTreeNode category ) {
-        if ( ( lineage != null ) && (  lineage.size() > 0 ) ) {
-          
-            StringBuilder sb = new StringBuilder();
+                                    final List<String> lineage,
+                                    final DefaultMutableTreeNode category ) {
+        if ( ( lineage != null ) && ( lineage.size() > 0 ) ) {
+            final StringBuilder sb = new StringBuilder();
             for( final String lin : lineage ) {
                 if ( !ForesterUtil.isEmpty( lin ) ) {
                     sb.append( lin );
@@ -223,7 +223,7 @@ class NodePanel extends JPanel implements TreeSelectionListener {
                 }
             }
             String str = null;
-            if (sb.length() > 1 ) {
+            if ( sb.length() > 1 ) {
                 str = sb.substring( 0, sb.length() - 3 );
             }
             if ( !ForesterUtil.isEmpty( str ) ) {
@@ -231,8 +231,6 @@ class NodePanel extends JPanel implements TreeSelectionListener {
             }
         }
     }
-    
-    
 
     private static void addBasics( final DefaultMutableTreeNode top,
                                    final PhylogenyNode phylogeny_node,
@@ -240,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() );
-        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() ) );
@@ -264,10 +262,6 @@ class NodePanel extends JPanel implements TreeSelectionListener {
                 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() ) {
@@ -363,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 );
-            category.add( new DefaultMutableTreeNode( prop.getRef() + " " + prop.getValue() + " " + prop.getUnit()
+            category.add( new DefaultMutableTreeNode( prop.getRef() + "=" + prop.getValue() + " " + prop.getUnit()
                     + " [" + prop.getAppliesTo().toString() + "]" ) );
         }
     }