Allows now to set most options "manually", with setters...
[jalview.git] / forester / java / src / org / forester / archaeopteryx / Configuration.java
index 2333e77..e7c0c2c 100644 (file)
@@ -8,7 +8,7 @@
 // and Howard Hughes Medical Institute
 // Copyright (C) 2003-2007 Ethalinda K.S. Cannon
 // All rights reserved
-// 
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -18,7 +18,7 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // Lesser General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
@@ -47,6 +47,9 @@ import org.forester.archaeopteryx.Options.CLADOGRAM_TYPE;
 import org.forester.archaeopteryx.Options.NODE_LABEL_DIRECTION;
 import org.forester.archaeopteryx.Options.OVERVIEW_PLACEMENT_TYPE;
 import org.forester.archaeopteryx.Options.PHYLOGENY_GRAPHICS_TYPE;
+import org.forester.phylogeny.data.NodeVisualization;
+import org.forester.phylogeny.data.NodeVisualization.NodeFill;
+import org.forester.phylogeny.data.NodeVisualization.NodeShape;
 import org.forester.util.ForesterUtil;
 
 public final class Configuration {
@@ -55,7 +58,7 @@ public final class Configuration {
     private static final String             WEB_LINK_KEY                                           = "web_link";
     private static final String             DISPLAY_COLOR_KEY                                      = "display_color";
     private static final int                DEPRECATED                                             = -2;
-    private TRIPLET                         _native_ui                                             = TRIPLET.FALSE;
+    private UI                              _ui                                                    = UI.UNKNOWN;
     private boolean                         _use_tabbed_display                                    = false;
     private boolean                         _hide_controls_and_menus                               = false;
     private CLADOGRAM_TYPE                  _cladogram_type                                        = Constants.CLADOGRAM_TYPE_DEFAULT;
@@ -88,6 +91,11 @@ public final class Configuration {
     private boolean                         _abbreviate_scientific_names                           = false;
     private boolean                         _color_labels_same_as_parent_branch                    = false;
     private int                             _default_bootstrap_samples                             = -1;
+    private boolean                         _show_default_node_shapes                              = false;
+    private NodeShape                       _default_node_shape                                    = NodeShape.CIRCLE;
+    private NodeFill                        _default_node_fill                                     = NodeFill.GRADIENT;
+    private short                           _default_node_shape_size                               = Constants.DEFAULT_NODE_SHAPE_SIZE_DEFAULT;
+    private boolean                         _taxonomy_colorize_node_shapes                         = false;
     final static int                        display_as_phylogram                                   = 0;
     final static int                        show_node_names                                        = 1;
     final static int                        show_tax_code                                          = 2;
@@ -97,22 +105,23 @@ public final class Configuration {
     final static int                        color_according_to_species                             = 6;
     final static int                        color_branches                                         = 7;
     final static int                        width_branches                                         = 8;
-    final static int                        show_domain_architectures                              = 9;
-    final static int                        show_binary_characters                                 = 10;
-    final static int                        show_binary_character_counts                           = 11;
-    final static int                        show_gene_names                                        = 12;
-    final static int                        show_sequence_acc                                      = 13;
-    final static int                        display_internal_data                                  = 14;
-    final static int                        dynamically_hide_data                                  = 15;
-    final static int                        show_taxonomy_scientific_names                         = 16;
-    final static int                        show_taxonomy_common_names                             = 17;
-    final static int                        color_according_to_annotation                          = 18;
-    final static int                        show_property                                          = 19;
+    final static int                        show_custom_node_shapes                                = 9;
+    final static int                        show_domain_architectures                              = 10;
+    final static int                        show_binary_characters                                 = 11;
+    final static int                        show_binary_character_counts                           = 12;
+    final static int                        show_gene_names                                        = 13;
+    final static int                        show_sequence_acc                                      = 14;
+    final static int                        display_internal_data                                  = 15;
+    final static int                        dynamically_hide_data                                  = 16;
+    final static int                        show_taxonomy_scientific_names                         = 17;
+    final static int                        show_taxonomy_common_names                             = 18;
+    final static int                        color_according_to_annotation                          = 19;
     final static int                        show_gene_symbols                                      = 20;
     final static int                        node_data_popup                                        = 21;
     final static int                        show_relation_confidence                               = 22;
     final static int                        show_vector_data                                       = 23;
     final static int                        show_taxonomy_images                                   = 24;
+    final static int                        show_properties                                        = 25;
     // ------------------
     // Click-to options
     // ------------------
@@ -143,22 +152,22 @@ public final class Configuration {
     final static String                     display_options[][]                                    = {
             { "Phylogram", "display", "?" }, { "Node Name", "display", "yes" }, { "Taxonomy Code", "display", "yes" },
             { "Annotation", "nodisplay", "no" }, { "Confidence Value", "display", "?" }, { "Event", "display", "?" },
-            { "Taxonomy Colorize", "display", "yes" }, { "Colorize Branches", "display", "no" },
-            { "Use Branch-Width", "nodisplay", "no" }, { "Domains", "nodisplay", "no" },
-            { "Binary Characters", "nodisplay", "no" }, { "Binary Char Counts", "nodisplay", "no" },
-            { "Prot/Gene Name", "display", "no" }, { "Prot/Gene Acc", "display", "no" },
-            { "Show Internal Data", "display", "yes" }, { "Dyna Hide", "display", "yes" },
-            { "Taxonomy Scientific", "display", "yes" }, { "Taxonomy Common", "display", "no" },
-            { "Annotation Colorize", "nodisplay", "no" }, { "Property", "nodisplay", "no" },
-            { "Prot/Gene Symbol", "display", "no" }, { "Rollover", "display", "yes" },
+            { "Taxonomy Colorize", "display", "no" }, { "Colorize Branches", "display", "no" },
+            { "Use Branch-Widths", "display", "no" }, { "Show Custom Nodes", "display", "yes" },
+            { "Domains", "nodisplay", "no" }, { "Binary Characters", "nodisplay", "no" },
+            { "Binary Char Counts", "nodisplay", "no" }, { "Prot/Gene Name", "display", "yes" },
+            { "Prot/Gene Acc", "display", "no" }, { "Show Internal Data", "display", "yes" },
+            { "Dyna Hide", "display", "yes" }, { "Taxonomy Scientific", "display", "yes" },
+            { "Taxonomy Common", "display", "no" }, { "Annotation Colorize", "nodisplay", "no" },
+            { "Prot/Gene Symbol", "display", "yes" }, { "Rollover", "display", "yes" },
             { "Relation Confidence", "display", "no" }, { "Vector Data", "display", "no" },
-            { "Taxonomy Images", "display", "no" }                                                };
+            { "Taxonomy Images", "display", "no" }, { "Properties", "display", "no" }             };
     final static String                     clickto_options[][]                                    = {
             { "Display Node Data", "display" }, { "Collapse/Uncollapse", "display" }, { "Root/Reroot", "display" },
             { "Sub/Super Tree", "display" }, { "Swap Descendants", "display" }, { "Colorize Subtree", "display" },
-            { "Open Sequence Web", "nodisplay" }, { "Open Taxonomy Web", "nodisplay" }, { "Cut Subtree", "display" },
+            { "Open Sequence Web", "display" }, { "Open Taxonomy Web", "display" }, { "Cut Subtree", "display" },
             { "Copy Subtree", "display" }, { "Paste Subtree", "display" }, { "Delete Subtree/Node", "display" },
-            { "Add New Node", "display" }, { "Edit Node Data", "display" }, { "Blast", "display" } };
+            { "Add New Node", "display" }, { "Edit Node Data", "display" }, { "Blast", "nodisplay" } };
     // This option is selected in the dropdown
     int                                     default_clickto                                        = Configuration.display_node_data;
     // --------------
@@ -183,7 +192,6 @@ public final class Configuration {
     private static Hashtable<String, Color> _annotation_colors;
     boolean                                 verbose                                                = Constants.VERBOSE_DEFAULT;
     private NODE_LABEL_DIRECTION            _node_label_direction                                  = NODE_LABEL_DIRECTION.HORIZONTAL;
-    private TRIPLET                         _use_native_ui;
     private Color                           _gui_background_color                                  = Constants.GUI_BACKGROUND_DEFAULT;
     private Color                           _gui_checkbox_text_color                               = Constants.CHECKBOX_TEXT_COLOR_DEFAULT;
     private Color                           _gui_checkbox_and_button_active_color                  = Constants.CHECKBOX_AND_BUTTON_ACTIVE_COLOR_DEFAULT;
@@ -197,7 +205,7 @@ public final class Configuration {
     private static String                   DEFAULT_FONT_FAMILY                                    = "";
     static {
         for( final String font_name : Constants.DEFAULT_FONT_CHOICES ) {
-            if ( Arrays.binarySearch( Util.getAvailableFontFamiliesSorted(), font_name ) >= 0 ) {
+            if ( Arrays.binarySearch( AptxUtil.getAvailableFontFamiliesSorted(), font_name ) >= 0 ) {
                 DEFAULT_FONT_FAMILY = font_name;
                 break;
             }
@@ -207,7 +215,11 @@ public final class Configuration {
         }
     }
 
-    Configuration( final String cf, final boolean is_url, final boolean is_applet ) {
+    public Configuration() {
+        this( null, false, false, false );
+    }
+
+    public Configuration( final String cf, final boolean is_url, final boolean is_applet, final boolean verbose ) {
         if ( ForesterUtil.isEmpty( cf ) ) {
             config_filename = default_config_filename;
         }
@@ -253,13 +265,17 @@ public final class Configuration {
                     bf.close();
                 }
                 catch ( final Exception e ) {
-                    ForesterUtil.printWarningMessage( Constants.PRG_NAME, "failed to read configuration from ["
-                            + config_filename + "]: " + e );
+                    if ( verbose ) {
+                        ForesterUtil.printWarningMessage( Constants.PRG_NAME, "failed to read configuration from ["
+                                + config_filename + "]: " + e );
+                    }
                 }
             }
             else {
-                ForesterUtil.printWarningMessage( Constants.PRG_NAME, "cannot find or open configuration file ["
-                        + config_filename + "]" );
+                if ( verbose ) {
+                    ForesterUtil.printWarningMessage( Constants.PRG_NAME, "cannot find or open configuration file ["
+                            + config_filename + "]" );
+                }
             }
         }
     }
@@ -279,38 +295,6 @@ public final class Configuration {
         }
     }
 
-    Color getGuiBackgroundColor() {
-        return _gui_background_color;
-    }
-
-    Color getGuiCheckboxTextColor() {
-        return _gui_checkbox_text_color;
-    }
-
-    Color getGuiCheckboxAndButtonActiveColor() {
-        return _gui_checkbox_and_button_active_color;
-    }
-
-    Color getGuiButtonTextColor() {
-        return _gui_button_text_color;
-    }
-
-    Color getGuiButtonBackgroundColor() {
-        return _gui_button_background_color;
-    }
-
-    Color getGuiMenuBackgroundColor() {
-        return _gui_menu_background_color;
-    }
-
-    Color getGuiMenuTextColor() {
-        return _gui_menu_text_color;
-    }
-
-    Color getGuiButtonBorderColor() {
-        return _gui_button_border_color;
-    }
-
     boolean displaySequenceRelations() {
         return _display_sequence_relations;
     }
@@ -435,10 +419,26 @@ public final class Configuration {
         return clickto_options[ which ][ 0 ];
     }
 
+    public int getDefaultBootstrapSamples() {
+        return _default_bootstrap_samples;
+    }
+
     int getDefaultDisplayClicktoOption() {
         return default_clickto;
     }
 
+    public NodeFill getDefaultNodeFill() {
+        return _default_node_fill;
+    }
+
+    public NodeShape getDefaultNodeShape() {
+        return _default_node_shape;
+    }
+
+    public short getDefaultNodeShapeSize() {
+        return _default_node_shape_size;
+    }
+
     SortedMap<String, Color> getDisplayColors() {
         return _display_colors;
     }
@@ -454,6 +454,14 @@ public final class Configuration {
         return _domain_colors;
     }
 
+    public Color getDomainStructureBaseColor() {
+        return _domain_structure_base_color;
+    }
+
+    public Color getDomainStructureFontColor() {
+        return _domain_structure_font_color;
+    }
+
     int getGraphicsExportX() {
         return _graphics_export_x;
     }
@@ -462,8 +470,36 @@ public final class Configuration {
         return _graphics_export_y;
     }
 
-    int getDefaultBootstrapSamples() {
-        return _default_bootstrap_samples;
+    Color getGuiBackgroundColor() {
+        return _gui_background_color;
+    }
+
+    Color getGuiButtonBackgroundColor() {
+        return _gui_button_background_color;
+    }
+
+    Color getGuiButtonBorderColor() {
+        return _gui_button_border_color;
+    }
+
+    Color getGuiButtonTextColor() {
+        return _gui_button_text_color;
+    }
+
+    Color getGuiCheckboxAndButtonActiveColor() {
+        return _gui_checkbox_and_button_active_color;
+    }
+
+    Color getGuiCheckboxTextColor() {
+        return _gui_checkbox_text_color;
+    }
+
+    Color getGuiMenuBackgroundColor() {
+        return _gui_menu_background_color;
+    }
+
+    Color getGuiMenuTextColor() {
+        return _gui_menu_text_color;
     }
 
     double getMinConfidenceValue() {
@@ -525,6 +561,10 @@ public final class Configuration {
         return _weblinks;
     }
 
+    public boolean isAbbreviateScientificTaxonNames() {
+        return _abbreviate_scientific_names;
+    }
+
     boolean isAntialiasScreen() {
         return _antialias_screen;
     }
@@ -533,6 +573,10 @@ public final class Configuration {
         return _background_color_gradient;
     }
 
+    public boolean isColorLabelsSameAsParentBranch() {
+        return _color_labels_same_as_parent_branch;
+    }
+
     /**
      * Convenience method.
      * 
@@ -574,6 +618,14 @@ public final class Configuration {
         return _show_branch_length_values;
     }
 
+    public boolean isShowDefaultNodeShapes() {
+        return _show_default_node_shapes;
+    }
+
+    public boolean isShowDomainLabels() {
+        return _show_domain_labels;
+    }
+
     boolean isShowOverview() {
         return _show_overview;
     }
@@ -582,19 +634,15 @@ public final class Configuration {
         return _show_scale;
     }
 
+    public boolean isTaxonomyColorizeNodeShapes() {
+        return _taxonomy_colorize_node_shapes;
+    }
+
     final boolean isUseNativeUI() {
-        if ( ( _use_native_ui == null ) || ( _use_native_ui == TRIPLET.UNKNOWN ) ) {
-            if ( ( _native_ui == TRIPLET.UNKNOWN ) && Util.isMac() && Util.isJava15() ) {
-                _use_native_ui = TRIPLET.TRUE;
-            }
-            else if ( _native_ui == TRIPLET.TRUE ) {
-                _use_native_ui = TRIPLET.TRUE;
-            }
-            else {
-                _use_native_ui = TRIPLET.FALSE;
-            }
+        if ( ( _ui == UI.UNKNOWN ) && AptxUtil.isMac() && AptxUtil.isJava15() ) {
+            _ui = UI.NATIVE;
         }
-        return _use_native_ui == TRIPLET.TRUE;
+        return _ui == UI.NATIVE;
     }
 
     /**
@@ -677,13 +725,17 @@ public final class Configuration {
         final String[] fonts = font_str.split( ",+" );
         for( String font : fonts ) {
             font = font.replace( '_', ' ' ).trim();
-            if ( Arrays.binarySearch( Util.getAvailableFontFamiliesSorted(), font ) >= 0 ) {
+            if ( Arrays.binarySearch( AptxUtil.getAvailableFontFamiliesSorted(), font ) >= 0 ) {
                 setBaseFontFamilyName( font );
                 break;
             }
         }
     }
 
+    public void putDisplayColors( final String key, final Color color ) {
+        getDisplayColors().put( key, color );
+    }
+
     /**
      * read each line of config file, process non-comment lines
      * @throws IOException 
@@ -705,6 +757,10 @@ public final class Configuration {
         } while ( line != null );
     }
 
+    public void setAbbreviateScientificTaxonNames( final boolean abbreviate_scientific_names ) {
+        _abbreviate_scientific_names = abbreviate_scientific_names;
+    }
+
     private void setAntialiasScreen( final boolean antialias_screen ) {
         _antialias_screen = antialias_screen;
     }
@@ -713,43 +769,103 @@ public final class Configuration {
         _background_color_gradient = background_color_gradient;
     }
 
-    private void setBaseFontFamilyName( final String base_font_family_name ) {
+    public void setBaseFontFamilyName( final String base_font_family_name ) {
         _base_font_family_name = base_font_family_name;
     }
 
-    private void setBaseFontSize( final int base_font_size ) {
+    public void setBaseFontSize( final int base_font_size ) {
         _base_font_size = base_font_size;
     }
 
-    private void setShowDomainLabels( final boolean show_domain_labels ) {
-        _show_domain_labels = show_domain_labels;
+    private void setCladogramType( final CLADOGRAM_TYPE cladogram_type ) {
+        _cladogram_type = cladogram_type;
     }
 
-    private void setAbbreviateScientificTaxonNames( final boolean abbreviate_scientific_names ) {
-        _abbreviate_scientific_names = abbreviate_scientific_names;
+    public void setColorizeBranches( final boolean b ) {
+        display_options[ color_branches ][ 2 ] = b ? "yes" : "no";
     }
 
-    private void setColorLabelsSameAsParentBranch( final boolean color_labels_same_as_parent_branch ) {
+    public void setColorLabelsSameAsParentBranch( final boolean color_labels_same_as_parent_branch ) {
         _color_labels_same_as_parent_branch = color_labels_same_as_parent_branch;
     }
 
-    private void setCladogramType( final CLADOGRAM_TYPE cladogram_type ) {
-        _cladogram_type = cladogram_type;
+    private void setDefaultBootstrapSamples( final int default_bootstrap_samples ) {
+        _default_bootstrap_samples = default_bootstrap_samples;
+    }
+
+    public void setDefaultNodeFill( final NodeFill default_node_fill ) {
+        _default_node_fill = default_node_fill;
+    }
+
+    public void setDefaultNodeShape( final NodeShape default_node_shape ) {
+        _default_node_shape = default_node_shape;
+    }
+
+    public void setDefaultNodeShapeSize( final short default_node_shape_size ) {
+        _default_node_shape_size = default_node_shape_size;
     }
 
-    void setDisplayColors( final SortedMap<String, Color> display_colors ) {
+    public void setDisplayAsPhylogram( final boolean b ) {
+        display_options[ display_as_phylogram ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDisplayColors( final SortedMap<String, Color> display_colors ) {
         _display_colors = display_colors;
     }
 
-    private void setDisplaySequenceRelations( final boolean display_sequence_relations ) {
+    public void setDisplayConfidenceValues( final boolean b ) {
+        display_options[ write_confidence_values ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDisplayInternalData( final boolean b ) {
+        display_options[ display_internal_data ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDisplayNodeNames( final boolean b ) {
+        display_options[ show_node_names ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDisplaySequenceAcc( final boolean b ) {
+        display_options[ show_sequence_acc ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDisplaySequenceNames( final boolean b ) {
+        display_options[ show_gene_names ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDisplaySequenceRelations( final boolean display_sequence_relations ) {
         _display_sequence_relations = display_sequence_relations;
     }
 
+    public void setDisplaySequenceSymbols( final boolean b ) {
+        display_options[ show_gene_symbols ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDisplayTaxonomyCode( final boolean b ) {
+        display_options[ show_tax_code ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDisplayTaxonomyCommonNames( final boolean b ) {
+        display_options[ show_taxonomy_common_names ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDisplayTaxonomyImages( final boolean b ) {
+        display_options[ show_taxonomy_images ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDisplayTaxonomyScientificNames( final boolean b ) {
+        display_options[ show_taxonomy_scientific_names ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setDynamicallyHideData( final boolean b ) {
+        display_options[ dynamically_hide_data ][ 2 ] = b ? "yes" : "no";
+    }
+
     private void setEditable( final boolean editable ) {
         _editable = editable;
     }
 
-    private void setExtractPfamTaxonomyCodesInNhParsing( final boolean nh_parsing_extract_pfam_taxonomy_codes ) {
+    public void setExtractPfamTaxonomyCodesInNhParsing( final boolean nh_parsing_extract_pfam_taxonomy_codes ) {
         _nh_parsing_extract_pfam_taxonomy_codes = nh_parsing_extract_pfam_taxonomy_codes;
     }
 
@@ -761,10 +877,6 @@ public final class Configuration {
         _graphics_export_y = graphics_export_y;
     }
 
-    private void setDefaultBootstrapSamples( final int default_bootstrap_samples ) {
-        _default_bootstrap_samples = default_bootstrap_samples;
-    }
-
     private void setInternalNumberAreConfidenceForNhParsing( final boolean internal_number_are_confidence_for_nh_parsing ) {
         _internal_number_are_confidence_for_nh_parsing = internal_number_are_confidence_for_nh_parsing;
     }
@@ -793,18 +905,18 @@ public final class Configuration {
         else if ( key.equals( "native_ui" ) ) {
             final String my_str = ( ( String ) st.nextElement() ).trim().toLowerCase();
             if ( my_str.equals( "yes" ) || my_str.equals( "true" ) ) {
-                _native_ui = TRIPLET.TRUE;
+                _ui = UI.NATIVE;
             }
             else if ( my_str.equals( "no" ) || my_str.equals( "false" ) ) {
-                _native_ui = TRIPLET.FALSE;
+                _ui = UI.CROSSPLATFORM;
             }
             else if ( my_str.equals( "?" ) ) {
-                _native_ui = TRIPLET.UNKNOWN;
+                _ui = UI.UNKNOWN;
             }
             else {
                 ForesterUtil.printWarningMessage( Constants.PRG_NAME, "could not parse yes/no/? value from [" + my_str
                         + "]" );
-                _native_ui = TRIPLET.FALSE;
+                _ui = UI.UNKNOWN;
             }
         }
         else if ( key.equals( VALIDATE_AGAINST_PHYLOXML_XSD_SCHEMA ) ) {
@@ -1062,6 +1174,45 @@ public final class Configuration {
         else if ( key.equals( "domain_structure_base_color" ) ) {
             _domain_structure_base_color = Color.decode( ( String ) st.nextElement() );
         }
+        else if ( key.equals( "show_default_node_shapes" ) ) {
+            setShowDefaultNodeShapes( parseBoolean( ( ( String ) st.nextElement() ).trim() ) );
+        }
+        else if ( key.equals( "default_node_size" ) ) {
+            final short i = parseShort( ( ( String ) st.nextElement() ).trim() );
+            setDefaultNodeShapeSize( i );
+        }
+        else if ( key.equals( "default_node_fill" ) ) {
+            final String fill_str = ( ( String ) st.nextElement() ).trim();
+            if ( fill_str.equalsIgnoreCase( NodeVisualization.NodeFill.NONE.toString() ) ) {
+                setDefaultNodeFill( NodeFill.NONE );
+            }
+            else if ( fill_str.equalsIgnoreCase( NodeVisualization.NodeFill.GRADIENT.toString() ) ) {
+                setDefaultNodeFill( NodeFill.GRADIENT );
+            }
+            else if ( fill_str.equalsIgnoreCase( NodeVisualization.NodeFill.SOLID.toString() ) ) {
+                setDefaultNodeFill( NodeFill.SOLID );
+            }
+            else {
+                ForesterUtil.printWarningMessage( Constants.PRG_NAME, "unknown value [" + fill_str
+                        + "] for [default_node_fill]" );
+            }
+        }
+        else if ( key.equals( "default_node_shape" ) ) {
+            final String shape_str = ( ( String ) st.nextElement() ).trim();
+            if ( shape_str.equalsIgnoreCase( NodeVisualization.NodeShape.CIRCLE.toString() ) ) {
+                setDefaultNodeShape( NodeShape.CIRCLE );
+            }
+            else if ( shape_str.equalsIgnoreCase( NodeVisualization.NodeShape.RECTANGLE.toString() ) ) {
+                setDefaultNodeShape( NodeShape.RECTANGLE );
+            }
+            else {
+                ForesterUtil.printWarningMessage( Constants.PRG_NAME, "unknown value [" + shape_str
+                        + "] for [default_node_shape]" );
+            }
+        }
+        else if ( key.equals( "taxonomy_colorize_node_shapes" ) ) {
+            setTaxonomyColorizeNodeShapes( parseBoolean( ( String ) st.nextElement() ) );
+        }
         else if ( st.countTokens() >= 2 ) { // counts the tokens that are not
             // yet retrieved!
             int key_index = -1;
@@ -1183,15 +1334,18 @@ public final class Configuration {
             else if ( key.equals( "color_according_to_annotation" ) ) {
                 key_index = Configuration.color_according_to_annotation;
             }
-            else if ( key.equals( "show_property" ) ) {
-                key_index = Configuration.show_property;
-            }
             else if ( key.equals( "show_vector_data" ) ) {
                 key_index = Configuration.show_vector_data;
             }
+            else if ( key.equals( "show_properties" ) ) {
+                key_index = Configuration.show_properties;
+            }
             else if ( key.equals( "show_relation_confidence" ) ) {
                 key_index = Configuration.show_relation_confidence;
             }
+            else if ( key.equals( "show_custom_node_shapes" ) ) {
+                key_index = Configuration.show_custom_node_shapes;
+            }
             // If we've found the key, set the values
             if ( key_index >= 0 ) {
                 display_options[ key_index ][ 1 ] = ( String ) st.nextElement();
@@ -1231,12 +1385,13 @@ public final class Configuration {
                                                       "configuration key [function_color] is deprecated" );
                 }
                 else if ( key.equals( DISPLAY_COLOR_KEY ) ) {
-                    getDisplayColors().put( ( String ) st.nextElement(), Color.decode( ( String ) st.nextElement() ) );
+                    putDisplayColors( ( String ) st.nextElement(), Color.decode( ( String ) st.nextElement() ) );
                 }
                 else if ( key.equals( WEB_LINK_KEY ) ) {
                     if ( st.countTokens() == 3 ) {
-                        createWebLink( ( String ) st.nextElement(), ( String ) st.nextElement(), ( String ) st
-                                .nextElement() );
+                        createWebLink( ( String ) st.nextElement(),
+                                       ( String ) st.nextElement(),
+                                       ( String ) st.nextElement() );
                     }
                     else {
                         ForesterUtil.printWarningMessage( Constants.PRG_NAME,
@@ -1255,19 +1410,19 @@ public final class Configuration {
         }
     }
 
-    private void setMinConfidenceValue( final double min_confidence_value ) {
+    public void setMinConfidenceValue( final double min_confidence_value ) {
         _min_confidence_value = min_confidence_value;
     }
 
-    void setNodeLabelDirection( final NODE_LABEL_DIRECTION node_label_direction ) {
+    public void setNodeLabelDirection( final NODE_LABEL_DIRECTION node_label_direction ) {
         _node_label_direction = node_label_direction;
     }
 
-    private void setNumberOfDigitsAfterCommaForBranchLengthValue( final short _number_of_digits_after_comma_for_branch_length_values ) {
+    public void setNumberOfDigitsAfterCommaForBranchLengthValue( final short _number_of_digits_after_comma_for_branch_length_values ) {
         this._number_of_digits_after_comma_for_branch_length_values = _number_of_digits_after_comma_for_branch_length_values;
     }
 
-    private void setNumberOfDigitsAfterCommaForConfidenceValues( final short _number_of_digits_after_comma_for_confidence_values ) {
+    public void setNumberOfDigitsAfterCommaForConfidenceValues( final short _number_of_digits_after_comma_for_confidence_values ) {
         this._number_of_digits_after_comma_for_confidence_values = _number_of_digits_after_comma_for_confidence_values;
     }
 
@@ -1283,30 +1438,50 @@ public final class Configuration {
         _ov_placement = ov_placement;
     }
 
-    void setPhylogenyGraphicsType( final PHYLOGENY_GRAPHICS_TYPE phylogeny_graphics_type ) {
+    public void setPhylogenyGraphicsType( final PHYLOGENY_GRAPHICS_TYPE phylogeny_graphics_type ) {
         _phylogeny_graphics_type = phylogeny_graphics_type;
     }
 
-    private void setPrintLineWidth( final float print_line_width ) {
+    public void setPrintLineWidth( final float print_line_width ) {
         _print_line_width = print_line_width;
     }
 
-    private void setReplaceUnderscoresInNhParsing( final boolean nh_parsing_replace_underscores ) {
+    public void setReplaceUnderscoresInNhParsing( final boolean nh_parsing_replace_underscores ) {
         _nh_parsing_replace_underscores = nh_parsing_replace_underscores;
     }
 
-    private void setShowBranchLengthValues( final boolean show_branch_length_values ) {
+    public void setShowBranchLengthValues( final boolean show_branch_length_values ) {
         _show_branch_length_values = show_branch_length_values;
     }
 
+    public void setShowDefaultNodeShapes( final boolean show_default_node_shapes ) {
+        _show_default_node_shapes = show_default_node_shapes;
+    }
+
+    public void setShowDomainLabels( final boolean show_domain_labels ) {
+        _show_domain_labels = show_domain_labels;
+    }
+
     private void setShowOverview( final boolean show_overview ) {
         _show_overview = show_overview;
     }
 
-    private void setShowScale( final boolean show_scale ) {
+    public void setShowScale( final boolean show_scale ) {
         _show_scale = show_scale;
     }
 
+    public void setTaxonomyColorize( final boolean b ) {
+        display_options[ color_according_to_species ][ 2 ] = b ? "yes" : "no";
+    }
+
+    public void setTaxonomyColorizeNodeShapes( final boolean taxonomy_colorize_node_shapes ) {
+        _taxonomy_colorize_node_shapes = taxonomy_colorize_node_shapes;
+    }
+
+    public void setUseBranchesWidths( final boolean b ) {
+        display_options[ width_branches ][ 2 ] = b ? "yes" : "no";
+    }
+
     private void setValidatePhyloXmlAgainstSchema( final boolean validate_against_phyloxml_xsd_schema ) {
         _validate_against_phyloxml_xsd_schema = validate_against_phyloxml_xsd_schema;
     }
@@ -1323,23 +1498,7 @@ public final class Configuration {
         TRUE, FALSE, UNKNOWN
     }
 
-    public Color getDomainStructureFontColor() {
-        return _domain_structure_font_color;
-    }
-
-    public Color getDomainStructureBaseColor() {
-        return _domain_structure_base_color;
-    }
-
-    public boolean isColorLabelsSameAsParentBranch() {
-        return _color_labels_same_as_parent_branch;
-    }
-
-    public boolean isShowDomainLabels() {
-        return _show_domain_labels;
-    }
-
-    public boolean isAbbreviateScientificTaxonNames() {
-        return _abbreviate_scientific_names;
+    public enum UI {
+        NATIVE, CROSSPLATFORM, NIMBUS, UNKNOWN
     }
 }