inprogress

[jalview.git] / forester / java / src / org / forester / phylogeny / data / NodeData.java

diff --git a/forester/java/src/org/forester/phylogeny/data/NodeData.java b/forester/java/src/org/forester/phylogeny/data/NodeData.java
index daa9d13..a40cc74 100644 (file)
--- a/forester/java/src/org/forester/phylogeny/data/NodeData.java
+++ b/forester/java/src/org/forester/phylogeny/data/NodeData.java
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.phylogeny.data;
 
@@ -44,9 +44,11 @@ public class NodeData implements PhylogenyData {
         SEQUENCE_NAME,
         SEQUENCE_SYMBOL,
         SEQUENCE_MOL_SEQ,
+        SEQUENCE_MOL_SEQ_FASTA,
         SEQUENCE_ACC,
         TAXONOMY_SCIENTIFIC_NAME,
-        TAXONOMY_CODE;
+        TAXONOMY_CODE,
+        UNKNOWN;
     }
     private String                  _node_name;
     private Event                   _event;
@@ -439,9 +441,6 @@ public class NodeData implements PhylogenyData {
     @Override
     public StringBuffer toNHX() {
         final StringBuffer sb = new StringBuffer();
-        if ( isHasNodeIdentifier() ) {
-            sb.append( getNodeIdentifier().toNHX() );
-        }
         if ( isHasTaxonomy() ) {
             sb.append( getTaxonomy().toNHX() );
         }
@@ -451,9 +450,6 @@ public class NodeData implements PhylogenyData {
         if ( isHasEvent() ) {
             sb.append( getEvent().toNHX() );
         }
-        if ( isHasProperties() ) {
-            sb.append( getProperties().toNHX() );
-        }
         return sb;
     }