X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Ftools%2FPhylogenyDecorator.java;h=8aa59d844ed953524e9dd00321917e11b0a8d5f7;hb=13e111a104747fd3c5678aed95215a61c980b595;hp=d71be51227b5c3fc5b38d607ac63e35ad7ab4a66;hpb=0be91180a6625d0a5b2c28fb6ff66dfd072ac882;p=jalview.git

diff --git a/forester/java/src/org/forester/tools/PhylogenyDecorator.java b/forester/java/src/org/forester/tools/PhylogenyDecorator.java
index d71be51..8aa59d8 100644
--- a/forester/java/src/org/forester/tools/PhylogenyDecorator.java
+++ b/forester/java/src/org/forester/tools/PhylogenyDecorator.java
@@ -42,6 +42,7 @@ import org.forester.phylogeny.data.DomainArchitecture;
 import org.forester.phylogeny.data.Identifier;
 import org.forester.phylogeny.data.Sequence;
 import org.forester.phylogeny.iterators.PhylogenyNodeIterator;
+import org.forester.sequence.MolecularSequence.TYPE;
 import org.forester.util.BasicTable;
 import org.forester.util.BasicTableParser;
 import org.forester.util.ForesterUtil;
@@ -86,14 +87,14 @@ public final class PhylogenyDecorator {
                                 && new_values.containsKey( TP_TAXONOMY_ID_PROVIDER ) ) {
                             ForesterUtil.ensurePresenceOfTaxonomy( node );
                             node.getNodeData()
-                                    .getTaxonomy()
-                                    .setIdentifier( new Identifier( new_values.get( TP_TAXONOMY_ID ),
-                                                                    new_values.get( TP_TAXONOMY_ID_PROVIDER ) ) );
+                            .getTaxonomy()
+                            .setIdentifier( new Identifier( new_values.get( TP_TAXONOMY_ID ),
+                                                            new_values.get( TP_TAXONOMY_ID_PROVIDER ) ) );
                         }
                         else if ( new_values.containsKey( TP_TAXONOMY_ID ) ) {
                             ForesterUtil.ensurePresenceOfTaxonomy( node );
                             node.getNodeData().getTaxonomy()
-                                    .setIdentifier( new Identifier( new_values.get( TP_TAXONOMY_ID ) ) );
+                            .setIdentifier( new Identifier( new_values.get( TP_TAXONOMY_ID ) ) );
                         }
                         if ( new_values.containsKey( TP_TAXONOMY_SN ) ) {
                             ForesterUtil.ensurePresenceOfTaxonomy( node );
@@ -111,9 +112,9 @@ public final class PhylogenyDecorator {
                                 && new_values.containsKey( TP_SEQ_ACCESSION_SOURCE ) ) {
                             ForesterUtil.ensurePresenceOfSequence( node );
                             node.getNodeData()
-                                    .getSequence()
-                                    .setAccession( new Accession( new_values.get( TP_SEQ_ACCESSION ),
-                                                                  new_values.get( TP_SEQ_ACCESSION_SOURCE ) ) );
+                            .getSequence()
+                            .setAccession( new Accession( new_values.get( TP_SEQ_ACCESSION ),
+                                                          new_values.get( TP_SEQ_ACCESSION_SOURCE ) ) );
                         }
                         if ( new_values.containsKey( TP_SEQ_ANNOTATION_DESC ) ) {
                             ForesterUtil.ensurePresenceOfSequence( node );
@@ -141,7 +142,7 @@ public final class PhylogenyDecorator {
                         if ( new_values.containsKey( TP_NODE_NAME ) ) {
                             node.setName( new_values.get( TP_NODE_NAME ) );
                         }
-                    } // if ( new_values != null ) 
+                    } // if ( new_values != null )
                 } // if ( map.containsKey( name ) || ( numbers_of_chars_allowed_to_remove_if_not_found_in_map > 0 ) )
                 else if ( picky ) {
                     throw new IllegalArgumentException( "\"" + name + "\" not found in name map" );
@@ -159,7 +160,7 @@ public final class PhylogenyDecorator {
                                    final boolean cut_name_after_space,
                                    final boolean trim_after_tilde,
                                    final boolean verbose ) throws IllegalArgumentException, NHXFormatException,
-            PhyloXmlDataFormatException {
+                                   PhyloXmlDataFormatException {
         return PhylogenyDecorator.decorate( phylogeny,
                                             map,
                                             field,
@@ -173,9 +174,9 @@ public final class PhylogenyDecorator {
     }
 
     /**
-     * 
-     * 
-     * 
+     *
+     *
+     *
      * @param phylogeny
      * @param map
      *            maps names (in phylogeny) to new values if intermediate_map is
@@ -185,7 +186,7 @@ public final class PhylogenyDecorator {
      * @param intermediate_map
      *            maps name (in phylogeny) to a intermediate value
      * @throws IllegalArgumentException
-     * @throws PhyloXmlDataFormatException 
+     * @throws PhyloXmlDataFormatException
      */
     public static String decorate( final Phylogeny phylogeny,
                                    final Map<String, String> map,
@@ -203,7 +204,6 @@ public final class PhylogenyDecorator {
         if ( map.isEmpty() ) {
             throw new IllegalArgumentException( "map is empty" );
         }
-      
         int ext_nodes = 0;
         int ext_nodes_updated = 0;
         int int_nodes = 0;
@@ -221,19 +221,22 @@ public final class PhylogenyDecorator {
                 throw new IllegalArgumentException( "external node with no name present" );
             }
             String tilde_annotation = null;
+            final String orig_name = name;
             if ( trim_after_tilde && ( name.indexOf( '~' ) > 0 ) ) {
                 final int ti = name.indexOf( '~' );
-                final String orig = name;
                 tilde_annotation = name.substring( ti );
                 name = name.substring( 0, ti );
                 if ( node.isExternal() && ForesterUtil.isEmpty( name ) ) {
-                    throw new IllegalArgumentException( "external node with illegal name: " + orig );
+                    throw new IllegalArgumentException( "external node with illegal name: " + orig_name );
                 }
             }
             if ( !ForesterUtil.isEmpty( name ) ) {
                 if ( intermediate_map != null ) {
                     name = PhylogenyDecorator.extractIntermediate( intermediate_map, name, verbose );
                 }
+                if ( ( field == FIELD.MOL_SEQ ) && !map.containsKey( name ) ) {
+                    name = orig_name;
+                }
                 if ( map.containsKey( name ) ) {
                     String new_value = map.get( name ).trim().replaceAll( "/\\s+/", " " );
                     if ( !ForesterUtil.isEmpty( new_value ) ) {
@@ -252,7 +255,7 @@ public final class PhylogenyDecorator {
                             }
                             else if ( picky ) {
                                 throw new IllegalArgumentException( " could not get taxonomy from \"" + new_value
-                                        + "\"" );
+                                                                    + "\"" );
                             }
                         }
                         switch ( field ) {
@@ -264,6 +267,18 @@ public final class PhylogenyDecorator {
                                     node.getNodeData().setSequence( new Sequence() );
                                 }
                                 node.getNodeData().getSequence().setMolecularSequence( new_value );
+                                final TYPE type = ForesterUtil.guessMolecularSequenceType( new_value );
+                                if ( type != null ) {
+                                    if ( type == TYPE.AA ) {
+                                        node.getNodeData().getSequence().setType( "protein" );
+                                    }
+                                    else if ( type == TYPE.DNA ) {
+                                        node.getNodeData().getSequence().setType( "dna" );
+                                    }
+                                    else if ( type == TYPE.RNA ) {
+                                        node.getNodeData().getSequence().setType( "rna" );
+                                    }
+                                }
                                 break;
                             case SEQUENCE_ANNOTATION_DESC:
                                 if ( verbose ) {
@@ -284,7 +299,7 @@ public final class PhylogenyDecorator {
                                     node.getNodeData().setSequence( new Sequence() );
                                 }
                                 node.getNodeData().getSequence()
-                                        .setDomainArchitecture( new DomainArchitecture( new_value ) );
+                                .setDomainArchitecture( new DomainArchitecture( new_value ) );
                                 break;
                             case TAXONOMY_CODE:
                                 if ( verbose ) {
@@ -344,7 +359,7 @@ public final class PhylogenyDecorator {
             }
         }
         return "updated " + ext_nodes_updated + "/" + ext_nodes + " external nodes, updated " + int_nodes_updated + "/"
-                + int_nodes + " internal nodes";
+        + int_nodes + " internal nodes";
     }
 
     public static Map<String, Map<String, String>> parseMappingTable( final File mapping_table_file )