JAL-1953 method made public for interfacing
[jalview.git] / forester / java / src / org / forester / archaeopteryx / ControlPanel.java
index b308854..bf4329c 100644 (file)
@@ -20,7 +20,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.archaeopteryx;
 
@@ -44,8 +44,10 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -53,109 +55,165 @@ import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 import javax.swing.JScrollBar;
 import javax.swing.JTextField;
 import javax.swing.ListCellRenderer;
 
 import org.forester.archaeopteryx.Options.CLADOGRAM_TYPE;
 import org.forester.archaeopteryx.Options.PHYLOGENY_GRAPHICS_TYPE;
+import org.forester.archaeopteryx.util.TypomaticJButton;
 import org.forester.phylogeny.Phylogeny;
 import org.forester.phylogeny.PhylogenyMethods;
+import org.forester.phylogeny.PhylogenyMethods.DESCENDANT_SORT_PRIORITY;
 import org.forester.phylogeny.PhylogenyNode;
 import org.forester.phylogeny.data.Sequence;
 import org.forester.phylogeny.data.SequenceRelation;
+import org.forester.phylogeny.data.SequenceRelation.SEQUENCE_RELATION_TYPE;
+import org.forester.phylogeny.iterators.PhylogenyNodeIterator;
 import org.forester.util.ForesterUtil;
 
-final class ControlPanel extends JPanel implements ActionListener {
-
-    private static final String  RETURN_TO_SUPER_TREE_TEXT = "Back to Super Tree";
-    final static Font            jcb_font                  = new Font( Configuration.getDefaultFontFamilyName(),
-                                                                       Font.PLAIN,
-                                                                       9 );
-    final static Font            js_font                   = new Font( Configuration.getDefaultFontFamilyName(),
-                                                                       Font.PLAIN,
-                                                                       9 );
-    final static Font            jcb_bold_font             = new Font( Configuration.getDefaultFontFamilyName(),
-                                                                       Font.BOLD,
-                                                                       9 );
-    private static final long    serialVersionUID          = -8463483932821545633L;
-    private final MainPanel      _mainpanel;
+public final class ControlPanel extends JPanel implements ActionListener {
+
+    enum NodeClickAction {
+                          ADD_NEW_NODE,
+                          BLAST,
+                          COLLAPSE,
+                          COLOR_SUBTREE,
+                          COPY_SUBTREE,
+                          CUT_SUBTREE,
+                          DELETE_NODE_OR_SUBTREE,
+                          EDIT_NODE_DATA,
+                          GET_EXT_DESC_DATA,
+                          OPEN_PDB_WEB,
+                          OPEN_SEQ_WEB,
+                          OPEN_TAX_WEB,
+                          PASTE_SUBTREE,
+                          REROOT,
+                          SELECT_NODES,
+                          SHOW_DATA,
+                          SORT_DESCENDENTS,
+                          SUBTREE,
+                          SWAP,
+                          CHANGE_NODE_FONT,
+                          COLOR_NODE_FONT,
+                          UNCOLLAPSE_ALL,
+                          ORDER_SUBTREE;
+    }
+    final static Font                            jcb_bold_font             = new Font( Configuration
+            .getDefaultFontFamilyName(), Font.BOLD, Configuration.getGuiFontSize() );
+    final static Font                            jcb_font                  = new Font( Configuration
+            .getDefaultFontFamilyName(), Font.PLAIN, Configuration.getGuiFontSize() );
+    final static Font                            js_font                   = new Font( Configuration
+            .getDefaultFontFamilyName(), Font.PLAIN, Configuration.getGuiFontSize() );
+    private static final String                  RETURN_TO_SUPER_TREE_TEXT = "R";
+    private static final String                  SEARCH_TIP_TEXT           = "Enter text to search for. Use ',' for logical OR and '+' for logical AND (not used in this manner for regular expression searches).";
+    private static final long                    serialVersionUID          = -8463483932821545633L;
+    private NodeClickAction                      _action_when_node_clicked;
+    private int                                  _add_new_node_item;
+    private Map<Integer, String>                 _all_click_to_names;
+    private Map<String, Color>                   _annotation_colors;
+    private int                                  _blast_item;
+    private JComboBox<String>                    _click_to_combobox;
+    private JLabel                               _click_to_label;
+    private List<String>                         _click_to_names;
+    private int                                  _collapse_cb_item;
+    private int                                  _uncollapse_all_cb_item;
+    private int                                  _order_subtree_cb_item;
+    private JCheckBox                            _color_acc_species;
+    private JCheckBox                            _color_acc_sequence;
+    private JCheckBox                            _color_according_to_annotation;
+    private boolean                              _color_branches;
+    private JCheckBox                            _use_visual_styles_cb;
+    private int                                  _color_subtree_cb_item;
+    private int                                  _change_node_font_item;
     // The settings from the conf file
-    private final Configuration  _configuration;
+    private final Configuration                  _configuration;
+    private int                                  _copy_subtree_item;
+    private int                                  _cut_subtree_item;
+    private JButton                              _decr_domain_structure_evalue_thr;
+    private int                                  _delete_node_or_subtree_item;
+    private JRadioButton                         _display_as_unaligned_phylogram_rb;
+    private JRadioButton                         _display_as_aligned_phylogram_rb;
+    private JRadioButton                         _display_as_cladogram_rb;
+    private ButtonGroup                          _display_as_buttongroup;
     // Tree checkboxes
-    private JCheckBox            _display_internal_data;
-    private JCheckBox            _show_node_names;
-    private JCheckBox            _show_taxo_code;
-    private JCheckBox            _write_confidence;
-    private JCheckBox            _show_events;
-    private JCheckBox            _color_acc_species;
-    private JCheckBox            _color_branches_cb;
-    private JCheckBox            _width_branches;
-    private JCheckBox            _show_domain_architectures;
-    private JCheckBox            _show_annotation;
-    private JCheckBox            _show_binary_characters;
-    private JCheckBox            _show_binary_character_counts;
-    private JCheckBox            _show_gene_names;
-    private JCheckBox            _show_gene_symbols;
-    private JCheckBox            _show_sequence_acc;
-    private JCheckBox            _node_desc_popup_cb;
-    private JCheckBox            _dynamically_hide_data;
-    private JCheckBox            _show_taxo_scientific_names;
-    private JCheckBox            _show_taxo_common_names;
-    private JCheckBox            _show_taxo_images_cb;
-    private JCheckBox            _color_according_to_annotation;
-    private JCheckBox            _display_as_phylogram_cb;
-    private JCheckBox            _seq_relation_confidence_switch;
-    private JComboBox            _show_sequence_relations;
-    private JComboBox            _sequence_relation_type_box;
-    private JCheckBox            _show_vector_data_cb;
-    private JCheckBox            _show_properties_cb;
-    private JLabel               _click_to_label;
-    private JLabel               _zoom_label;
-    private JLabel               _domain_display_label;
-    private JComboBox            _click_to_combobox;
-    private Map<Integer, String> _all_click_to_names;
-    private List<String>         _click_to_names;
+    private JCheckBox                            _display_internal_data;
+    private JCheckBox                            _display_external_data;
+    private JLabel                               _domain_display_label;
+    private JTextField                           _domain_structure_evalue_thr_tf;
+    private JTextField                           _depth_collapse_depth_tf;
+    private JTextField                           _rank_collapse_depth_tf;
+    private List<Options.PHYLOGENY_DISPLAY_TYPE> _tree_display_types;
+    private JCheckBox                            _dynamically_hide_data;
+    private int                                  _edit_node_data_item;
+    private int                                  _get_ext_desc_data;
+    private JButton                              _incr_domain_structure_evalue_thr;
+    private final MainPanel                      _mainpanel;
+    private JCheckBox                            _node_desc_popup_cb;
+    private int                                  _open_pdb_item;
+    private int                                  _open_seq_web_item;
+    private int                                  _open_tax_web_item;
+    private int                                  _color_node_font_item;
+    private JButton                              _order;
+    private int                                  _paste_subtree_item;
+    private int                                  _reroot_cb_item;
+    private JButton                              _return_to_super_tree;
+    // Search
+    private JLabel                               _search_found_label_0;
+    private JLabel                               _search_found_label_1;
+    private JButton                              _search_reset_button_0;
+    private JButton                              _search_reset_button_1;
+    private JTextField                           _search_tf_0;
+    private JTextField                           _search_tf_1;
+    private int                                  _select_nodes_item;
+    private Sequence                             _selected_query_seq;
+    private JCheckBox                            _seq_relation_confidence_switch;
+    private JComboBox<SEQUENCE_RELATION_TYPE>    _sequence_relation_type_box;
+    private JCheckBox                            _show_annotation;
+    private JCheckBox                            _show_binary_character_counts;
+    private JCheckBox                            _show_binary_characters;
     // Indices for the click-to options in the combo box
-    private int                  _show_data_item;
-    private int                  _collapse_cb_item;
-    private int                  _reroot_cb_item;
-    private int                  _swap_cb_item;
-    private int                  _subtree_cb_item;
-    private int                  _color_subtree_cb_item;
-    private int                  _open_seq_web_item;
-    private int                  _open_tax_web_item;
-    private int                  _cut_subtree_item;
-    private int                  _copy_subtree_item;
-    private int                  _delete_node_or_subtree_item;
-    private int                  _paste_subtree_item;
-    private int                  _add_new_node_item;
-    private int                  _edit_node_data_item;
-    private int                  _blast_item;
-    // zooming and quick tree manipulation buttons:
-    private JButton              _zoom_in_x;
-    private JButton              _zoom_in_y;
-    private JButton              _zoom_out_x;
-    private JButton              _zoom_out_y;
-    private JButton              _show_whole;
-    private JButton              _order;
-    private JButton              _uncollapse_all;
-    private JButton              _zoom_in_domain_structure;
-    private JButton              _zoom_out_domain_structure;
-    private JButton              _decr_domain_structure_evalue_thr;
-    private JButton              _incr_domain_structure_evalue_thr;
-    private JButton              _return_to_super_tree;
-    private JTextField           _domain_structure_evalue_thr_tf;
-    private JTextField           _search_tf;
-    private boolean              _order_of_appearance;
-    private boolean              _color_branches;
-    private NodeClickAction      _action_when_node_clicked;
-    private List<Boolean>        _draw_phylogram;
-    private Map<String, Color>   _annotation_colors;
-    private Map<String, Color>   _species_colors;
-    private JButton              _search_reset_button;
-    private JLabel               _search_found_label;
-    private Sequence             _selected_query_seq;
+    private int                                  _show_data_item;
+    private JCheckBox                            _show_domain_architectures;
+    private JCheckBox                            _show_mol_seqs;
+    private JCheckBox                            _write_branch_length_values;
+    private JCheckBox                            _show_events;
+    private JCheckBox                            _show_gene_names;
+    private JCheckBox                            _show_node_names;
+    private JCheckBox                            _show_properties_cb;
+    private JCheckBox                            _show_seq_names;
+    private JCheckBox                            _show_seq_symbols;
+    private JCheckBox                            _show_sequence_acc;
+    private JComboBox<String>                    _show_sequence_relations;
+    private JCheckBox                            _show_taxo_code;
+    private JCheckBox                            _show_taxo_rank;
+    private JCheckBox                            _show_taxo_common_names;
+    private JCheckBox                            _show_taxo_images_cb;
+    private JCheckBox                            _show_taxo_scientific_names;
+    private JCheckBox                            _show_vector_data_cb;
+    private JButton                              _show_whole;
+    private int                                  _sort_descendents_item;
+    private Map<String, Color>                   _species_colors;
+    private Map<String, Color>                   _sequence_colors;
+    private int                                  _subtree_cb_item;
+    private int                                  _swap_cb_item;
+    private JButton                              _uncollapse_all;
+    private JCheckBox                            _width_branches;
+    private JCheckBox                            _write_confidence;
+    private JButton                              _zoom_in_domain_structure;
+    private JButton                              _zoom_in_x;
+    private JButton                              _zoom_in_y;
+    private JLabel                               _zoom_label;
+    private JButton                              _zoom_out_domain_structure;
+    private JButton                              _zoom_out_x;
+    private JButton                              _zoom_out_y;
+    private JButton                              _decr_depth_collapse_level;
+    private JButton                              _incr_depth_collapse_level;
+    private JLabel                               _depth_collapse_label;
+    private JButton                              _decr_rank_collapse_level;
+    private JButton                              _incr_rank_collapse_level;
+    private JLabel                               _rank_collapse_label;
 
     ControlPanel( final MainPanel ap, final Configuration configuration ) {
         init();
@@ -166,7 +224,6 @@ final class ControlPanel extends JPanel implements ActionListener {
             setBorder( BorderFactory.createRaisedBevelBorder() );
         }
         setLayout( new GridLayout( 0, 1, 2, 2 ) );
-        _order_of_appearance = true;
         setupControls();
     }
 
@@ -176,6 +233,16 @@ final class ControlPanel extends JPanel implements ActionListener {
     @Override
     public void actionPerformed( final ActionEvent e ) {
         try {
+            if ( e.getSource() == _color_acc_sequence ) {
+                if ( _color_acc_species != null ) {
+                    _color_acc_species.setSelected( false );
+                }
+            }
+            else if ( e.getSource() == _color_acc_species ) {
+                if ( _color_acc_sequence != null ) {
+                    _color_acc_sequence.setSelected( false );
+                }
+            }
             final TreePanel tp = getMainPanel().getCurrentTreePanel();
             if ( tp == null ) {
                 return;
@@ -196,51 +263,50 @@ final class ControlPanel extends JPanel implements ActionListener {
                 }
                 displayedPhylogenyMightHaveChanged( true );
             }
-            else if ( e.getSource() == _color_according_to_annotation ) {
-                if ( ( _show_annotation != null ) && _color_according_to_annotation.isSelected() ) {
-                    _show_annotation.setSelected( true );
-                }
-                displayedPhylogenyMightHaveChanged( false );
-            }
-            else if ( e.getSource() == _show_annotation ) {
-                if ( ( _color_according_to_annotation != null ) && !_show_annotation.isSelected() ) {
-                    _color_according_to_annotation.setSelected( false );
-                }
-                displayedPhylogenyMightHaveChanged( false );
+            else if ( e.getSource() == _show_domain_architectures ) {
+                search0();
+                search1();
+                displayedPhylogenyMightHaveChanged( true );
             }
             else if ( ( tp != null ) && ( tp.getPhylogeny() != null ) ) {
-                if ( e.getSource() == getDisplayAsPhylogramCb() ) {
-                    setDrawPhylogram( getDisplayAsPhylogramCb().isSelected() );
+                if ( e.getSource() == getDisplayAsUnalignedPhylogramRb() ) {
+                    setTreeDisplayType( Options.PHYLOGENY_DISPLAY_TYPE.UNALIGNED_PHYLOGRAM );
+                    showWhole();
+                }
+                if ( e.getSource() == getDisplayAsAlignedPhylogramRb() ) {
+                    setTreeDisplayType( Options.PHYLOGENY_DISPLAY_TYPE.ALIGNED_PHYLOGRAM );
+                    showWhole();
+                }
+                if ( e.getSource() == getDisplayAsCladogramRb() ) {
+                    setTreeDisplayType( Options.PHYLOGENY_DISPLAY_TYPE.CLADOGRAM );
                     showWhole();
                 }
                 // Zoom buttons
                 else if ( e.getSource() == _zoom_in_x ) {
-                    zoomInX( Constants.BUTTON_ZOOM_IN_FACTOR, Constants.BUTTON_ZOOM_IN_X_CORRECTION_FACTOR );
+                    zoomInX( AptxConstants.BUTTON_ZOOM_IN_FACTOR, AptxConstants.BUTTON_ZOOM_IN_X_CORRECTION_FACTOR );
                     displayedPhylogenyMightHaveChanged( false );
                 }
                 else if ( e.getSource() == _zoom_in_y ) {
-                    zoomInY( Constants.BUTTON_ZOOM_IN_FACTOR );
+                    zoomInY( AptxConstants.BUTTON_ZOOM_IN_FACTOR );
                     displayedPhylogenyMightHaveChanged( false );
                 }
                 else if ( e.getSource() == _zoom_out_x ) {
-                    zoomOutX( Constants.BUTTON_ZOOM_OUT_FACTOR, Constants.BUTTON_ZOOM_OUT_X_CORRECTION_FACTOR );
+                    zoomOutX( AptxConstants.BUTTON_ZOOM_OUT_FACTOR, AptxConstants.BUTTON_ZOOM_OUT_X_CORRECTION_FACTOR );
                     displayedPhylogenyMightHaveChanged( false );
                 }
                 else if ( e.getSource() == _zoom_out_y ) {
-                    zoomOutY( Constants.BUTTON_ZOOM_OUT_FACTOR );
+                    zoomOutY( AptxConstants.BUTTON_ZOOM_OUT_FACTOR );
                     displayedPhylogenyMightHaveChanged( false );
                 }
                 else if ( e.getSource() == _show_whole ) {
+                    displayedPhylogenyMightHaveChanged( true );
                     showWhole();
                 }
                 else if ( e.getSource() == _return_to_super_tree ) {
-                    _mainpanel.getCurrentTreePanel().superTree();
-                    showWhole();
+                    returnedToSuperTreePressed();
                 }
                 else if ( e.getSource() == _order ) {
-                    tp.getPhylogeny().orderAppearance( _order_of_appearance );
-                    _order_of_appearance = !_order_of_appearance;
-                    displayedPhylogenyMightHaveChanged( false );
+                    orderPressed( tp );
                 }
                 else if ( e.getSource() == _uncollapse_all ) {
                     uncollapseAll( tp );
@@ -255,30 +321,894 @@ final class ControlPanel extends JPanel implements ActionListener {
                     displayedPhylogenyMightHaveChanged( true );
                 }
                 else if ( e.getSource() == _decr_domain_structure_evalue_thr ) {
-                    _mainpanel.getCurrentTreePanel().decreaseDomainStructureEvalueThreshold();
+                    _mainpanel.getCurrentTreePanel().decreaseDomainStructureEvalueThresholdExp();
+                    search0();
+                    search1();
                     displayedPhylogenyMightHaveChanged( true );
                 }
                 else if ( e.getSource() == _incr_domain_structure_evalue_thr ) {
-                    _mainpanel.getCurrentTreePanel().increaseDomainStructureEvalueThreshold();
+                    _mainpanel.getCurrentTreePanel().increaseDomainStructureEvalueThresholdExp();
+                    search0();
+                    search1();
+                    displayedPhylogenyMightHaveChanged( true );
+                }
+                else if ( e.getSource() == _search_tf_0 ) {
+                    search0();
+                    displayedPhylogenyMightHaveChanged( true );
+                }
+                else if ( e.getSource() == _search_tf_1 ) {
+                    search1();
+                    displayedPhylogenyMightHaveChanged( true );
+                }
+                else if ( ( _dynamically_hide_data != null ) && ( e.getSource() == _dynamically_hide_data )
+                        && !_dynamically_hide_data.isSelected() ) {
+                    setDynamicHidingIsOn( false );
+                    displayedPhylogenyMightHaveChanged( true );
+                }
+                else if ( ( e.getSource() == _decr_depth_collapse_level )
+                        || ( e.getSource() == _incr_depth_collapse_level ) ) {
+                    if ( e.getSource() == _decr_depth_collapse_level ) {
+                        _mainpanel.getCurrentTreePanel().decreaseDepthCollapseLevel();
+                    }
+                    else {
+                        _mainpanel.getCurrentTreePanel().increaseDepthCollapseLevel();
+                    }
+                    search0();
+                    search1();
+                    _mainpanel.getCurrentTreePanel().updateSetOfCollapsedExternalNodes();
+                    _mainpanel.getCurrentTreePanel().getPhylogeny().recalculateNumberOfExternalDescendants( true );
+                    _mainpanel.getCurrentTreePanel().resetNodeIdToDistToLeafMap();
+                    _mainpanel.getCurrentTreePanel().calculateLongestExtNodeInfo();
+                    _mainpanel.getCurrentTreePanel().setNodeInPreorderToNull();
+                    displayedPhylogenyMightHaveChanged( true );
+                    _mainpanel.getCurrentTreePanel().resetPreferredSize();
+                    _mainpanel.getCurrentTreePanel().updateOvSizes();
+                    _mainpanel.adjustJScrollPane();
+                    showWhole();
+                    repaint();
+                }
+                else if ( ( e.getSource() == _decr_rank_collapse_level )
+                        || ( e.getSource() == _incr_rank_collapse_level ) ) {
+                    if ( e.getSource() == _decr_rank_collapse_level ) {
+                        _mainpanel.getCurrentTreePanel().decreaseRankCollapseLevel();
+                    }
+                    else {
+                        _mainpanel.getCurrentTreePanel().increaseRankCollapseLevel();
+                    }
+                    search0();
+                    search1();
+                    _mainpanel.getCurrentTreePanel().updateSetOfCollapsedExternalNodes();
+                    _mainpanel.getCurrentTreePanel().getPhylogeny().recalculateNumberOfExternalDescendants( true );
+                    _mainpanel.getCurrentTreePanel().resetNodeIdToDistToLeafMap();
+                    _mainpanel.getCurrentTreePanel().calculateLongestExtNodeInfo();
+                    _mainpanel.getCurrentTreePanel().setNodeInPreorderToNull();
                     displayedPhylogenyMightHaveChanged( true );
+                    _mainpanel.getCurrentTreePanel().resetPreferredSize();
+                    _mainpanel.getCurrentTreePanel().updateOvSizes();
+                    _mainpanel.adjustJScrollPane();
+                    showWhole();
+                    repaint();
                 }
-                else if ( e.getSource() == _search_tf ) {
-                    search();
+                else {
                     displayedPhylogenyMightHaveChanged( true );
                 }
+            }
+            tp.requestFocus();
+            tp.requestFocusInWindow();
+            tp.requestFocus();
+        }
+        catch ( final Exception ex ) {
+            AptxUtil.unexpectedException( ex );
+        }
+        catch ( final Error err ) {
+            AptxUtil.unexpectedError( err );
+        }
+    }
+
+    void orderPressed( final TreePanel tp ) {
+        DESCENDANT_SORT_PRIORITY pri = DESCENDANT_SORT_PRIORITY.NODE_NAME;
+        if ( isShowTaxonomyScientificNames() || isShowTaxonomyCode() ) {
+            pri = DESCENDANT_SORT_PRIORITY.TAXONOMY;
+        }
+        else if ( isShowSeqNames() || isShowSeqSymbols() || isShowGeneNames() ) {
+            pri = DESCENDANT_SORT_PRIORITY.SEQUENCE;
+        }
+        PhylogenyMethods.orderAppearanceX( tp.getPhylogeny().getRoot(), true, pri );
+        tp.setNodeInPreorderToNull();
+        tp.getPhylogeny().externalNodesHaveChanged();
+        tp.getPhylogeny().clearHashIdToNodeMap();
+        tp.getPhylogeny().recalculateNumberOfExternalDescendants( true );
+        tp.resetNodeIdToDistToLeafMap();
+        tp.setEdited( true );
+        displayedPhylogenyMightHaveChanged( true );
+    }
+
+    void returnedToSuperTreePressed() {
+        if ( getCurrentTreePanel().isCurrentTreeIsSubtree() ) {
+            _mainpanel.getCurrentTreePanel().superTree();
+            showWhole();
+        }
+    }
+
+    public JCheckBox getColorAccSequenceCb() {
+        return _color_acc_sequence;
+    }
+
+    public JCheckBox getColorAccSpeciesCb() {
+        return _color_acc_species;
+    }
+
+    public JRadioButton getDisplayAsCladogramRb() {
+        return _display_as_cladogram_rb;
+    }
+
+    public JRadioButton getDisplayAsAlignedPhylogramRb() {
+        return _display_as_aligned_phylogram_rb;
+    }
+
+    public JRadioButton getDisplayAsUnalignedPhylogramRb() {
+        return _display_as_unaligned_phylogram_rb;
+    }
+
+    public JCheckBox getDynamicallyHideData() {
+        return _dynamically_hide_data;
+    }
+
+    public JCheckBox getNodeDescPopupCb() {
+        return _node_desc_popup_cb;
+    }
+
+    public Sequence getSelectedQuerySequence() {
+        return _selected_query_seq;
+    }
+
+    public JComboBox<String> getSequenceRelationBox() {
+        if ( _show_sequence_relations == null ) {
+            _show_sequence_relations = new JComboBox<String>();
+            _show_sequence_relations.setFocusable( false );
+            _show_sequence_relations.setMaximumRowCount( 20 );
+            _show_sequence_relations.setFont( ControlPanel.js_font );
+            if ( !_configuration.isUseNativeUI() ) {
+                _show_sequence_relations.setBackground( getConfiguration().getGuiButtonBackgroundColor() );
+                _show_sequence_relations.setForeground( getConfiguration().getGuiButtonTextColor() );
+            }
+            _show_sequence_relations.addItem( "-----" );
+            _show_sequence_relations.setToolTipText( "To display orthology information for selected query" );
+        }
+        return _show_sequence_relations;
+    }
+
+    /* GUILHEM_BEG */
+    public JComboBox<SEQUENCE_RELATION_TYPE> getSequenceRelationTypeBox() {
+        if ( _sequence_relation_type_box == null ) {
+            _sequence_relation_type_box = new JComboBox<SEQUENCE_RELATION_TYPE>();
+            for( final SequenceRelation.SEQUENCE_RELATION_TYPE type : SequenceRelation.SEQUENCE_RELATION_TYPE
+                    .values() ) {
+                _sequence_relation_type_box.addItem( type );
+            }
+            _sequence_relation_type_box.addActionListener( new ActionListener() {
+
+                @Override
+                public void actionPerformed( final ActionEvent e ) {
+                    if ( _mainpanel.getCurrentPhylogeny() != null ) {
+                        setSequenceRelationQueries( getMainPanel().getCurrentPhylogeny().getSequenceRelationQueries() );
+                    }
+                }
+            } );
+        }
+        return _sequence_relation_type_box;
+    }
+
+    public JCheckBox getShowEventsCb() {
+        return _show_events;
+    }
+
+    public JCheckBox getUseVisualStylesCb() {
+        return _use_visual_styles_cb;
+    }
+
+    public JCheckBox getWriteConfidenceCb() {
+        return _write_confidence;
+    }
+
+    public boolean isShowMolSequences() {
+        return ( ( _show_mol_seqs != null ) && _show_mol_seqs.isSelected() );
+    }
+
+    public boolean isShowProperties() {
+        return ( ( _show_properties_cb != null ) && _show_properties_cb.isSelected() );
+    }
+
+    public boolean isShowTaxonomyImages() {
+        return ( ( _show_taxo_images_cb != null ) && _show_taxo_images_cb.isSelected() );
+    }
+
+    public boolean isShowVectorData() {
+        return ( ( _show_vector_data_cb != null ) && _show_vector_data_cb.isSelected() );
+    }
+
+    public void setSequenceRelationQueries( final Collection<Sequence> sequenceRelationQueries ) {
+        final JComboBox<String> box = getSequenceRelationBox();
+        while ( box.getItemCount() > 1 ) {
+            box.removeItemAt( 1 );
+        }
+        final HashMap<String, Sequence> sequencesByName = new HashMap<String, Sequence>();
+        final SequenceRelation.SEQUENCE_RELATION_TYPE relationType = ( SequenceRelation.SEQUENCE_RELATION_TYPE ) _sequence_relation_type_box
+                .getSelectedItem();
+        if ( relationType == null ) {
+            return;
+        }
+        final ArrayList<String> sequenceNamesToAdd = new ArrayList<String>();
+        for( final Sequence seq : sequenceRelationQueries ) {
+            if ( seq.isHasSequenceRelations() ) {
+                boolean fFoundForCurrentType = false;
+                for( final SequenceRelation sq : seq.getSequenceRelations() ) {
+                    if ( sq.getType().equals( relationType ) ) {
+                        fFoundForCurrentType = true;
+                        break;
+                    }
+                }
+                if ( fFoundForCurrentType ) {
+                    sequenceNamesToAdd.add( seq.getName() );
+                    sequencesByName.put( seq.getName(), seq );
+                }
+            }
+        }
+        // sort sequences by name before adding them to the combo
+        final String[] sequenceNameArray = sequenceNamesToAdd.toArray( new String[ sequenceNamesToAdd.size() ] );
+        Arrays.sort( sequenceNameArray, String.CASE_INSENSITIVE_ORDER );
+        for( final String seqName : sequenceNameArray ) {
+            box.addItem( seqName );
+        }
+        for( final ItemListener oldItemListener : box.getItemListeners() ) {
+            box.removeItemListener( oldItemListener );
+        }
+        box.addItemListener( new ItemListener() {
+
+            @Override
+            public void itemStateChanged( final ItemEvent e ) {
+                _selected_query_seq = sequencesByName.get( e.getItem() );
+                _mainpanel.getCurrentTreePanel().repaint();
+            }
+        } );
+    }
+
+    private void addClickToOption( final int which, final String title ) {
+        _click_to_combobox.addItem( title );
+        _click_to_names.add( title );
+        _all_click_to_names.put( new Integer( which ), title );
+        if ( !_configuration.isUseNativeUI() ) {
+            _click_to_combobox.setBackground( getConfiguration().getGuiButtonBackgroundColor() );
+            _click_to_combobox.setForeground( getConfiguration().getGuiButtonTextColor() );
+        }
+    }
+
+    /* GUILHEM_BEG */
+    private void addSequenceRelationBlock() {
+        final JLabel spacer = new JLabel( "" );
+        spacer.setSize( 1, 1 );
+        add( spacer );
+        final JLabel mainLabel = new JLabel( "Sequence relations to display" );
+        final JLabel typeLabel = customizeLabel( new JLabel( "(type) " ), getConfiguration() );
+        typeLabel.setFont( ControlPanel.js_font.deriveFont( 7 ) );
+        getSequenceRelationTypeBox().setFocusable( false );
+        _sequence_relation_type_box.setFont( ControlPanel.js_font );
+        if ( !_configuration.isUseNativeUI() ) {
+            _sequence_relation_type_box.setBackground( getConfiguration().getGuiButtonBackgroundColor() );
+            _sequence_relation_type_box.setForeground( getConfiguration().getGuiButtonTextColor() );
+        }
+        _sequence_relation_type_box.setRenderer( new ListCellRenderer<Object>() {
+
+            @Override
+            public Component getListCellRendererComponent( final JList<?> list,
+                                                           final Object value,
+                                                           final int index,
+                                                           final boolean isSelected,
+                                                           final boolean cellHasFocus ) {
+                final Component component = new DefaultListCellRenderer()
+                        .getListCellRendererComponent( list, value, index, isSelected, cellHasFocus );
+                if ( ( value != null ) && ( value instanceof SequenceRelation.SEQUENCE_RELATION_TYPE ) ) {
+                    ( ( DefaultListCellRenderer ) component ).setText( SequenceRelation
+                            .getPrintableNameByType( ( SequenceRelation.SEQUENCE_RELATION_TYPE ) value ) );
+                }
+                return component;
+            }
+        } );
+        final GridBagLayout gbl = new GridBagLayout();
+        _sequence_relation_type_box.setMinimumSize( new Dimension( 115, 17 ) );
+        _sequence_relation_type_box.setPreferredSize( new Dimension( 115, 20 ) );
+        final JPanel horizGrid = new JPanel( gbl );
+        horizGrid.setBackground( getBackground() );
+        horizGrid.add( typeLabel );
+        horizGrid.add( _sequence_relation_type_box );
+        add( customizeLabel( mainLabel, getConfiguration() ) );
+        add( horizGrid );
+        add( getSequenceRelationBox() );
+        if ( _configuration.doDisplayOption( Configuration.show_relation_confidence ) ) {
+            addCheckbox( Configuration.show_relation_confidence,
+                         _configuration.getDisplayTitle( Configuration.show_relation_confidence ) );
+            setCheckbox( Configuration.show_relation_confidence,
+                         _configuration.doCheckOption( Configuration.show_relation_confidence ) );
+        }
+    }// addSequenceRelationBlock
+
+    /* GUILHEM_END */
+    private List<Options.PHYLOGENY_DISPLAY_TYPE> getTreeDisplayTypes() {
+        return _tree_display_types;
+    }
+
+    final private MainFrame getMainFrame() {
+        return getMainPanel().getMainFrame();
+    }
+
+    private void init() {
+        _tree_display_types = new ArrayList<Options.PHYLOGENY_DISPLAY_TYPE>();
+        setSpeciesColors( new HashMap<String, Color>() );
+        setSequenceColors( new HashMap<String, Color>() );
+        setAnnotationColors( new HashMap<String, Color>() );
+    }
+
+    private Options.PHYLOGENY_DISPLAY_TYPE getTreeDisplayType( final int index ) {
+        return getTreeDisplayTypes().get( index );
+    }
+
+    private void search0( final MainPanel main_panel, final Phylogeny tree, String query_str ) {
+        getSearchFoundCountsLabel0().setVisible( true );
+        getSearchResetButton0().setEnabled( true );
+        getSearchResetButton0().setVisible( true );
+        String[] queries = null;
+        Set<Long> nodes = null;
+        query_str = query_str.replaceAll( "\\s+", " " );
+        if ( ( query_str.indexOf( ',' ) >= 0 ) && !getOptions().isSearchWithRegex() ) {
+            queries = query_str.split( ",+" );
+        }
+        else {
+            queries = new String[ 1 ];
+            queries[ 0 ] = query_str.trim();
+        }
+        if ( ( queries != null ) && ( queries.length > 0 ) ) {
+            nodes = new HashSet<Long>();
+            for( String query : queries ) {
+                if ( ForesterUtil.isEmpty( query ) ) {
+                    continue;
+                }
+                query = query.trim();
+                final TreePanel tp = getMainPanel().getCurrentTreePanel();
+                if ( ( query.indexOf( '+' ) > 0 ) && !getOptions().isSearchWithRegex() ) {
+                    nodes.addAll( PhylogenyMethods.searchDataLogicalAnd( query.split( "\\++" ),
+                                                                         tree,
+                                                                         getOptions().isSearchCaseSensitive(),
+                                                                         !getOptions().isMatchWholeTermsOnly(),
+                                                                         isShowDomainArchitectures(),
+                                                                         tp != null
+                                                                                 ? Math.pow( 10,
+                                                                                             tp.getDomainStructureEvalueThresholdExp() )
+                                                                                 : 0 ) );
+                }
+                else {
+                    nodes.addAll( PhylogenyMethods
+                            .searchData( query,
+                                         tree,
+                                         getOptions().isSearchCaseSensitive(),
+                                         !getOptions().isMatchWholeTermsOnly(),
+                                         getOptions().isSearchWithRegex(),
+                                         isShowDomainArchitectures(),
+                                         tp != null ? Math.pow( 10, tp.getDomainStructureEvalueThresholdExp() ) : 0 ) );
+                }
+            }
+            if ( getOptions().isInverseSearchResult() ) {
+                final List<PhylogenyNode> all = PhylogenyMethods.obtainAllNodesAsList( tree );
+                final Set<Long> temp_nodes = nodes;
+                nodes = new HashSet<Long>();
+                for( final PhylogenyNode n : all ) {
+                    if ( ( !temp_nodes.contains( n.getId() ) ) && n.isHasNodeData() ) {
+                        nodes.add( n.getId() );
+                    }
+                }
+            }
+        }
+        if ( ( nodes != null ) && ( nodes.size() > 0 ) ) {
+            main_panel.getCurrentTreePanel().setFoundNodes0( new HashSet<Long>() );
+            for( final Long node : nodes ) {
+                main_panel.getCurrentTreePanel().getFoundNodes0().add( node );
+            }
+            setSearchFoundCountsOnLabel0( nodes.size() );
+        }
+        else {
+            setSearchFoundCountsOnLabel0( 0 );
+            searchReset0();
+        }
+    }
+
+    private void search1( final MainPanel main_panel, final Phylogeny tree, String query_str ) {
+        getSearchFoundCountsLabel1().setVisible( true );
+        getSearchResetButton1().setEnabled( true );
+        getSearchResetButton1().setVisible( true );
+        String[] queries = null;
+        Set<Long> nodes = null;
+        query_str = query_str.replaceAll( "\\s+", " " );
+        if ( ( query_str.indexOf( ',' ) >= 0 ) && !getOptions().isSearchWithRegex() ) {
+            queries = query_str.split( ",+" );
+        }
+        else {
+            queries = new String[ 1 ];
+            queries[ 0 ] = query_str.trim();
+        }
+        if ( ( queries != null ) && ( queries.length > 0 ) ) {
+            nodes = new HashSet<Long>();
+            for( String query : queries ) {
+                if ( ForesterUtil.isEmpty( query ) ) {
+                    continue;
+                }
+                query = query.trim();
+                final TreePanel tp = getMainPanel().getCurrentTreePanel();
+                if ( ( query.indexOf( '+' ) > 0 ) && !getOptions().isSearchWithRegex() ) {
+                    nodes.addAll( PhylogenyMethods.searchDataLogicalAnd( query.split( "\\++" ),
+                                                                         tree,
+                                                                         getOptions().isSearchCaseSensitive(),
+                                                                         !getOptions().isMatchWholeTermsOnly(),
+                                                                         isShowDomainArchitectures(),
+                                                                         tp != null
+                                                                                 ? Math.pow( 10,
+                                                                                             tp.getDomainStructureEvalueThresholdExp() )
+                                                                                 : 0 ) );
+                }
+                else {
+                    nodes.addAll( PhylogenyMethods
+                            .searchData( query,
+                                         tree,
+                                         getOptions().isSearchCaseSensitive(),
+                                         !getOptions().isMatchWholeTermsOnly(),
+                                         getOptions().isSearchWithRegex(),
+                                         isShowDomainArchitectures(),
+                                         tp != null ? Math.pow( 10, tp.getDomainStructureEvalueThresholdExp() ) : 0 ) );
+                }
+            }
+            if ( getOptions().isInverseSearchResult() ) {
+                final List<PhylogenyNode> all = PhylogenyMethods.obtainAllNodesAsList( tree );
+                final Set<Long> temp_nodes = nodes;
+                nodes = new HashSet<Long>();
+                for( final PhylogenyNode n : all ) {
+                    if ( ( !temp_nodes.contains( n.getId() ) ) && n.isHasNodeData() ) {
+                        nodes.add( n.getId() );
+                    }
+                }
+            }
+        }
+        if ( ( nodes != null ) && ( nodes.size() > 0 ) ) {
+            main_panel.getCurrentTreePanel().setFoundNodes1( new HashSet<Long>() );
+            for( final Long node : nodes ) {
+                main_panel.getCurrentTreePanel().getFoundNodes1().add( node );
+            }
+            setSearchFoundCountsOnLabel1( nodes.size() );
+        }
+        else {
+            setSearchFoundCountsOnLabel1( 0 );
+            searchReset1();
+        }
+    }
+
+    private void setTreeDisplayType( final int index, final Options.PHYLOGENY_DISPLAY_TYPE t ) {
+        getTreeDisplayTypes().set( index, t );
+    }
+
+    private void setupClickToOptions() {
+        final int default_option = _configuration.getDefaultDisplayClicktoOption();
+        int selected_index = 0;
+        int cb_index = 0;
+        if ( _configuration.doDisplayClickToOption( Configuration.display_node_data ) ) {
+            _show_data_item = cb_index;
+            addClickToOption( Configuration.display_node_data,
+                              _configuration.getClickToTitle( Configuration.display_node_data ) );
+            if ( default_option == Configuration.display_node_data ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.collapse_uncollapse ) ) {
+            _collapse_cb_item = cb_index;
+            addClickToOption( Configuration.collapse_uncollapse,
+                              _configuration.getClickToTitle( Configuration.collapse_uncollapse ) );
+            if ( default_option == Configuration.collapse_uncollapse ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.uncollapse_all ) ) {
+            _uncollapse_all_cb_item = cb_index;
+            addClickToOption( Configuration.uncollapse_all,
+                              _configuration.getClickToTitle( Configuration.uncollapse_all ) );
+            if ( default_option == Configuration.uncollapse_all ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.reroot ) ) {
+            _reroot_cb_item = cb_index;
+            addClickToOption( Configuration.reroot, _configuration.getClickToTitle( Configuration.reroot ) );
+            if ( default_option == Configuration.reroot ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.subtree ) ) {
+            _subtree_cb_item = cb_index;
+            addClickToOption( Configuration.subtree, _configuration.getClickToTitle( Configuration.subtree ) );
+            if ( default_option == Configuration.subtree ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.swap ) ) {
+            _swap_cb_item = cb_index;
+            addClickToOption( Configuration.swap, _configuration.getClickToTitle( Configuration.swap ) );
+            if ( default_option == Configuration.swap ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.order_subtree ) ) {
+            _order_subtree_cb_item = cb_index;
+            addClickToOption( Configuration.order_subtree,
+                              _configuration.getClickToTitle( Configuration.order_subtree ) );
+            if ( default_option == Configuration.order_subtree ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.sort_descendents ) ) {
+            _sort_descendents_item = cb_index;
+            addClickToOption( Configuration.sort_descendents,
+                              _configuration.getClickToTitle( Configuration.sort_descendents ) );
+            if ( default_option == Configuration.sort_descendents ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.color_node_font ) ) {
+            _color_node_font_item = cb_index;
+            addClickToOption( Configuration.color_node_font,
+                              _configuration.getClickToTitle( Configuration.color_node_font ) );
+            if ( default_option == Configuration.color_node_font ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.change_node_font ) ) {
+            _change_node_font_item = cb_index;
+            addClickToOption( Configuration.change_node_font,
+                              _configuration.getClickToTitle( Configuration.change_node_font ) );
+            if ( default_option == Configuration.change_node_font ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.color_subtree ) ) {
+            _color_subtree_cb_item = cb_index;
+            addClickToOption( Configuration.color_subtree,
+                              _configuration.getClickToTitle( Configuration.color_subtree ) );
+            if ( default_option == Configuration.color_subtree ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.open_seq_web ) ) {
+            _open_seq_web_item = cb_index;
+            addClickToOption( Configuration.open_seq_web,
+                              _configuration.getClickToTitle( Configuration.open_seq_web ) );
+            if ( default_option == Configuration.open_seq_web ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.open_pdb_web ) ) {
+            _open_pdb_item = cb_index;
+            addClickToOption( Configuration.open_pdb_web,
+                              _configuration.getClickToTitle( Configuration.open_pdb_web ) );
+            if ( default_option == Configuration.open_pdb_web ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.open_tax_web ) ) {
+            _open_tax_web_item = cb_index;
+            addClickToOption( Configuration.open_tax_web,
+                              _configuration.getClickToTitle( Configuration.open_tax_web ) );
+            if ( default_option == Configuration.open_tax_web ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.blast ) ) {
+            _blast_item = cb_index;
+            addClickToOption( Configuration.blast, _configuration.getClickToTitle( Configuration.blast ) );
+            if ( default_option == Configuration.blast ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.select_nodes ) ) {
+            _select_nodes_item = cb_index;
+            addClickToOption( Configuration.select_nodes,
+                              _configuration.getClickToTitle( Configuration.select_nodes ) );
+            if ( default_option == Configuration.select_nodes ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( _configuration.doDisplayClickToOption( Configuration.get_ext_desc_data ) ) {
+            _get_ext_desc_data = cb_index;
+            if ( !ForesterUtil.isEmpty( getConfiguration().getLabelForGetExtDescendentsData() ) ) {
+                addClickToOption( Configuration.get_ext_desc_data,
+                                  getConfiguration().getLabelForGetExtDescendentsData() );
+            }
+            else {
+                addClickToOption( Configuration.get_ext_desc_data,
+                                  getConfiguration().getClickToTitle( Configuration.get_ext_desc_data ) );
+            }
+            if ( default_option == Configuration.get_ext_desc_data ) {
+                selected_index = cb_index;
+            }
+            cb_index++;
+        }
+        if ( getOptions().isEditable() ) {
+            if ( _configuration.doDisplayClickToOption( Configuration.cut_subtree ) ) {
+                _cut_subtree_item = cb_index;
+                addClickToOption( Configuration.cut_subtree,
+                                  _configuration.getClickToTitle( Configuration.cut_subtree ) );
+                if ( default_option == Configuration.cut_subtree ) {
+                    selected_index = cb_index;
+                }
+                cb_index++;
+            }
+            if ( _configuration.doDisplayClickToOption( Configuration.copy_subtree ) ) {
+                _copy_subtree_item = cb_index;
+                addClickToOption( Configuration.copy_subtree,
+                                  _configuration.getClickToTitle( Configuration.copy_subtree ) );
+                if ( default_option == Configuration.copy_subtree ) {
+                    selected_index = cb_index;
+                }
+                cb_index++;
+            }
+            if ( _configuration.doDisplayClickToOption( Configuration.paste_subtree ) ) {
+                _paste_subtree_item = cb_index;
+                addClickToOption( Configuration.paste_subtree,
+                                  _configuration.getClickToTitle( Configuration.paste_subtree ) );
+                if ( default_option == Configuration.paste_subtree ) {
+                    selected_index = cb_index;
+                }
+                cb_index++;
+            }
+            if ( _configuration.doDisplayClickToOption( Configuration.delete_subtree_or_node ) ) {
+                _delete_node_or_subtree_item = cb_index;
+                addClickToOption( Configuration.delete_subtree_or_node,
+                                  _configuration.getClickToTitle( Configuration.delete_subtree_or_node ) );
+                if ( default_option == Configuration.delete_subtree_or_node ) {
+                    selected_index = cb_index;
+                }
+                cb_index++;
+            }
+            if ( _configuration.doDisplayClickToOption( Configuration.add_new_node ) ) {
+                _add_new_node_item = cb_index;
+                addClickToOption( Configuration.add_new_node,
+                                  _configuration.getClickToTitle( Configuration.add_new_node ) );
+                if ( default_option == Configuration.add_new_node ) {
+                    selected_index = cb_index;
+                }
+                cb_index++;
+            }
+            if ( _configuration.doDisplayClickToOption( Configuration.edit_node_data ) ) {
+                _edit_node_data_item = cb_index;
+                addClickToOption( Configuration.edit_node_data,
+                                  _configuration.getClickToTitle( Configuration.edit_node_data ) );
+                if ( default_option == Configuration.edit_node_data ) {
+                    selected_index = cb_index;
+                }
+                cb_index++;
+            }
+        }
+        // Set default selection and its action
+        _click_to_combobox.setSelectedIndex( selected_index );
+        setClickToAction( selected_index );
+    }
+
+    private void setupDisplayCheckboxes() {
+        if ( _configuration.doDisplayOption( Configuration.dynamically_hide_data ) ) {
+            addCheckbox( Configuration.dynamically_hide_data,
+                         _configuration.getDisplayTitle( Configuration.dynamically_hide_data ) );
+            setCheckbox( Configuration.dynamically_hide_data,
+                         _configuration.doCheckOption( Configuration.dynamically_hide_data ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.node_data_popup ) ) {
+            addCheckbox( Configuration.node_data_popup,
+                         _configuration.getDisplayTitle( Configuration.node_data_popup ) );
+            setCheckbox( Configuration.node_data_popup, _configuration.doCheckOption( Configuration.node_data_popup ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.display_internal_data ) ) {
+            addCheckbox( Configuration.display_internal_data,
+                         _configuration.getDisplayTitle( Configuration.display_internal_data ) );
+            setCheckbox( Configuration.display_internal_data,
+                         _configuration.doCheckOption( Configuration.display_internal_data ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.display_external_data ) ) {
+            addCheckbox( Configuration.display_external_data,
+                         _configuration.getDisplayTitle( Configuration.display_external_data ) );
+            setCheckbox( Configuration.display_external_data,
+                         _configuration.doCheckOption( Configuration.display_external_data ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.color_according_to_sequence ) ) {
+            addCheckbox( Configuration.color_according_to_sequence,
+                         _configuration.getDisplayTitle( Configuration.color_according_to_sequence ) );
+            setCheckbox( Configuration.color_according_to_sequence,
+                         _configuration.doCheckOption( Configuration.color_according_to_sequence ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.color_according_to_species ) ) {
+            addCheckbox( Configuration.color_according_to_species,
+                         _configuration.getDisplayTitle( Configuration.color_according_to_species ) );
+            setCheckbox( Configuration.color_according_to_species,
+                         _configuration.doCheckOption( Configuration.color_according_to_species ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.color_according_to_annotation ) ) {
+            addCheckbox( Configuration.color_according_to_annotation,
+                         _configuration.getDisplayTitle( Configuration.color_according_to_annotation ) );
+            setCheckbox( Configuration.color_according_to_annotation,
+                         _configuration.doCheckOption( Configuration.color_according_to_annotation ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.use_style ) ) {
+            addCheckbox( Configuration.use_style, _configuration.getDisplayTitle( Configuration.use_style ) );
+            setCheckbox( Configuration.use_style, _configuration.doCheckOption( Configuration.use_style ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.width_branches ) ) {
+            addCheckbox( Configuration.width_branches, _configuration.getDisplayTitle( Configuration.width_branches ) );
+            setCheckbox( Configuration.width_branches, _configuration.doCheckOption( Configuration.width_branches ) );
+        }
+        final JLabel label = new JLabel( "Display Data:" );
+        label.setFont( ControlPanel.jcb_bold_font );
+        if ( !getConfiguration().isUseNativeUI() ) {
+            label.setForeground( getConfiguration().getGuiCheckboxTextColor() );
+        }
+        add( label );
+        if ( _configuration.doDisplayOption( Configuration.show_node_names ) ) {
+            addCheckbox( Configuration.show_node_names,
+                         _configuration.getDisplayTitle( Configuration.show_node_names ) );
+            setCheckbox( Configuration.show_node_names, _configuration.doCheckOption( Configuration.show_node_names ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_tax_code ) ) {
+            addCheckbox( Configuration.show_tax_code, _configuration.getDisplayTitle( Configuration.show_tax_code ) );
+            setCheckbox( Configuration.show_tax_code, _configuration.doCheckOption( Configuration.show_tax_code ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_taxonomy_scientific_names ) ) {
+            addCheckbox( Configuration.show_taxonomy_scientific_names,
+                         _configuration.getDisplayTitle( Configuration.show_taxonomy_scientific_names ) );
+            setCheckbox( Configuration.show_taxonomy_scientific_names,
+                         _configuration.doCheckOption( Configuration.show_taxonomy_scientific_names ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_taxonomy_common_names ) ) {
+            addCheckbox( Configuration.show_taxonomy_common_names,
+                         _configuration.getDisplayTitle( Configuration.show_taxonomy_common_names ) );
+            setCheckbox( Configuration.show_taxonomy_common_names,
+                         _configuration.doCheckOption( Configuration.show_taxonomy_common_names ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_tax_rank ) ) {
+            addCheckbox( Configuration.show_tax_rank, _configuration.getDisplayTitle( Configuration.show_tax_rank ) );
+            setCheckbox( Configuration.show_tax_rank, _configuration.doCheckOption( Configuration.show_tax_rank ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_seq_names ) ) {
+            addCheckbox( Configuration.show_seq_names, _configuration.getDisplayTitle( Configuration.show_seq_names ) );
+            setCheckbox( Configuration.show_seq_names, _configuration.doCheckOption( Configuration.show_seq_names ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_gene_names ) ) {
+            addCheckbox( Configuration.show_gene_names,
+                         _configuration.getDisplayTitle( Configuration.show_gene_names ) );
+            setCheckbox( Configuration.show_gene_names, _configuration.doCheckOption( Configuration.show_gene_names ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_seq_symbols ) ) {
+            addCheckbox( Configuration.show_seq_symbols,
+                         _configuration.getDisplayTitle( Configuration.show_seq_symbols ) );
+            setCheckbox( Configuration.show_seq_symbols,
+                         _configuration.doCheckOption( Configuration.show_seq_symbols ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_sequence_acc ) ) {
+            addCheckbox( Configuration.show_sequence_acc,
+                         _configuration.getDisplayTitle( Configuration.show_sequence_acc ) );
+            setCheckbox( Configuration.show_sequence_acc,
+                         _configuration.doCheckOption( Configuration.show_sequence_acc ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_annotation ) ) {
+            addCheckbox( Configuration.show_annotation,
+                         _configuration.getDisplayTitle( Configuration.show_annotation ) );
+            setCheckbox( Configuration.show_annotation, _configuration.doCheckOption( Configuration.show_annotation ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.write_confidence_values ) ) {
+            addCheckbox( Configuration.write_confidence_values,
+                         _configuration.getDisplayTitle( Configuration.write_confidence_values ) );
+            setCheckbox( Configuration.write_confidence_values,
+                         _configuration.doCheckOption( Configuration.write_confidence_values ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.write_branch_length_values ) ) {
+            addCheckbox( Configuration.write_branch_length_values,
+                         _configuration.getDisplayTitle( Configuration.write_branch_length_values ) );
+            setCheckbox( Configuration.write_branch_length_values,
+                         _configuration.doCheckOption( Configuration.write_branch_length_values ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_binary_characters ) ) {
+            addCheckbox( Configuration.show_binary_characters,
+                         _configuration.getDisplayTitle( Configuration.show_binary_characters ) );
+            setCheckbox( Configuration.show_binary_characters,
+                         _configuration.doCheckOption( Configuration.show_binary_characters ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_binary_character_counts ) ) {
+            addCheckbox( Configuration.show_binary_character_counts,
+                         _configuration.getDisplayTitle( Configuration.show_binary_character_counts ) );
+            setCheckbox( Configuration.show_binary_character_counts,
+                         _configuration.doCheckOption( Configuration.show_binary_character_counts ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_domain_architectures ) ) {
+            addCheckbox( Configuration.show_domain_architectures,
+                         _configuration.getDisplayTitle( Configuration.show_domain_architectures ) );
+            setCheckbox( Configuration.show_domain_architectures,
+                         _configuration.doCheckOption( Configuration.show_domain_architectures ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_mol_seqs ) ) {
+            addCheckbox( Configuration.show_mol_seqs, _configuration.getDisplayTitle( Configuration.show_mol_seqs ) );
+            setCheckbox( Configuration.show_mol_seqs, _configuration.doCheckOption( Configuration.show_mol_seqs ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.write_events ) ) {
+            addCheckbox( Configuration.write_events, _configuration.getDisplayTitle( Configuration.write_events ) );
+            setCheckbox( Configuration.write_events, _configuration.doCheckOption( Configuration.write_events ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_vector_data ) ) {
+            addCheckbox( Configuration.show_vector_data,
+                         _configuration.getDisplayTitle( Configuration.show_vector_data ) );
+            setCheckbox( Configuration.show_vector_data,
+                         _configuration.doCheckOption( Configuration.show_vector_data ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_properties ) ) {
+            addCheckbox( Configuration.show_properties,
+                         _configuration.getDisplayTitle( Configuration.show_properties ) );
+            setCheckbox( Configuration.show_properties, _configuration.doCheckOption( Configuration.show_properties ) );
+        }
+        if ( _configuration.doDisplayOption( Configuration.show_taxonomy_images ) ) {
+            addCheckbox( Configuration.show_taxonomy_images,
+                         _configuration.getDisplayTitle( Configuration.show_taxonomy_images ) );
+            setCheckbox( Configuration.show_taxonomy_images,
+                         _configuration.doCheckOption( Configuration.show_taxonomy_images ) );
+        }
+    }
+
+    private void setVisibilityOfDomainStrucureControls() {
+        if ( _zoom_in_domain_structure != null ) {
+            final MainFrame mf = getMainFrame();
+            if ( mf != null ) {
+                if ( isShowDomainArchitectures() ) {
+                    _domain_display_label.setVisible( true );
+                    _zoom_in_domain_structure.setVisible( true );
+                    _zoom_out_domain_structure.setVisible( true );
+                    _decr_domain_structure_evalue_thr.setVisible( true );
+                    _incr_domain_structure_evalue_thr.setVisible( true );
+                    _domain_structure_evalue_thr_tf.setVisible( true );
+                    if ( mf._right_line_up_domains_cbmi != null ) {
+                        mf._right_line_up_domains_cbmi.setVisible( true );
+                    }
+                    if ( mf._show_domain_labels != null ) {
+                        mf._show_domain_labels.setVisible( true );
+                    }
+                }
                 else {
-                    displayedPhylogenyMightHaveChanged( true );
+                    _domain_display_label.setVisible( false );
+                    _zoom_in_domain_structure.setVisible( false );
+                    _zoom_out_domain_structure.setVisible( false );
+                    _decr_domain_structure_evalue_thr.setVisible( false );
+                    _incr_domain_structure_evalue_thr.setVisible( false );
+                    _domain_structure_evalue_thr_tf.setVisible( false );
+                    if ( mf._right_line_up_domains_cbmi != null ) {
+                        mf._right_line_up_domains_cbmi.setVisible( false );
+                    }
+                    if ( mf._show_domain_labels != null ) {
+                        mf._show_domain_labels.setVisible( false );
+                    }
                 }
             }
-            tp.requestFocus();
-            tp.requestFocusInWindow();
-            tp.requestFocus();
-        }
-        catch ( final Exception ex ) {
-            Util.unexpectedException( ex );
-        }
-        catch ( final Error err ) {
-            Util.unexpectedError( err );
         }
     }
 
@@ -294,6 +1224,11 @@ final class ControlPanel extends JPanel implements ActionListener {
         _return_to_super_tree.setEnabled( true );
     }
 
+    void activateButtonToUncollapseAll() {
+        _uncollapse_all.setForeground( getConfiguration().getGuiCheckboxAndButtonActiveColor() );
+        _uncollapse_all.setEnabled( true );
+    }
+
     /**
      * Add zoom and quick edit buttons. (Last modified 8/9/04)
      */
@@ -304,10 +1239,12 @@ final class ControlPanel extends JPanel implements ActionListener {
         final JPanel x_panel = new JPanel( new GridLayout( 1, 1, 0, 0 ) );
         final JPanel y_panel = new JPanel( new GridLayout( 1, 3, 0, 0 ) );
         final JPanel z_panel = new JPanel( new GridLayout( 1, 1, 0, 0 ) );
+        final JPanel o_panel = new JPanel( new GridLayout( 1, 3, 0, 0 ) );
         if ( !getConfiguration().isUseNativeUI() ) {
             x_panel.setBackground( getBackground() );
             y_panel.setBackground( getBackground() );
             z_panel.setBackground( getBackground() );
+            o_panel.setBackground( getBackground() );
         }
         add( _zoom_label = new JLabel( "Zoom:" ) );
         customizeLabel( _zoom_label, getConfiguration() );
@@ -315,22 +1252,22 @@ final class ControlPanel extends JPanel implements ActionListener {
         add( y_panel );
         add( z_panel );
         if ( getConfiguration().isUseNativeUI() ) {
-            _zoom_in_x = new JButton( "+" );
-            _zoom_out_x = new JButton( "-" );
+            _zoom_in_x = new TypomaticJButton( "+" );
+            _zoom_out_x = new TypomaticJButton( "-" );
         }
         else {
-            _zoom_in_x = new JButton( "X+" );
-            _zoom_out_x = new JButton( "X-" );
+            _zoom_in_x = new TypomaticJButton( "X+" );
+            _zoom_out_x = new TypomaticJButton( "X-" );
         }
-        _zoom_in_y = new JButton( "Y+" );
-        _zoom_out_y = new JButton( "Y-" );
+        _zoom_in_y = new TypomaticJButton( "Y+" );
+        _zoom_out_y = new TypomaticJButton( "Y-" );
         _show_whole = new JButton( "F" );
-        _show_whole.setToolTipText( "To fit the complete phylogeny to the current display size [Backspace]" );
-        _zoom_in_x.setToolTipText( "To zoom in horizontally [Shift+Right]" );
-        _zoom_in_y.setToolTipText( "To zoom in vertically [Shift+Up]" );
-        _zoom_out_x.setToolTipText( "To zoom out horizontally [Shift+Left]" );
-        _zoom_out_y.setToolTipText( "To zoom out vertically [Shift+Down]" );
-        if ( getConfiguration().isUseNativeUI() && Util.isMac() ) {
+        _show_whole.setToolTipText( "fit and center tree display [Alt+C, Home, or Esc]" );
+        _zoom_in_x.setToolTipText( "zoom in horizontally [Alt+Right or Shift+Alt+mousewheel]" );
+        _zoom_in_y.setToolTipText( "zoom in vertically [Alt+Up or Shift+mousewheel]" );
+        _zoom_out_x.setToolTipText( "zoom out horizontally [Alt+Left or Shift+Alt+mousewheel]" );
+        _zoom_out_y.setToolTipText( "zoom out vertically [Alt+Down or Shift+mousewheel]" );
+        if ( getConfiguration().isUseNativeUI() && ForesterUtil.isMac() ) {
             _zoom_out_x.setPreferredSize( new Dimension( 55, 10 ) );
             _zoom_in_x.setPreferredSize( new Dimension( 55, 10 ) );
         }
@@ -342,22 +1279,32 @@ final class ControlPanel extends JPanel implements ActionListener {
         _zoom_in_y.setPreferredSize( new Dimension( 10, 10 ) );
         _show_whole.setPreferredSize( new Dimension( 10, 10 ) );
         _return_to_super_tree = new JButton( RETURN_TO_SUPER_TREE_TEXT );
+        _return_to_super_tree.setToolTipText( "return to the super-tree (if in sub-tree) [Alt+R]" );
         _return_to_super_tree.setEnabled( false );
-        _order = new JButton( "Order Subtrees" );
-        _uncollapse_all = new JButton( "Uncollapse All" );
+        _order = new JButton( "O" );
+        _order.setToolTipText( "order all [Alt+O]" );
+        _uncollapse_all = new JButton( "U" );
+        _uncollapse_all.setToolTipText( "uncollapse all [Alt+U]" );
         addJButton( _zoom_in_y, x_panel );
         addJButton( _zoom_out_x, y_panel );
         addJButton( _show_whole, y_panel );
         addJButton( _zoom_in_x, y_panel );
         addJButton( _zoom_out_y, z_panel );
+        final JLabel spacer2 = new JLabel( "" );
+        add( spacer2 );
+        add( o_panel );
+        addJButton( _order, o_panel );
+        addJButton( _return_to_super_tree, o_panel );
+        addJButton( _uncollapse_all, o_panel );
         if ( getConfiguration().doDisplayOption( Configuration.show_domain_architectures ) ) {
             setUpControlsForDomainStrucures();
         }
-        final JLabel spacer2 = new JLabel( "" );
-        add( spacer2 );
-        addJButton( _return_to_super_tree, this );
-        addJButton( _order, this );
-        addJButton( _uncollapse_all, this );
+        if ( true ) {
+            setUpControlsForDepthCollapse();
+        }
+        if ( true ) {
+            setUpControlsForRankCollapse();
+        }
         final JLabel spacer3 = new JLabel( "" );
         add( spacer3 );
         setVisibilityOfDomainStrucureControls();
@@ -366,25 +1313,30 @@ final class ControlPanel extends JPanel implements ActionListener {
     void addCheckbox( final int which, final String title ) {
         final JPanel ch_panel = new JPanel( new BorderLayout( 0, 0 ) );
         switch ( which ) {
-            case Configuration.display_as_phylogram:
-                _display_as_phylogram_cb = new JCheckBox( title );
-                getDisplayAsPhylogramCb().setToolTipText( "To switch between phylogram and cladogram display" );
-                addJCheckBox( getDisplayAsPhylogramCb(), ch_panel );
-                add( ch_panel );
-                break;
             case Configuration.display_internal_data:
                 _display_internal_data = new JCheckBox( title );
                 _display_internal_data.setToolTipText( "To allow or disallow display of internal labels" );
                 addJCheckBox( _display_internal_data, ch_panel );
                 add( ch_panel );
                 break;
+            case Configuration.display_external_data:
+                _display_external_data = new JCheckBox( title );
+                _display_external_data.setToolTipText( "To allow or disallow display of external labels" );
+                addJCheckBox( _display_external_data, ch_panel );
+                add( ch_panel );
+                break;
             case Configuration.color_according_to_species:
                 _color_acc_species = new JCheckBox( title );
-                _color_acc_species
-                        .setToolTipText( "To colorize taxonomy and sequence labels as a function of taxonomy" );
+                _color_acc_species.setToolTipText( "To colorize node labels as a function of taxonomy" );
                 addJCheckBox( _color_acc_species, ch_panel );
                 add( ch_panel );
                 break;
+            case Configuration.color_according_to_sequence:
+                _color_acc_sequence = new JCheckBox( title );
+                _color_acc_sequence.setToolTipText( "To colorize node labels as a function of sequence name" );
+                addJCheckBox( _color_acc_sequence, ch_panel );
+                add( ch_panel );
+                break;
             case Configuration.color_according_to_annotation:
                 _color_according_to_annotation = new JCheckBox( title );
                 _color_according_to_annotation
@@ -397,11 +1349,6 @@ final class ControlPanel extends JPanel implements ActionListener {
                 addJCheckBox( _show_node_names, ch_panel );
                 add( ch_panel );
                 break;
-            case Configuration.show_tax_code:
-                _show_taxo_code = new JCheckBox( title );
-                addJCheckBox( _show_taxo_code, ch_panel );
-                add( ch_panel );
-                break;
             case Configuration.show_taxonomy_scientific_names:
                 _show_taxo_scientific_names = new JCheckBox( title );
                 addJCheckBox( _show_taxo_scientific_names, ch_panel );
@@ -412,6 +1359,16 @@ final class ControlPanel extends JPanel implements ActionListener {
                 addJCheckBox( _show_taxo_common_names, ch_panel );
                 add( ch_panel );
                 break;
+            case Configuration.show_tax_code:
+                _show_taxo_code = new JCheckBox( title );
+                addJCheckBox( _show_taxo_code, ch_panel );
+                add( ch_panel );
+                break;
+            case Configuration.show_tax_rank:
+                _show_taxo_rank = new JCheckBox( title );
+                addJCheckBox( _show_taxo_rank, ch_panel );
+                add( ch_panel );
+                break;
             case Configuration.show_taxonomy_images:
                 _show_taxo_images_cb = new JCheckBox( title );
                 addJCheckBox( _show_taxo_images_cb, ch_panel );
@@ -442,10 +1399,11 @@ final class ControlPanel extends JPanel implements ActionListener {
                 addJCheckBox( getShowEventsCb(), ch_panel );
                 add( ch_panel );
                 break;
-            case Configuration.color_branches:
-                _color_branches_cb = new JCheckBox( title );
-                getColorBranchesCb().setToolTipText( "To use branch color values, if present" );
-                addJCheckBox( getColorBranchesCb(), ch_panel );
+            case Configuration.use_style:
+                _use_visual_styles_cb = new JCheckBox( title );
+                getUseVisualStylesCb()
+                        .setToolTipText( "To use visual styles (node colors, fonts) and branch colors, if present" );
+                addJCheckBox( getUseVisualStylesCb(), ch_panel );
                 add( ch_panel );
                 break;
             case Configuration.width_branches:
@@ -454,19 +1412,34 @@ final class ControlPanel extends JPanel implements ActionListener {
                 addJCheckBox( _width_branches, ch_panel );
                 add( ch_panel );
                 break;
+            case Configuration.write_branch_length_values:
+                _write_branch_length_values = new JCheckBox( title );
+                addJCheckBox( _write_branch_length_values, ch_panel );
+                add( ch_panel );
+                break;
             case Configuration.show_domain_architectures:
                 _show_domain_architectures = new JCheckBox( title );
                 addJCheckBox( _show_domain_architectures, ch_panel );
                 add( ch_panel );
                 break;
+            case Configuration.show_mol_seqs:
+                _show_mol_seqs = new JCheckBox( title );
+                addJCheckBox( _show_mol_seqs, ch_panel );
+                add( ch_panel );
+                break;
+            case Configuration.show_seq_names:
+                _show_seq_names = new JCheckBox( title );
+                addJCheckBox( _show_seq_names, ch_panel );
+                add( ch_panel );
+                break;
             case Configuration.show_gene_names:
                 _show_gene_names = new JCheckBox( title );
                 addJCheckBox( _show_gene_names, ch_panel );
                 add( ch_panel );
                 break;
-            case Configuration.show_gene_symbols:
-                _show_gene_symbols = new JCheckBox( title );
-                addJCheckBox( _show_gene_symbols, ch_panel );
+            case Configuration.show_seq_symbols:
+                _show_seq_symbols = new JCheckBox( title );
+                addJCheckBox( _show_seq_symbols, ch_panel );
                 add( ch_panel );
                 break;
             case Configuration.show_sequence_acc:
@@ -476,7 +1449,7 @@ final class ControlPanel extends JPanel implements ActionListener {
                 break;
             case Configuration.dynamically_hide_data:
                 _dynamically_hide_data = new JCheckBox( title );
-                getDynamicallyHideData().setToolTipText( "To hide labels depending on likely visibility" );
+                getDynamicallyHideData().setToolTipText( "To hide labels depending on expected visibility" );
                 addJCheckBox( getDynamicallyHideData(), ch_panel );
                 add( ch_panel );
                 break;
@@ -506,16 +1479,6 @@ final class ControlPanel extends JPanel implements ActionListener {
         }
     }// addCheckbox
 
-    private void addClickToOption( final int which, final String title ) {
-        _click_to_combobox.addItem( title );
-        _click_to_names.add( title );
-        _all_click_to_names.put( new Integer( which ), title );
-        if ( !_configuration.isUseNativeUI() ) {
-            _click_to_combobox.setBackground( getConfiguration().getGuiButtonBackgroundColor() );
-            _click_to_combobox.setForeground( getConfiguration().getGuiButtonTextColor() );
-        }
-    }
-
     void addJButton( final JButton jb, final JPanel p ) {
         jb.setFocusPainted( false );
         jb.setFont( ControlPanel.jcb_font );
@@ -539,6 +1502,16 @@ final class ControlPanel extends JPanel implements ActionListener {
         jcb.addActionListener( this );
     }
 
+    private final void setupJRadioButton( final JRadioButton rb ) {
+        rb.setFocusPainted( false );
+        rb.setFont( ControlPanel.jcb_font );
+        if ( !_configuration.isUseNativeUI() ) {
+            rb.setBackground( getConfiguration().getGuiBackgroundColor() );
+            rb.setForeground( getConfiguration().getGuiCheckboxTextColor() );
+        }
+        rb.addActionListener( this );
+    }
+
     void addJTextField( final JTextField tf, final JPanel p ) {
         if ( !_configuration.isUseNativeUI() ) {
             tf.setForeground( getConfiguration().getGuiBackgroundColor() );
@@ -548,81 +1521,39 @@ final class ControlPanel extends JPanel implements ActionListener {
         tf.addActionListener( this );
     }
 
-    /* GUILHEM_BEG */
-    private void addSequenceRelationBlock() {
-        final JLabel spacer = new JLabel( "" );
-        spacer.setSize( 1, 1 );
-        add( spacer );
-        final JLabel mainLabel = new JLabel( "Sequence relations to display" );
-        final JLabel typeLabel = customizeLabel( new JLabel( "(type) " ), getConfiguration() );
-        typeLabel.setFont( ControlPanel.js_font.deriveFont( 7 ) );
-        getSequenceRelationTypeBox().setFocusable( false );
-        _sequence_relation_type_box.setFont( ControlPanel.js_font );
-        if ( !_configuration.isUseNativeUI() ) {
-            _sequence_relation_type_box.setBackground( getConfiguration().getGuiButtonBackgroundColor() );
-            _sequence_relation_type_box.setForeground( getConfiguration().getGuiButtonTextColor() );
-        }
-        _sequence_relation_type_box.setRenderer( new ListCellRenderer() {
-
-            @Override
-            public Component getListCellRendererComponent( final JList list,
-                                                           final Object value,
-                                                           final int index,
-                                                           final boolean isSelected,
-                                                           final boolean cellHasFocus ) {
-                final Component component = new DefaultListCellRenderer().getListCellRendererComponent( list,
-                                                                                                        value,
-                                                                                                        index,
-                                                                                                        isSelected,
-                                                                                                        cellHasFocus );
-                if ( ( value != null ) && ( value instanceof SequenceRelation.SEQUENCE_RELATION_TYPE ) ) {
-                    ( ( DefaultListCellRenderer ) component ).setText( SequenceRelation
-                            .getPrintableNameByType( ( SequenceRelation.SEQUENCE_RELATION_TYPE ) value ) );
-                }
-                return component;
-            }
-        } );
-        final GridBagLayout gbl = new GridBagLayout();
-        _sequence_relation_type_box.setMinimumSize( new Dimension( 115, 17 ) );
-        _sequence_relation_type_box.setPreferredSize( new Dimension( 115, 20 ) );
-        final JPanel horizGrid = new JPanel( gbl );
-        horizGrid.setBackground( getBackground() );
-        horizGrid.add( typeLabel );
-        horizGrid.add( _sequence_relation_type_box );
-        add( customizeLabel( mainLabel, getConfiguration() ) );
-        add( horizGrid );
-        add( getSequenceRelationBox() );
-        if ( _configuration.doDisplayOption( Configuration.show_relation_confidence ) ) {
-            addCheckbox( Configuration.show_relation_confidence,
-                         _configuration.getDisplayTitle( Configuration.show_relation_confidence ) );
-            setCheckbox( Configuration.show_relation_confidence,
-                         _configuration.doCheckOption( Configuration.show_relation_confidence ) );
-        }
-    }// addSequenceRelationBlock
-
     void deactivateButtonToReturnToSuperTree() {
         _return_to_super_tree.setText( RETURN_TO_SUPER_TREE_TEXT );
         _return_to_super_tree.setForeground( getConfiguration().getGuiButtonTextColor() );
         _return_to_super_tree.setEnabled( false );
     }
 
+    void deactivateButtonToUncollapseAll() {
+        _uncollapse_all.setForeground( getConfiguration().getGuiButtonTextColor() );
+        _uncollapse_all.setEnabled( false );
+    }
+
     void displayedPhylogenyMightHaveChanged( final boolean recalc_longest_ext_node_info ) {
-        if ( ( _mainpanel != null ) && ( _mainpanel.getCurrentPhylogeny() != null ) ) {
+        if ( ( _mainpanel != null )
+                && ( ( _mainpanel.getCurrentPhylogeny() != null ) && !_mainpanel.getCurrentPhylogeny().isEmpty() ) ) {
+            if ( recalc_longest_ext_node_info ) {
+                _mainpanel.getCurrentTreePanel().initNodeData();
+                _mainpanel.getCurrentTreePanel().calculateLongestExtNodeInfo();
+            }
             if ( getOptions().isShowOverview() ) {
                 _mainpanel.getCurrentTreePanel().updateOvSizes();
             }
             _mainpanel.getCurrentTreePanel().recalculateMaxDistanceToRoot();
             setVisibilityOfDomainStrucureControls();
             updateDomainStructureEvaluethresholdDisplay();
+            updateDepthCollapseDepthDisplay();
+            updateRankCollapseRankDisplay();
+            getMainPanel().getControlPanel();
+            _mainpanel.getCurrentTreePanel().updateButtonToUncollapseAll();
             _mainpanel.getCurrentTreePanel().calculateScaleDistance();
             _mainpanel.getCurrentTreePanel().calcMaxDepth();
             _mainpanel.adjustJScrollPane();
-            if ( recalc_longest_ext_node_info ) {
-                _mainpanel.getCurrentTreePanel().initNodeData();
-                _mainpanel.getCurrentTreePanel().calculateLongestExtNodeInfo();
-            }
             _mainpanel.getCurrentTreePanel().repaint();
-            // _mainpanel.getCurrentTreePanel().setUpUrtFactors();
+            // _mainpanel.getCurrentTreePanel().setUpUrtFactor();
         }
     }
 
@@ -632,7 +1563,7 @@ final class ControlPanel extends JPanel implements ActionListener {
 
     /**
      * Indicates what action should be execute when a node is clicked
-     * 
+     *
      * @return the click-on action
      */
     NodeClickAction getActionWhenNodeClicked() {
@@ -647,10 +1578,6 @@ final class ControlPanel extends JPanel implements ActionListener {
         return _annotation_colors;
     }
 
-    public JCheckBox getColorBranchesCb() {
-        return _color_branches_cb;
-    }
-
     Configuration getConfiguration() {
         return _configuration;
     }
@@ -659,85 +1586,40 @@ final class ControlPanel extends JPanel implements ActionListener {
         return getMainPanel().getCurrentTreePanel();
     }
 
-    public JCheckBox getDisplayAsPhylogramCb() {
-        return _display_as_phylogram_cb;
-    }
-
-    public JCheckBox getDynamicallyHideData() {
-        return _dynamically_hide_data;
-    }
-
-    /* GUILHEM_END */
-    private List<Boolean> getIsDrawPhylogramList() {
-        return _draw_phylogram;
-    }
-
     MainPanel getMainPanel() {
         return _mainpanel;
     }
 
-    public JCheckBox getNodeDescPopupCb() {
-        return _node_desc_popup_cb;
-    }
-
     Options getOptions() {
         return getMainPanel().getOptions();
     }
 
-    private JLabel getSearchFoundCountsLabel() {
-        return _search_found_label;
+    JLabel getSearchFoundCountsLabel0() {
+        return _search_found_label_0;
     }
 
-    private JButton getSearchResetButton() {
-        return _search_reset_button;
+    JLabel getSearchFoundCountsLabel1() {
+        return _search_found_label_1;
     }
 
-    JTextField getSearchTextField() {
-        return _search_tf;
+    JButton getSearchResetButton0() {
+        return _search_reset_button_0;
     }
 
-    public Sequence getSelectedQuerySequence() {
-        return _selected_query_seq;
+    JButton getSearchResetButton1() {
+        return _search_reset_button_1;
     }
 
-    public JComboBox getSequenceRelationBox() {
-        if ( _show_sequence_relations == null ) {
-            _show_sequence_relations = new JComboBox();
-            _show_sequence_relations.setFocusable( false );
-            _show_sequence_relations.setMaximumRowCount( 20 );
-            _show_sequence_relations.setFont( ControlPanel.js_font );
-            if ( !_configuration.isUseNativeUI() ) {
-                _show_sequence_relations.setBackground( getConfiguration().getGuiButtonBackgroundColor() );
-                _show_sequence_relations.setForeground( getConfiguration().getGuiButtonTextColor() );
-            }
-            _show_sequence_relations.addItem( "-----" );
-            _show_sequence_relations.setToolTipText( "To display orthology information for selected query" );
-        }
-        return _show_sequence_relations;
+    JTextField getSearchTextField0() {
+        return _search_tf_0;
     }
 
-    /* GUILHEM_BEG */
-    public JComboBox getSequenceRelationTypeBox() {
-        if ( _sequence_relation_type_box == null ) {
-            _sequence_relation_type_box = new JComboBox();
-            for( final SequenceRelation.SEQUENCE_RELATION_TYPE type : SequenceRelation.SEQUENCE_RELATION_TYPE.values() ) {
-                _sequence_relation_type_box.addItem( type );
-            }
-            _sequence_relation_type_box.addActionListener( new ActionListener() {
-
-                @Override
-                public void actionPerformed( final ActionEvent e ) {
-                    if ( _mainpanel.getCurrentPhylogeny() != null ) {
-                        setSequenceRelationQueries( getMainPanel().getCurrentPhylogeny().getSequenceRelationQueries() );
-                    }
-                }
-            } );
-        }
-        return _sequence_relation_type_box;
+    JTextField getSearchTextField1() {
+        return _search_tf_1;
     }
 
-    public JCheckBox getShowEventsCb() {
-        return _show_events;
+    Map<String, Color> getSequenceColors() {
+        return _sequence_colors;
     }
 
     List<String> getSingleClickToNames() {
@@ -748,16 +1630,6 @@ final class ControlPanel extends JPanel implements ActionListener {
         return _species_colors;
     }
 
-    public JCheckBox getWriteConfidenceCb() {
-        return _write_confidence;
-    }
-
-    private void init() {
-        _draw_phylogram = new ArrayList<Boolean>();
-        setSpeciesColors( new HashMap<String, Color>() );
-        setAnnotationColors( new HashMap<String, Color>() );
-    }
-
     boolean isAntialiasScreenText() {
         return true;
     }
@@ -766,20 +1638,18 @@ final class ControlPanel extends JPanel implements ActionListener {
         return ( ( _color_according_to_annotation != null ) && _color_according_to_annotation.isSelected() );
     }
 
-    boolean isColorAccordingToTaxonomy() {
-        return ( ( _color_acc_species != null ) && _color_acc_species.isSelected() );
+    boolean isColorAccordingToSequence() {
+        return ( ( _color_acc_sequence != null ) && _color_acc_sequence.isSelected() );
     }
 
-    boolean isColorBranches() {
-        return ( ( ( getColorBranchesCb() != null ) && getColorBranchesCb().isSelected() ) || ( ( getColorBranchesCb() == null ) && _color_branches ) );
+    boolean isColorAccordingToTaxonomy() {
+        return ( ( _color_acc_species != null ) && _color_acc_species.isSelected() );
     }
 
     boolean isDrawPhylogram() {
-        return isDrawPhylogram( getMainPanel().getCurrentTabIndex() );
-    }
-
-    private boolean isDrawPhylogram( final int index ) {
-        return getIsDrawPhylogramList().get( index );
+        final Options.PHYLOGENY_DISPLAY_TYPE t = getTreeDisplayType( getMainPanel().getCurrentTabIndex() );
+        return ( ( t == Options.PHYLOGENY_DISPLAY_TYPE.ALIGNED_PHYLOGRAM )
+                || ( t == Options.PHYLOGENY_DISPLAY_TYPE.UNALIGNED_PHYLOGRAM ) );
     }
 
     boolean isDynamicallyHideData() {
@@ -806,7 +1676,7 @@ final class ControlPanel extends JPanel implements ActionListener {
         return ( ( _show_binary_characters != null ) && _show_binary_characters.isSelected() );
     }
 
-    boolean isShowBootstrapValues() {
+    boolean isShowConfidenceValues() {
         return ( ( getWriteConfidenceCb() != null ) && getWriteConfidenceCb().isSelected() );
     }
 
@@ -818,24 +1688,24 @@ final class ControlPanel extends JPanel implements ActionListener {
         return ( ( _show_gene_names != null ) && _show_gene_names.isSelected() );
     }
 
-    public boolean isShowVectorData() {
-        return ( ( _show_vector_data_cb != null ) && _show_vector_data_cb.isSelected() );
+    boolean isShowInternalData() {
+        return ( ( _display_internal_data == null ) || _display_internal_data.isSelected() );
     }
 
-    public boolean isShowProperties() {
-        return ( ( _show_properties_cb != null ) && _show_properties_cb.isSelected() );
+    boolean isShowExternalData() {
+        return ( ( _display_external_data == null ) || _display_external_data.isSelected() );
     }
 
-    boolean isShowGeneSymbols() {
-        return ( ( _show_gene_symbols != null ) && _show_gene_symbols.isSelected() );
+    boolean isShowNodeNames() {
+        return ( ( _show_node_names != null ) && _show_node_names.isSelected() );
     }
 
-    boolean isShowInternalData() {
-        return ( ( _display_internal_data == null ) || _display_internal_data.isSelected() );
+    boolean isShowSeqNames() {
+        return ( ( _show_seq_names != null ) && _show_seq_names.isSelected() );
     }
 
-    boolean isShowNodeNames() {
-        return ( ( _show_node_names != null ) && _show_node_names.isSelected() );
+    boolean isShowSeqSymbols() {
+        return ( ( _show_seq_symbols != null ) && _show_seq_symbols.isSelected() );
     }
 
     boolean isShowSequenceAcc() {
@@ -854,8 +1724,8 @@ final class ControlPanel extends JPanel implements ActionListener {
         return ( ( _show_taxo_code != null ) && _show_taxo_code.isSelected() );
     }
 
-    public boolean isShowTaxonomyImages() {
-        return ( ( _show_taxo_images_cb != null ) && _show_taxo_images_cb.isSelected() );
+    boolean isShowTaxonomyRank() {
+        return ( ( _show_taxo_rank != null ) && _show_taxo_rank.isSelected() );
     }
 
     boolean isShowTaxonomyCommonNames() {
@@ -866,98 +1736,83 @@ final class ControlPanel extends JPanel implements ActionListener {
         return ( ( _show_taxo_scientific_names != null ) && _show_taxo_scientific_names.isSelected() );
     }
 
+    boolean isUseVisualStyles() {
+        return ( ( ( getUseVisualStylesCb() != null ) && getUseVisualStylesCb().isSelected() )
+                || ( ( getUseVisualStylesCb() == null ) && _color_branches ) );
+    }
+
     boolean isWidthBranches() {
         return ( ( _width_branches != null ) && _width_branches.isSelected() );
     }
 
+    boolean isWriteBranchLengthValues() {
+        return ( ( _write_branch_length_values != null ) && _write_branch_length_values.isSelected() );
+    }
+
     void phylogenyAdded( final Configuration configuration ) {
-        getIsDrawPhylogramList().add( configuration.isDrawAsPhylogram() );
+        if ( configuration.isDrawAsPhylogram() ) {
+            getTreeDisplayTypes().add( Options.PHYLOGENY_DISPLAY_TYPE.UNALIGNED_PHYLOGRAM );
+        }
+        else {
+            getTreeDisplayTypes().add( Options.PHYLOGENY_DISPLAY_TYPE.CLADOGRAM );
+        }
     }
 
     void phylogenyRemoved( final int index ) {
-        getIsDrawPhylogramList().remove( index );
+        getTreeDisplayTypes().remove( index );
     }
 
-    void search() {
+    void search0() {
         final MainPanel main_panel = getMainPanel();
         final Phylogeny tree = main_panel.getCurrentPhylogeny();
         if ( ( tree == null ) || tree.isEmpty() ) {
             return;
         }
-        String query = getSearchTextField().getText();
+        String query = getSearchTextField0().getText();
         if ( query != null ) {
             query = query.trim();
         }
-        else {
-            getSearchFoundCountsLabel().setVisible( false );
-            getSearchResetButton().setEnabled( false );
-            getSearchResetButton().setVisible( false );
-            searchReset();
-        }
         if ( !ForesterUtil.isEmpty( query ) ) {
-            search( main_panel, tree, query );
+            search0( main_panel, tree, query );
         }
         else {
-            getSearchFoundCountsLabel().setVisible( false );
-            getSearchResetButton().setEnabled( false );
-            getSearchResetButton().setVisible( false );
-            searchReset();
+            getSearchFoundCountsLabel0().setVisible( false );
+            getSearchResetButton0().setEnabled( false );
+            getSearchResetButton0().setVisible( false );
+            searchReset0();
         }
     }
 
-    private void search( final MainPanel main_panel, final Phylogeny tree, final String query_str ) {
-        getSearchFoundCountsLabel().setVisible( true );
-        getSearchResetButton().setEnabled( true );
-        getSearchResetButton().setVisible( true );
-        String[] queries = null;
-        List<PhylogenyNode> nodes = null;
-        if ( query_str.indexOf( ',' ) >= 0 ) {
-            queries = query_str.split( ",+" );
-        }
-        else {
-            queries = new String[ 1 ];
-            queries[ 0 ] = query_str.trim();
+    void search1() {
+        final MainPanel main_panel = getMainPanel();
+        final Phylogeny tree = main_panel.getCurrentPhylogeny();
+        if ( ( tree == null ) || tree.isEmpty() ) {
+            return;
         }
-        if ( ( queries != null ) && ( queries.length > 0 ) ) {
-            nodes = new ArrayList<PhylogenyNode>();
-            for( String query : queries ) {
-                if ( ForesterUtil.isEmpty( query ) ) {
-                    continue;
-                }
-                query = query.trim();
-                if ( query.indexOf( '+' ) >= 0 ) {
-                    nodes.addAll( PhylogenyMethods.searchDataLogicalAnd( query.split( "\\++" ), tree, getOptions()
-                            .isSearchCaseSensitive(), !getOptions().isMatchWholeTermsOnly() ) );
-                }
-                else {
-                    nodes.addAll( PhylogenyMethods.searchData( query,
-                                                               tree,
-                                                               getOptions().isSearchCaseSensitive(),
-                                                               !getOptions().isMatchWholeTermsOnly() ) );
-                }
-            }
-            if ( getOptions().isInverseSearchResult() ) {
-                final List<PhylogenyNode> all = PhylogenyMethods.obtainAllNodesAsList( tree );
-                all.removeAll( nodes );
-                nodes = all;
-            }
+        String query = getSearchTextField1().getText();
+        if ( query != null ) {
+            query = query.trim();
         }
-        if ( ( nodes != null ) && ( nodes.size() > 0 ) ) {
-            main_panel.getCurrentTreePanel().setFoundNodes( new HashSet<Integer>() );
-            for( final PhylogenyNode node : nodes ) {
-                main_panel.getCurrentTreePanel().getFoundNodes().add( node.getId() );
-            }
-            setSearchFoundCountsOnLabel( nodes.size() );
+        if ( !ForesterUtil.isEmpty( query ) ) {
+            search1( main_panel, tree, query );
         }
         else {
-            setSearchFoundCountsOnLabel( 0 );
-            searchReset();
+            getSearchFoundCountsLabel1().setVisible( false );
+            getSearchResetButton1().setEnabled( false );
+            getSearchResetButton1().setVisible( false );
+            searchReset1();
+        }
+    }
+
+    void searchReset0() {
+        if ( getMainPanel().getCurrentTreePanel() != null ) {
+            getMainPanel().getCurrentTreePanel().setFoundNodes0( null );
         }
     }
 
-    private void searchReset() {
+    void searchReset1() {
         if ( getMainPanel().getCurrentTreePanel() != null ) {
-            getMainPanel().getCurrentTreePanel().setFoundNodes( null );
+            getMainPanel().getCurrentTreePanel().setFoundNodes1( null );
         }
     }
 
@@ -972,8 +1827,10 @@ final class ControlPanel extends JPanel implements ActionListener {
     void setCheckbox( final int which, final boolean state ) {
         switch ( which ) {
             case Configuration.display_as_phylogram:
-                if ( getDisplayAsPhylogramCb() != null ) {
-                    getDisplayAsPhylogramCb().setSelected( state );
+                if ( getDisplayAsUnalignedPhylogramRb() != null ) {
+                    getDisplayAsUnalignedPhylogramRb().setSelected( state );
+                    getDisplayAsAlignedPhylogramRb().setSelected( !state );
+                    getDisplayAsCladogramRb().setSelected( !state );
                 }
                 break;
             case Configuration.display_internal_data:
@@ -981,11 +1838,21 @@ final class ControlPanel extends JPanel implements ActionListener {
                     _display_internal_data.setSelected( state );
                 }
                 break;
+            case Configuration.display_external_data:
+                if ( _display_external_data != null ) {
+                    _display_external_data.setSelected( state );
+                }
+                break;
             case Configuration.color_according_to_species:
                 if ( _color_acc_species != null ) {
                     _color_acc_species.setSelected( state );
                 }
                 break;
+            case Configuration.color_according_to_sequence:
+                if ( _color_acc_sequence != null ) {
+                    _color_acc_sequence.setSelected( state );
+                }
+                break;
             case Configuration.color_according_to_annotation:
                 if ( _color_according_to_annotation != null ) {
                     _color_according_to_annotation.setSelected( state );
@@ -996,11 +1863,6 @@ final class ControlPanel extends JPanel implements ActionListener {
                     _show_node_names.setSelected( state );
                 }
                 break;
-            case Configuration.show_tax_code:
-                if ( _show_taxo_code != null ) {
-                    _show_taxo_code.setSelected( state );
-                }
-                break;
             case Configuration.show_taxonomy_scientific_names:
                 if ( _show_taxo_scientific_names != null ) {
                     _show_taxo_scientific_names.setSelected( state );
@@ -1011,6 +1873,16 @@ final class ControlPanel extends JPanel implements ActionListener {
                     _show_taxo_common_names.setSelected( state );
                 }
                 break;
+            case Configuration.show_tax_code:
+                if ( _show_taxo_code != null ) {
+                    _show_taxo_code.setSelected( state );
+                }
+                break;
+            case Configuration.show_tax_rank:
+                if ( _show_taxo_rank != null ) {
+                    _show_taxo_rank.setSelected( state );
+                }
+                break;
             case Configuration.show_taxonomy_images:
                 if ( _show_taxo_images_cb != null ) {
                     _show_taxo_images_cb.setSelected( state );
@@ -1041,9 +1913,9 @@ final class ControlPanel extends JPanel implements ActionListener {
                     getShowEventsCb().setSelected( state );
                 }
                 break;
-            case Configuration.color_branches:
-                if ( getColorBranchesCb() != null ) {
-                    getColorBranchesCb().setSelected( state );
+            case Configuration.use_style:
+                if ( getUseVisualStylesCb() != null ) {
+                    getUseVisualStylesCb().setSelected( state );
                 }
                 break;
             case Configuration.width_branches:
@@ -1056,14 +1928,29 @@ final class ControlPanel extends JPanel implements ActionListener {
                     _show_domain_architectures.setSelected( state );
                 }
                 break;
+            case Configuration.write_branch_length_values:
+                if ( _write_branch_length_values != null ) {
+                    _write_branch_length_values.setSelected( state );
+                }
+                break;
+            case Configuration.show_mol_seqs:
+                if ( _show_mol_seqs != null ) {
+                    _show_mol_seqs.setSelected( state );
+                }
+                break;
+            case Configuration.show_seq_names:
+                if ( _show_seq_names != null ) {
+                    _show_seq_names.setSelected( state );
+                }
+                break;
             case Configuration.show_gene_names:
                 if ( _show_gene_names != null ) {
                     _show_gene_names.setSelected( state );
                 }
                 break;
-            case Configuration.show_gene_symbols:
-                if ( _show_gene_symbols != null ) {
-                    _show_gene_symbols.setSelected( state );
+            case Configuration.show_seq_symbols:
+                if ( _show_seq_symbols != null ) {
+                    _show_seq_symbols.setSelected( state );
                 }
                 break;
             case Configuration.show_vector_data:
@@ -1136,10 +2023,11 @@ final class ControlPanel extends JPanel implements ActionListener {
         else if ( action == _open_seq_web_item ) {
             setActionWhenNodeClicked( NodeClickAction.OPEN_SEQ_WEB );
         }
+        else if ( action == _sort_descendents_item ) {
+            setActionWhenNodeClicked( NodeClickAction.SORT_DESCENDENTS );
+        }
         else if ( action == _blast_item ) {
-            if ( !Constants.__RELEASE && !Constants.__SNAPSHOT_RELEASE ) {
-                setActionWhenNodeClicked( NodeClickAction.BLAST );
-            }
+            setActionWhenNodeClicked( NodeClickAction.BLAST );
         }
         else if ( action == _open_tax_web_item ) {
             setActionWhenNodeClicked( NodeClickAction.OPEN_TAX_WEB );
@@ -1162,6 +2050,27 @@ final class ControlPanel extends JPanel implements ActionListener {
         else if ( action == _edit_node_data_item ) {
             setActionWhenNodeClicked( NodeClickAction.EDIT_NODE_DATA );
         }
+        else if ( action == _select_nodes_item ) {
+            setActionWhenNodeClicked( NodeClickAction.SELECT_NODES );
+        }
+        else if ( action == _get_ext_desc_data ) {
+            setActionWhenNodeClicked( NodeClickAction.GET_EXT_DESC_DATA );
+        }
+        else if ( action == _open_pdb_item ) {
+            setActionWhenNodeClicked( NodeClickAction.OPEN_PDB_WEB );
+        }
+        else if ( action == _color_node_font_item ) {
+            setActionWhenNodeClicked( NodeClickAction.COLOR_NODE_FONT );
+        }
+        else if ( action == _change_node_font_item ) {
+            setActionWhenNodeClicked( NodeClickAction.CHANGE_NODE_FONT );
+        }
+        else if ( action == _uncollapse_all_cb_item ) {
+            setActionWhenNodeClicked( NodeClickAction.UNCOLLAPSE_ALL );
+        }
+        else if ( action == _order_subtree_cb_item ) {
+            setActionWhenNodeClicked( NodeClickAction.ORDER_SUBTREE );
+        }
         else {
             throw new RuntimeException( "unknown action: " + action );
         }
@@ -1170,25 +2079,35 @@ final class ControlPanel extends JPanel implements ActionListener {
         _click_to_combobox.setSelectedIndex( action );
     }
 
-    void setColorBranches( final boolean color_branches ) {
+    public void setColorBranches( final boolean color_branches ) {
         _color_branches = color_branches;
     }
 
-    void setDrawPhylogram( final boolean b ) {
-        getDisplayAsPhylogramCb().setSelected( b );
-        setDrawPhylogram( getMainPanel().getCurrentTabIndex(), b );
-    }
-
-    private void setDrawPhylogram( final int index, final boolean b ) {
-        getIsDrawPhylogramList().set( index, b );
+    void setTreeDisplayType( final Options.PHYLOGENY_DISPLAY_TYPE t ) {
+        switch ( t ) {
+            case UNALIGNED_PHYLOGRAM:
+                getDisplayAsUnalignedPhylogramRb().setSelected( true );
+                break;
+            case ALIGNED_PHYLOGRAM:
+                getDisplayAsAlignedPhylogramRb().setSelected( true );
+                break;
+            case CLADOGRAM:
+                getDisplayAsCladogramRb().setSelected( true );
+                break;
+        }
+        setTreeDisplayType( getMainPanel().getCurrentTabIndex(), t );
     }
 
     void setDrawPhylogramEnabled( final boolean b ) {
-        getDisplayAsPhylogramCb().setEnabled( b );
+        if ( getDisplayAsAlignedPhylogramRb() != null && getDisplayAsUnalignedPhylogramRb() != null
+                && getDisplayAsCladogramRb() != null ) {
+            getDisplayAsAlignedPhylogramRb().setEnabled( b );
+            getDisplayAsUnalignedPhylogramRb().setEnabled( b );
+            getDisplayAsCladogramRb().setEnabled( b );
+        }
     }
 
     void setDynamicHidingIsOn( final boolean is_on ) {
-        //  if ( !_configuration.isUseNativeUI() ) {
         if ( is_on ) {
             getDynamicallyHideData().setForeground( getConfiguration().getGuiCheckboxAndButtonActiveColor() );
         }
@@ -1196,220 +2115,37 @@ final class ControlPanel extends JPanel implements ActionListener {
             if ( !_configuration.isUseNativeUI() ) {
                 getDynamicallyHideData().setForeground( getConfiguration().getGuiButtonTextColor() );
             }
-            else {
-                getDynamicallyHideData().setForeground( Color.BLACK );
-            }
-        }
-        // }
-    }
-
-    private void setSearchFoundCountsOnLabel( final int counts ) {
-        getSearchFoundCountsLabel().setText( "Found: " + counts );
-    }
-
-    public void setSequenceRelationQueries( final Collection<Sequence> sequenceRelationQueries ) {
-        final JComboBox box = getSequenceRelationBox();
-        while ( box.getItemCount() > 1 ) {
-            box.removeItemAt( 1 );
-        }
-        final HashMap<String, Sequence> sequencesByName = new HashMap<String, Sequence>();
-        final SequenceRelation.SEQUENCE_RELATION_TYPE relationType = ( SequenceRelation.SEQUENCE_RELATION_TYPE ) _sequence_relation_type_box
-                .getSelectedItem();
-        if ( relationType == null ) {
-            return;
-        }
-        final ArrayList<String> sequenceNamesToAdd = new ArrayList<String>();
-        for( final Sequence seq : sequenceRelationQueries ) {
-            if ( seq.hasSequenceRelations() ) {
-                boolean fFoundForCurrentType = false;
-                for( final SequenceRelation sq : seq.getSequenceRelations() ) {
-                    if ( sq.getType().equals( relationType ) ) {
-                        fFoundForCurrentType = true;
-                        break;
-                    }
-                }
-                if ( fFoundForCurrentType ) {
-                    sequenceNamesToAdd.add( seq.getName() );
-                    sequencesByName.put( seq.getName(), seq );
-                }
-            }
-        }
-        // sort sequences by name before adding them to the combo
-        final String[] sequenceNameArray = sequenceNamesToAdd.toArray( new String[ sequenceNamesToAdd.size() ] );
-        Arrays.sort( sequenceNameArray, String.CASE_INSENSITIVE_ORDER );
-        for( final String seqName : sequenceNameArray ) {
-            box.addItem( seqName );
-        }
-        for( final ItemListener oldItemListener : box.getItemListeners() ) {
-            box.removeItemListener( oldItemListener );
-        }
-        box.addItemListener( new ItemListener() {
-
-            @Override
-            public void itemStateChanged( final ItemEvent e ) {
-                _selected_query_seq = sequencesByName.get( e.getItem() );
-                _mainpanel.getCurrentTreePanel().repaint();
-            }
-        } );
-    }
-
-    void setShowEvents( final boolean show_events ) {
-        if ( getShowEventsCb() == null ) {
-            _show_events = new JCheckBox( "" );
-        }
-        getShowEventsCb().setSelected( show_events );
-    }
-
-    void setSpeciesColors( final Map<String, Color> species_colors ) {
-        _species_colors = species_colors;
-    }
-
-    private void setupClickToOptions() {
-        final int default_option = _configuration.getDefaultDisplayClicktoOption();
-        int selected_index = 0;
-        int cb_index = 0;
-        if ( _configuration.doDisplayClickToOption( Configuration.display_node_data ) ) {
-            _show_data_item = cb_index;
-            addClickToOption( Configuration.display_node_data,
-                              _configuration.getClickToTitle( Configuration.display_node_data ) );
-            if ( default_option == Configuration.display_node_data ) {
-                selected_index = cb_index;
-            }
-            cb_index++;
-        }
-        if ( _configuration.doDisplayClickToOption( Configuration.collapse_uncollapse ) ) {
-            _collapse_cb_item = cb_index;
-            addClickToOption( Configuration.collapse_uncollapse,
-                              _configuration.getClickToTitle( Configuration.collapse_uncollapse ) );
-            if ( default_option == Configuration.collapse_uncollapse ) {
-                selected_index = cb_index;
-            }
-            cb_index++;
-        }
-        if ( _configuration.doDisplayClickToOption( Configuration.reroot ) ) {
-            _reroot_cb_item = cb_index;
-            addClickToOption( Configuration.reroot, _configuration.getClickToTitle( Configuration.reroot ) );
-            if ( default_option == Configuration.reroot ) {
-                selected_index = cb_index;
-            }
-            cb_index++;
-        }
-        if ( _configuration.doDisplayClickToOption( Configuration.subtree ) ) {
-            _subtree_cb_item = cb_index;
-            addClickToOption( Configuration.subtree, _configuration.getClickToTitle( Configuration.subtree ) );
-            if ( default_option == Configuration.subtree ) {
-                selected_index = cb_index;
-            }
-            cb_index++;
-        }
-        if ( _configuration.doDisplayClickToOption( Configuration.swap ) ) {
-            _swap_cb_item = cb_index;
-            addClickToOption( Configuration.swap, _configuration.getClickToTitle( Configuration.swap ) );
-            if ( default_option == Configuration.swap ) {
-                selected_index = cb_index;
-            }
-            cb_index++;
-        }
-        if ( _configuration.doDisplayClickToOption( Configuration.color_subtree ) ) {
-            _color_subtree_cb_item = cb_index;
-            addClickToOption( Configuration.color_subtree, _configuration.getClickToTitle( Configuration.color_subtree ) );
-            if ( default_option == Configuration.color_subtree ) {
-                selected_index = cb_index;
-            }
-            cb_index++;
-        }
-        if ( _configuration.doDisplayClickToOption( Configuration.open_seq_web ) ) {
-            _open_seq_web_item = cb_index;
-            addClickToOption( Configuration.open_seq_web, _configuration.getClickToTitle( Configuration.open_seq_web ) );
-            if ( default_option == Configuration.open_seq_web ) {
-                selected_index = cb_index;
-            }
-            cb_index++;
-        }
-        if ( _configuration.doDisplayClickToOption( Configuration.open_tax_web ) ) {
-            _open_tax_web_item = cb_index;
-            addClickToOption( Configuration.open_tax_web, _configuration.getClickToTitle( Configuration.open_tax_web ) );
-            if ( default_option == Configuration.open_tax_web ) {
-                selected_index = cb_index;
-            }
-            cb_index++;
-        }
-        if ( getOptions().isEditable() ) {
-            if ( _configuration.doDisplayClickToOption( Configuration.cut_subtree ) ) {
-                _cut_subtree_item = cb_index;
-                addClickToOption( Configuration.cut_subtree, _configuration.getClickToTitle( Configuration.cut_subtree ) );
-                if ( default_option == Configuration.cut_subtree ) {
-                    selected_index = cb_index;
-                }
-                cb_index++;
-            }
-            if ( _configuration.doDisplayClickToOption( Configuration.copy_subtree ) ) {
-                _copy_subtree_item = cb_index;
-                addClickToOption( Configuration.copy_subtree,
-                                  _configuration.getClickToTitle( Configuration.copy_subtree ) );
-                if ( default_option == Configuration.copy_subtree ) {
-                    selected_index = cb_index;
-                }
-                cb_index++;
-            }
-            if ( _configuration.doDisplayClickToOption( Configuration.paste_subtree ) ) {
-                _paste_subtree_item = cb_index;
-                addClickToOption( Configuration.paste_subtree,
-                                  _configuration.getClickToTitle( Configuration.paste_subtree ) );
-                if ( default_option == Configuration.paste_subtree ) {
-                    selected_index = cb_index;
-                }
-                cb_index++;
-            }
-            if ( _configuration.doDisplayClickToOption( Configuration.delete_subtree_or_node ) ) {
-                _delete_node_or_subtree_item = cb_index;
-                addClickToOption( Configuration.delete_subtree_or_node,
-                                  _configuration.getClickToTitle( Configuration.delete_subtree_or_node ) );
-                if ( default_option == Configuration.delete_subtree_or_node ) {
-                    selected_index = cb_index;
-                }
-                cb_index++;
-            }
-            if ( _configuration.doDisplayClickToOption( Configuration.add_new_node ) ) {
-                _add_new_node_item = cb_index;
-                addClickToOption( Configuration.add_new_node,
-                                  _configuration.getClickToTitle( Configuration.add_new_node ) );
-                if ( default_option == Configuration.add_new_node ) {
-                    selected_index = cb_index;
-                }
-                cb_index++;
-            }
-            if ( _configuration.doDisplayClickToOption( Configuration.edit_node_data ) ) {
-                _edit_node_data_item = cb_index;
-                addClickToOption( Configuration.edit_node_data,
-                                  _configuration.getClickToTitle( Configuration.edit_node_data ) );
-                if ( default_option == Configuration.edit_node_data ) {
-                    selected_index = cb_index;
-                }
-                cb_index++;
-            }
-            if ( !Constants.__RELEASE && !Constants.__SNAPSHOT_RELEASE ) {
-                if ( _configuration.doDisplayClickToOption( Configuration.blast ) ) {
-                    _blast_item = cb_index;
-                    addClickToOption( Configuration.blast, _configuration.getClickToTitle( Configuration.blast ) );
-                    if ( default_option == Configuration.blast ) {
-                        selected_index = cb_index;
-                    }
-                    cb_index++;
-                }
+            else {
+                getDynamicallyHideData().setForeground( Color.BLACK );
             }
         }
-        // Set default selection and its action
-        _click_to_combobox.setSelectedIndex( selected_index );
-        setClickToAction( selected_index );
     }
 
-    /* GUILHEM_END */
-    /*
-     * Set up the controls from the config settings. 11/26/05
-     */
+    void setSearchFoundCountsOnLabel0( final int counts ) {
+        getSearchFoundCountsLabel0().setText( "Found: " + counts );
+    }
+
+    void setSearchFoundCountsOnLabel1( final int counts ) {
+        getSearchFoundCountsLabel1().setText( "Found: " + counts );
+    }
+
+    void setSequenceColors( final Map<String, Color> sequence_colors ) {
+        _sequence_colors = sequence_colors;
+    }
+
+    void setShowEvents( final boolean show_events ) {
+        if ( getShowEventsCb() == null ) {
+            _show_events = new JCheckBox( "" );
+        }
+        getShowEventsCb().setSelected( show_events );
+    }
+
+    void setSpeciesColors( final Map<String, Color> species_colors ) {
+        _species_colors = species_colors;
+    }
+
     void setupControls() {
-        // The tree display options:
+        setupTreeDisplayTypeOptions();
         setupDisplayCheckboxes();
         /* GUILHEM_BEG */
         // The sequence relation query selection combo-box
@@ -1423,15 +2159,42 @@ final class ControlPanel extends JPanel implements ActionListener {
         endClickToOptions();
         // Zoom and quick edit buttons
         addButtons();
-        setupSearchTools();
+        setupSearchTools0();
+        setupSearchTools1();
+    }
+
+    void setupTreeDisplayTypeOptions() {
+        _display_as_unaligned_phylogram_rb = new JRadioButton( "P" );
+        _display_as_aligned_phylogram_rb = new JRadioButton( "A" );
+        _display_as_cladogram_rb = new JRadioButton( "C" );
+        _display_as_buttongroup = new ButtonGroup();
+        _display_as_buttongroup.add( _display_as_unaligned_phylogram_rb );
+        _display_as_buttongroup.add( _display_as_aligned_phylogram_rb );
+        _display_as_buttongroup.add( _display_as_cladogram_rb );
+        getDisplayAsUnalignedPhylogramRb().setToolTipText( "(unaligned) phylogram" );
+        getDisplayAsAlignedPhylogramRb().setToolTipText( "aligned phylogram" );
+        getDisplayAsCladogramRb().setToolTipText( "cladogram" );
+        setupJRadioButton( getDisplayAsUnalignedPhylogramRb() );
+        setupJRadioButton( getDisplayAsAlignedPhylogramRb() );
+        setupJRadioButton( getDisplayAsCladogramRb() );
+        final JPanel p = new JPanel( new GridLayout( 1, 3, 0, 0 ) );
+        p.setFont( ControlPanel.jcb_font );
+        if ( !_configuration.isUseNativeUI() ) {
+            p.setBackground( getConfiguration().getGuiBackgroundColor() );
+            p.setForeground( getConfiguration().getGuiCheckboxTextColor() );
+        }
+        p.add( _display_as_unaligned_phylogram_rb );
+        p.add( _display_as_aligned_phylogram_rb );
+        p.add( _display_as_cladogram_rb );
+        add( p );
     }
 
     void setUpControlsForDomainStrucures() {
-        _domain_display_label = new JLabel( "Domain Display:" );
+        _domain_display_label = new JLabel( "Domain Architectures:" );
         add( customizeLabel( _domain_display_label, getConfiguration() ) );
         add( _domain_display_label );
-        _zoom_in_domain_structure = new JButton( "d+" );
-        _zoom_out_domain_structure = new JButton( "d-" );
+        _zoom_in_domain_structure = new TypomaticJButton( "d+" );
+        _zoom_out_domain_structure = new TypomaticJButton( "d-" );
         _decr_domain_structure_evalue_thr = new JButton( "-" );
         _incr_domain_structure_evalue_thr = new JButton( "+" );
         _zoom_in_domain_structure.setPreferredSize( new Dimension( 10, 10 ) );
@@ -1462,167 +2225,152 @@ final class ControlPanel extends JPanel implements ActionListener {
         addJButton( _incr_domain_structure_evalue_thr, d2_panel );
     }
 
-    private void setupDisplayCheckboxes() {
-        if ( _configuration.doDisplayOption( Configuration.display_as_phylogram ) ) {
-            addCheckbox( Configuration.display_as_phylogram,
-                         _configuration.getDisplayTitle( Configuration.display_as_phylogram ) );
-            setCheckbox( Configuration.display_as_phylogram,
-                         _configuration.doCheckOption( Configuration.display_as_phylogram ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.dynamically_hide_data ) ) {
-            addCheckbox( Configuration.dynamically_hide_data,
-                         _configuration.getDisplayTitle( Configuration.dynamically_hide_data ) );
-            setCheckbox( Configuration.dynamically_hide_data,
-                         _configuration.doCheckOption( Configuration.dynamically_hide_data ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.node_data_popup ) ) {
-            addCheckbox( Configuration.node_data_popup, _configuration.getDisplayTitle( Configuration.node_data_popup ) );
-            setCheckbox( Configuration.node_data_popup, _configuration.doCheckOption( Configuration.node_data_popup ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.display_internal_data ) ) {
-            addCheckbox( Configuration.display_internal_data,
-                         _configuration.getDisplayTitle( Configuration.display_internal_data ) );
-            setCheckbox( Configuration.display_internal_data,
-                         _configuration.doCheckOption( Configuration.display_internal_data ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.color_according_to_species ) ) {
-            addCheckbox( Configuration.color_according_to_species,
-                         _configuration.getDisplayTitle( Configuration.color_according_to_species ) );
-            setCheckbox( Configuration.color_according_to_species,
-                         _configuration.doCheckOption( Configuration.color_according_to_species ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.color_according_to_annotation ) ) {
-            addCheckbox( Configuration.color_according_to_annotation,
-                         _configuration.getDisplayTitle( Configuration.color_according_to_annotation ) );
-            setCheckbox( Configuration.color_according_to_annotation,
-                         _configuration.doCheckOption( Configuration.color_according_to_annotation ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.color_branches ) ) {
-            addCheckbox( Configuration.color_branches, _configuration.getDisplayTitle( Configuration.color_branches ) );
-            setCheckbox( Configuration.color_branches, _configuration.doCheckOption( Configuration.color_branches ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.width_branches ) ) {
-            addCheckbox( Configuration.width_branches, _configuration.getDisplayTitle( Configuration.width_branches ) );
-            setCheckbox( Configuration.width_branches, _configuration.doCheckOption( Configuration.width_branches ) );
-        }
-        final JLabel label = new JLabel( "Display Data:" );
-        label.setFont( ControlPanel.jcb_bold_font );
+    void setUpControlsForDepthCollapse() {
+        _depth_collapse_label = new JLabel( "Collapse by Node Depth:" );
+        _depth_collapse_label
+                .setToolTipText( "to automaticall collapse nodes with a depth equal or larger than a threshold" );
+        add( customizeLabel( _depth_collapse_label, getConfiguration() ) );
+        add( _depth_collapse_label );
+        _decr_depth_collapse_level = new TypomaticJButton( "-" );
+        _incr_depth_collapse_level = new TypomaticJButton( "+" );
+        _decr_depth_collapse_level.setPreferredSize( new Dimension( 10, 10 ) );
+        _incr_depth_collapse_level.setPreferredSize( new Dimension( 10, 10 ) );
+        _decr_depth_collapse_level.setToolTipText( "to decrease the depth threshold (wraps around)" );
+        _incr_depth_collapse_level.setToolTipText( "to increase the depth threshold (wraps around)" );
+        _depth_collapse_depth_tf = new JTextField( 3 );
+        _depth_collapse_depth_tf.setToolTipText( "the current depth threshold" );
+        _depth_collapse_depth_tf.setEditable( false );
         if ( !getConfiguration().isUseNativeUI() ) {
-            label.setForeground( getConfiguration().getGuiCheckboxTextColor() );
-        }
-        add( label );
-        if ( _configuration.doDisplayOption( Configuration.show_node_names ) ) {
-            addCheckbox( Configuration.show_node_names, _configuration.getDisplayTitle( Configuration.show_node_names ) );
-            setCheckbox( Configuration.show_node_names, _configuration.doCheckOption( Configuration.show_node_names ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_tax_code ) ) {
-            addCheckbox( Configuration.show_tax_code, _configuration.getDisplayTitle( Configuration.show_tax_code ) );
-            setCheckbox( Configuration.show_tax_code, _configuration.doCheckOption( Configuration.show_tax_code ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_taxonomy_scientific_names ) ) {
-            addCheckbox( Configuration.show_taxonomy_scientific_names,
-                         _configuration.getDisplayTitle( Configuration.show_taxonomy_scientific_names ) );
-            setCheckbox( Configuration.show_taxonomy_scientific_names,
-                         _configuration.doCheckOption( Configuration.show_taxonomy_scientific_names ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_taxonomy_common_names ) ) {
-            addCheckbox( Configuration.show_taxonomy_common_names,
-                         _configuration.getDisplayTitle( Configuration.show_taxonomy_common_names ) );
-            setCheckbox( Configuration.show_taxonomy_common_names,
-                         _configuration.doCheckOption( Configuration.show_taxonomy_common_names ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_taxonomy_images ) ) {
-            addCheckbox( Configuration.show_taxonomy_images,
-                         _configuration.getDisplayTitle( Configuration.show_taxonomy_images ) );
-            setCheckbox( Configuration.show_taxonomy_images,
-                         _configuration.doCheckOption( Configuration.show_taxonomy_images ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_gene_symbols ) ) {
-            addCheckbox( Configuration.show_gene_symbols,
-                         _configuration.getDisplayTitle( Configuration.show_gene_symbols ) );
-            setCheckbox( Configuration.show_gene_symbols,
-                         _configuration.doCheckOption( Configuration.show_gene_symbols ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_gene_names ) ) {
-            addCheckbox( Configuration.show_gene_names, _configuration.getDisplayTitle( Configuration.show_gene_names ) );
-            setCheckbox( Configuration.show_gene_names, _configuration.doCheckOption( Configuration.show_gene_names ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_sequence_acc ) ) {
-            addCheckbox( Configuration.show_sequence_acc,
-                         _configuration.getDisplayTitle( Configuration.show_sequence_acc ) );
-            setCheckbox( Configuration.show_sequence_acc,
-                         _configuration.doCheckOption( Configuration.show_sequence_acc ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_annotation ) ) {
-            addCheckbox( Configuration.show_annotation, _configuration.getDisplayTitle( Configuration.show_annotation ) );
-            setCheckbox( Configuration.show_annotation, _configuration.doCheckOption( Configuration.show_annotation ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_binary_characters ) ) {
-            addCheckbox( Configuration.show_binary_characters,
-                         _configuration.getDisplayTitle( Configuration.show_binary_characters ) );
-            setCheckbox( Configuration.show_binary_characters,
-                         _configuration.doCheckOption( Configuration.show_binary_characters ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_binary_character_counts ) ) {
-            addCheckbox( Configuration.show_binary_character_counts,
-                         _configuration.getDisplayTitle( Configuration.show_binary_character_counts ) );
-            setCheckbox( Configuration.show_binary_character_counts,
-                         _configuration.doCheckOption( Configuration.show_binary_character_counts ) );
-        }
-        if ( _configuration.doDisplayOption( Configuration.show_domain_architectures ) ) {
-            addCheckbox( Configuration.show_domain_architectures,
-                         _configuration.getDisplayTitle( Configuration.show_domain_architectures ) );
-            setCheckbox( Configuration.show_domain_architectures,
-                         _configuration.doCheckOption( Configuration.show_domain_architectures ) );
+            _depth_collapse_depth_tf.setForeground( getConfiguration().getGuiMenuBackgroundColor() );
+            _depth_collapse_depth_tf.setBackground( getConfiguration().getGuiCheckboxTextColor() );
+            _depth_collapse_depth_tf.setBorder( null );
         }
-        if ( _configuration.doDisplayOption( Configuration.write_confidence_values ) ) {
-            addCheckbox( Configuration.write_confidence_values,
-                         _configuration.getDisplayTitle( Configuration.write_confidence_values ) );
-            setCheckbox( Configuration.write_confidence_values,
-                         _configuration.doCheckOption( Configuration.write_confidence_values ) );
+        final JPanel panel = new JPanel( new GridLayout( 1, 3, 0, 0 ) );
+        if ( !_configuration.isUseNativeUI() ) {
+            panel.setBackground( getBackground() );
+        }
+        add( panel );
+        addJButton( _decr_depth_collapse_level, panel );
+        addJTextField( _depth_collapse_depth_tf, panel );
+        addJButton( _incr_depth_collapse_level, panel );
+    }
+
+    void setUpControlsForRankCollapse() {
+        _rank_collapse_label = new JLabel( "Collapse by Node Rank:" );
+        _rank_collapse_label
+                .setToolTipText( "to automatically collapse nodes with a taxonomic rank equal or lower than a threshold" );
+        add( customizeLabel( _rank_collapse_label, getConfiguration() ) );
+        add( _rank_collapse_label );
+        _decr_rank_collapse_level = new TypomaticJButton( "-" );
+        _incr_rank_collapse_level = new TypomaticJButton( "+" );
+        _decr_rank_collapse_level.setPreferredSize( new Dimension( 10, 10 ) );
+        _incr_rank_collapse_level.setPreferredSize( new Dimension( 10, 10 ) );
+        _decr_rank_collapse_level.setToolTipText( "to decrease the taxonomic rank threshold (wraps around)" );
+        _incr_rank_collapse_level.setToolTipText( "to increase the taxonomic rank threshold (wraps around)" );
+        _rank_collapse_depth_tf = new JTextField( 3 );
+        _rank_collapse_depth_tf.setToolTipText( "the current taxonomic rank threshold" );
+        _rank_collapse_depth_tf.setEditable( false );
+        if ( !getConfiguration().isUseNativeUI() ) {
+            _rank_collapse_depth_tf.setForeground( getConfiguration().getGuiMenuBackgroundColor() );
+            _rank_collapse_depth_tf.setBackground( getConfiguration().getGuiCheckboxTextColor() );
+            _rank_collapse_depth_tf.setBorder( null );
         }
-        if ( _configuration.doDisplayOption( Configuration.write_events ) ) {
-            addCheckbox( Configuration.write_events, _configuration.getDisplayTitle( Configuration.write_events ) );
-            setCheckbox( Configuration.write_events, _configuration.doCheckOption( Configuration.write_events ) );
+        final JPanel panel = new JPanel( new GridLayout( 1, 3, 0, 0 ) );
+        if ( !_configuration.isUseNativeUI() ) {
+            panel.setBackground( getBackground() );
         }
-        if ( _configuration.doDisplayOption( Configuration.show_vector_data ) ) {
-            addCheckbox( Configuration.show_vector_data,
-                         _configuration.getDisplayTitle( Configuration.show_vector_data ) );
-            setCheckbox( Configuration.show_vector_data, _configuration.doCheckOption( Configuration.show_vector_data ) );
+        add( panel );
+        addJButton( _decr_rank_collapse_level, panel );
+        addJTextField( _rank_collapse_depth_tf, panel );
+        addJButton( _incr_rank_collapse_level, panel );
+    }
+
+    void setupSearchTools0() {
+        final JLabel search_label = new JLabel( "Search (A):" );
+        search_label.setFont( ControlPanel.jcb_bold_font );
+        if ( !getConfiguration().isUseNativeUI() ) {
+            search_label.setForeground( getConfiguration().getGuiCheckboxTextColor() );
         }
-        if ( _configuration.doDisplayOption( Configuration.show_properties ) ) {
-            addCheckbox( Configuration.show_properties, _configuration.getDisplayTitle( Configuration.show_properties ) );
-            setCheckbox( Configuration.show_properties, _configuration.doCheckOption( Configuration.show_properties ) );
+        add( search_label );
+        search_label.setToolTipText( SEARCH_TIP_TEXT );
+        _search_found_label_0 = new JLabel();
+        getSearchFoundCountsLabel0().setVisible( false );
+        _search_found_label_0.setFont( ControlPanel.jcb_bold_font );
+        if ( !getConfiguration().isUseNativeUI() ) {
+            _search_found_label_0.setForeground( getConfiguration().getGuiCheckboxTextColor() );
         }
+        _search_tf_0 = new JTextField( 3 );
+        _search_tf_0.setToolTipText( SEARCH_TIP_TEXT );
+        _search_tf_0.setEditable( true );
+        if ( !getConfiguration().isUseNativeUI() ) {
+            _search_tf_0.setForeground( getConfiguration().getGuiMenuBackgroundColor() );
+            _search_tf_0.setBackground( getConfiguration().getGuiCheckboxTextColor() );
+            _search_tf_0.setBorder( null );
+        }
+        _search_reset_button_0 = new JButton();
+        getSearchResetButton0().setText( "Reset" );
+        getSearchResetButton0().setEnabled( false );
+        getSearchResetButton0().setVisible( false );
+        final JPanel s_panel_1 = new JPanel( new BorderLayout() );
+        final JPanel s_panel_2 = new JPanel( new GridLayout( 1, 2, 0, 0 ) );
+        s_panel_1.setBackground( getBackground() );
+        add( s_panel_1 );
+        s_panel_2.setBackground( getBackground() );
+        add( s_panel_2 );
+        final KeyAdapter key_adapter = new KeyAdapter() {
+
+            @Override
+            public void keyReleased( final KeyEvent key_event ) {
+                search0();
+                displayedPhylogenyMightHaveChanged( true );
+            }
+        };
+        final ActionListener action_listener = new ActionListener() {
+
+            @Override
+            public void actionPerformed( final ActionEvent e ) {
+                searchReset0();
+                setSearchFoundCountsOnLabel0( 0 );
+                getSearchFoundCountsLabel0().setVisible( false );
+                getSearchTextField0().setText( "" );
+                getSearchResetButton0().setEnabled( false );
+                getSearchResetButton0().setVisible( false );
+                displayedPhylogenyMightHaveChanged( true );
+            }
+        };
+        _search_reset_button_0.addActionListener( action_listener );
+        _search_tf_0.addKeyListener( key_adapter );
+        addJTextField( _search_tf_0, s_panel_1 );
+        s_panel_2.add( _search_found_label_0 );
+        addJButton( _search_reset_button_0, s_panel_2 );
     }
 
-    void setupSearchTools() {
-        final String tip = "Enter text to search for. Use ',' for multiple searches (logical OR) and '+' for logical AND.";
-        final JLabel search_label = new JLabel( "Search:" );
+    void setupSearchTools1() {
+        final JLabel search_label = new JLabel( "Search (B):" );
         search_label.setFont( ControlPanel.jcb_bold_font );
         if ( !getConfiguration().isUseNativeUI() ) {
             search_label.setForeground( getConfiguration().getGuiCheckboxTextColor() );
         }
         add( search_label );
-        search_label.setToolTipText( tip );
-        _search_found_label = new JLabel();
-        getSearchFoundCountsLabel().setVisible( false );
-        _search_found_label.setFont( ControlPanel.jcb_bold_font );
+        search_label.setToolTipText( SEARCH_TIP_TEXT );
+        _search_found_label_1 = new JLabel();
+        getSearchFoundCountsLabel1().setVisible( false );
+        _search_found_label_1.setFont( ControlPanel.jcb_bold_font );
         if ( !getConfiguration().isUseNativeUI() ) {
-            _search_found_label.setForeground( getConfiguration().getGuiCheckboxTextColor() );
+            _search_found_label_1.setForeground( getConfiguration().getGuiCheckboxTextColor() );
         }
-        _search_tf = new JTextField( 3 );
-        _search_tf.setToolTipText( tip );
-        _search_tf.setEditable( true );
+        _search_tf_1 = new JTextField( 3 );
+        _search_tf_1.setToolTipText( SEARCH_TIP_TEXT );
+        _search_tf_1.setEditable( true );
         if ( !getConfiguration().isUseNativeUI() ) {
-            _search_tf.setForeground( getConfiguration().getGuiMenuBackgroundColor() );
-            _search_tf.setBackground( getConfiguration().getGuiCheckboxTextColor() );
-            _search_tf.setBorder( null );
-        }
-        _search_reset_button = new JButton();
-        getSearchResetButton().setText( "Reset" );
-        getSearchResetButton().setEnabled( false );
-        getSearchResetButton().setVisible( false );
+            _search_tf_1.setForeground( getConfiguration().getGuiMenuBackgroundColor() );
+            _search_tf_1.setBackground( getConfiguration().getGuiCheckboxTextColor() );
+            _search_tf_1.setBorder( null );
+        }
+        _search_reset_button_1 = new JButton();
+        getSearchResetButton1().setText( "Reset" );
+        getSearchResetButton1().setEnabled( false );
+        getSearchResetButton1().setVisible( false );
         final JPanel s_panel_1 = new JPanel( new BorderLayout() );
         final JPanel s_panel_2 = new JPanel( new GridLayout( 1, 2, 0, 0 ) );
         s_panel_1.setBackground( getBackground() );
@@ -1633,7 +2381,7 @@ final class ControlPanel extends JPanel implements ActionListener {
 
             @Override
             public void keyReleased( final KeyEvent key_event ) {
-                search();
+                search1();
                 displayedPhylogenyMightHaveChanged( true );
             }
         };
@@ -1641,65 +2389,173 @@ final class ControlPanel extends JPanel implements ActionListener {
 
             @Override
             public void actionPerformed( final ActionEvent e ) {
-                searchReset();
-                setSearchFoundCountsOnLabel( 0 );
-                getSearchFoundCountsLabel().setVisible( false );
-                getSearchTextField().setText( "" );
-                getSearchResetButton().setEnabled( false );
-                getSearchResetButton().setVisible( false );
+                searchReset1();
+                setSearchFoundCountsOnLabel1( 0 );
+                getSearchFoundCountsLabel1().setVisible( false );
+                getSearchTextField1().setText( "" );
+                getSearchResetButton1().setEnabled( false );
+                getSearchResetButton1().setVisible( false );
                 displayedPhylogenyMightHaveChanged( true );
             }
         };
-        _search_reset_button.addActionListener( action_listener );
-        _search_tf.addKeyListener( key_adapter );
-        addJTextField( _search_tf, s_panel_1 );
-        s_panel_2.add( _search_found_label );
-        addJButton( _search_reset_button, s_panel_2 );
+        _search_reset_button_1.addActionListener( action_listener );
+        _search_tf_1.addKeyListener( key_adapter );
+        addJTextField( _search_tf_1, s_panel_1 );
+        s_panel_2.add( _search_found_label_1 );
+        addJButton( _search_reset_button_1, s_panel_2 );
     }
 
-    private void setVisibilityOfDomainStrucureControls() {
-        if ( _zoom_in_domain_structure != null ) {
-            if ( isShowDomainArchitectures() ) {
-                _domain_display_label.setVisible( true );
-                _zoom_in_domain_structure.setVisible( true );
-                _zoom_out_domain_structure.setVisible( true );
-                _decr_domain_structure_evalue_thr.setVisible( true );
-                _incr_domain_structure_evalue_thr.setVisible( true );
-                _domain_structure_evalue_thr_tf.setVisible( true );
+    void setVisibilityOfDomainStrucureCB() {
+        try {
+            if ( ( getCurrentTreePanel() != null ) && ( ( getCurrentTreePanel()
+                    .getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.CIRCULAR )
+                    || ( getCurrentTreePanel().getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.UNROOTED ) ) ) {
+                if ( getMainPanel().getMainFrame()._right_line_up_domains_cbmi != null ) {
+                    getMainPanel().getMainFrame()._right_line_up_domains_cbmi.setVisible( false );
+                }
+                if ( getMainPanel().getMainFrame()._show_domain_labels != null ) {
+                    getMainPanel().getMainFrame()._show_domain_labels.setVisible( false );
+                }
+            }
+            else if ( isShowDomainArchitectures() ) {
+                if ( getMainPanel().getMainFrame()._right_line_up_domains_cbmi != null ) {
+                    getMainPanel().getMainFrame()._right_line_up_domains_cbmi.setVisible( true );
+                }
+                if ( getMainPanel().getMainFrame()._show_domain_labels != null ) {
+                    getMainPanel().getMainFrame()._show_domain_labels.setVisible( true );
+                }
+            }
+            else {
+                if ( getMainPanel().getMainFrame()._right_line_up_domains_cbmi != null ) {
+                    getMainPanel().getMainFrame()._right_line_up_domains_cbmi.setVisible( false );
+                }
+                if ( getMainPanel().getMainFrame()._show_domain_labels != null ) {
+                    getMainPanel().getMainFrame()._show_domain_labels.setVisible( false );
+                }
+            }
+        }
+        catch ( final Exception ignore ) {
+            //not important...
+        }
+    }
+
+    void setVisibilityOfX() {
+        final MainFrame mf = getMainFrame();
+        if ( mf != null ) {
+            if ( ( getCurrentTreePanel() != null ) && ( getCurrentTreePanel().getPhylogeny() != null ) ) {
+                if ( AptxUtil.isHasAtLeastOneBranchWithSupportSD( getCurrentTreePanel().getPhylogeny() ) ) {
+                    if ( mf._show_confidence_stddev_cbmi != null ) {
+                        mf._show_confidence_stddev_cbmi.setVisible( true );
+                    }
+                }
+                else {
+                    if ( mf._show_confidence_stddev_cbmi != null ) {
+                        mf._show_confidence_stddev_cbmi.setVisible( false );
+                    }
+                }
+                if ( AptxUtil.isHasAtLeastOneNodeWithScientificName( getCurrentTreePanel().getPhylogeny() ) ) {
+                    if ( mf._abbreviate_scientific_names != null ) {
+                        mf._abbreviate_scientific_names.setVisible( true );
+                    }
+                }
+                else {
+                    if ( mf._abbreviate_scientific_names != null ) {
+                        mf._abbreviate_scientific_names.setVisible( false );
+                    }
+                }
+                if ( AptxUtil.isHasAtLeastOneNodeWithSequenceAnnotation( getCurrentTreePanel().getPhylogeny() ) ) {
+                    if ( mf._show_annotation_ref_source != null ) {
+                        mf._show_annotation_ref_source.setVisible( true );
+                    }
+                }
+                else {
+                    if ( mf._show_annotation_ref_source != null ) {
+                        mf._show_annotation_ref_source.setVisible( false );
+                    }
+                }
+            }
+            if ( isDrawPhylogram() || ( ( getCurrentTreePanel() != null ) && ( ( getCurrentTreePanel()
+                    .getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.CIRCULAR )
+                    || ( getCurrentTreePanel().getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.UNROOTED ) ) ) ) {
+                if ( mf._non_lined_up_cladograms_rbmi != null ) {
+                    mf._non_lined_up_cladograms_rbmi.setVisible( false );
+                }
+                if ( mf._ext_node_dependent_cladogram_rbmi != null ) {
+                    mf._ext_node_dependent_cladogram_rbmi.setVisible( false );
+                }
+            }
+            else {
+                if ( mf._non_lined_up_cladograms_rbmi != null ) {
+                    mf._non_lined_up_cladograms_rbmi.setVisible( true );
+                }
+                if ( mf._ext_node_dependent_cladogram_rbmi != null ) {
+                    mf._ext_node_dependent_cladogram_rbmi.setVisible( true );
+                }
+            }
+            if ( isDrawPhylogram() ) {
+                if ( mf._show_scale_cbmi != null ) {
+                    mf._show_scale_cbmi.setVisible( true );
+                }
             }
             else {
-                _domain_display_label.setVisible( false );
-                _zoom_in_domain_structure.setVisible( false );
-                _zoom_out_domain_structure.setVisible( false );
-                _decr_domain_structure_evalue_thr.setVisible( false );
-                _incr_domain_structure_evalue_thr.setVisible( false );
-                _domain_structure_evalue_thr_tf.setVisible( false );
+                if ( mf._show_scale_cbmi != null ) {
+                    mf._show_scale_cbmi.setVisible( false );
+                }
             }
+            if ( getCurrentTreePanel() != null ) {
+                if ( ( getCurrentTreePanel().getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.CIRCULAR )
+                        || ( getCurrentTreePanel().getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.UNROOTED ) ) {
+                    if ( mf._label_direction_cbmi != null ) {
+                        mf._label_direction_cbmi.setVisible( true );
+                    }
+                }
+                else {
+                    if ( mf._label_direction_cbmi != null ) {
+                        mf._label_direction_cbmi.setVisible( false );
+                    }
+                }
+            }
+        }
+    }
+
+    void showAnnotations() {
+        if ( _show_annotation != null ) {
+            _show_annotation.setSelected( true );
+        }
+        if ( _color_according_to_annotation != null ) {
+            _color_according_to_annotation.setSelected( true );
+        }
+        if ( _color_acc_species != null ) {
+            _color_acc_species.setSelected( false );
+        }
+        if ( _color_acc_sequence != null ) {
+            _color_acc_sequence.setSelected( false );
         }
+        _mainpanel.getCurrentTreePanel().repaint();
     }
 
     /**
      * Fit entire tree into window.
      */
-    void showWhole() {
-        if ( _mainpanel.getCurrentScrollPane() == null ) {
+    public void showWhole() {
+        if ( ( _mainpanel.getCurrentScrollPane() == null )
+                || _mainpanel.getCurrentTreePanel().getPhylogeny().isEmpty() ) {
             return;
         }
-        displayedPhylogenyMightHaveChanged( false );
+        getCurrentTreePanel().updateSetOfCollapsedExternalNodes();
+        displayedPhylogenyMightHaveChanged( true );
         _mainpanel.getCurrentTreePanel().updateOvSettings();
         _mainpanel.getCurrentTreePanel().validate();
         _mainpanel.validate();
-        _mainpanel.getCurrentTreePanel().setParametersForPainting( _mainpanel.getSizeOfViewport().width,
-                                                                   _mainpanel.getSizeOfViewport().height,
-                                                                   true );
+        _mainpanel.getCurrentTreePanel().calcParametersForPainting( _mainpanel.getSizeOfViewport().width,
+                                                                    _mainpanel.getSizeOfViewport().height );
         _mainpanel.getCurrentTreePanel().resetPreferredSize();
         _mainpanel.adjustJScrollPane();
         _mainpanel.getCurrentTreePanel().repaint();
         _mainpanel.getCurrentTreePanel().validate();
         _mainpanel.validate();
-        _mainpanel.getCurrentTreePanel().setParametersForPainting( _mainpanel.getSizeOfViewport().width,
-                                                                   _mainpanel.getSizeOfViewport().height,
-                                                                   true );
+        _mainpanel.getCurrentTreePanel().calcParametersForPainting( _mainpanel.getSizeOfViewport().width,
+                                                                    _mainpanel.getSizeOfViewport().height );
         _mainpanel.getCurrentTreePanel().resetPreferredSize();
         _mainpanel.adjustJScrollPane();
         _mainpanel.getCurrentTreePanel().repaint();
@@ -1710,9 +2566,8 @@ final class ControlPanel extends JPanel implements ActionListener {
         for( final TreePanel tree_panel : _mainpanel.getTreePanels() ) {
             if ( tree_panel != null ) {
                 tree_panel.validate();
-                tree_panel.setParametersForPainting( _mainpanel.getSizeOfViewport().width,
-                                                     _mainpanel.getSizeOfViewport().height,
-                                                     true );
+                tree_panel.calcParametersForPainting( _mainpanel.getSizeOfViewport().width,
+                                                      _mainpanel.getSizeOfViewport().height );
                 tree_panel.resetPreferredSize();
                 tree_panel.repaint();
             }
@@ -1726,7 +2581,7 @@ final class ControlPanel extends JPanel implements ActionListener {
         add( spacer );
         _click_to_label = new JLabel( "Click on Node to:" );
         add( customizeLabel( _click_to_label, getConfiguration() ) );
-        _click_to_combobox = new JComboBox();
+        _click_to_combobox = new JComboBox<String>();
         _click_to_combobox.setFocusable( false );
         _click_to_combobox.setMaximumRowCount( 14 );
         _click_to_combobox.setFont( ControlPanel.js_font );
@@ -1747,28 +2602,27 @@ final class ControlPanel extends JPanel implements ActionListener {
             if ( getCurrentTreePanel().isPhyHasBranchLengths()
                     && ( getCurrentTreePanel().getPhylogenyGraphicsType() != PHYLOGENY_GRAPHICS_TYPE.CIRCULAR ) ) {
                 setDrawPhylogramEnabled( true );
-                setDrawPhylogram( isDrawPhylogram() );
+                setTreeDisplayType( getTreeDisplayType( getMainPanel().getCurrentTabIndex() ) );
             }
             else {
                 setDrawPhylogramEnabled( false );
-                setDrawPhylogram( false );
-            }
-            if ( getMainPanel().getMainFrame() == null ) {
-                // Must be "E" applet version.
-                final ArchaeopteryxE e = ( ArchaeopteryxE ) ( ( MainPanelApplets ) getMainPanel() ).getApplet();
-                e.setSelectedTypeInTypeMenu( e.getCurrentTreePanel().getPhylogenyGraphicsType() );
-            }
-            else {
-                getMainPanel().getMainFrame().setSelectedTypeInTypeMenu( getMainPanel().getCurrentTreePanel()
-                        .getPhylogenyGraphicsType() );
+                setTreeDisplayType( Options.PHYLOGENY_DISPLAY_TYPE.CLADOGRAM );
             }
+            getMainPanel().getMainFrame()
+                    .setSelectedTypeInTypeMenu( getMainPanel().getCurrentTreePanel().getPhylogenyGraphicsType() );
             getMainPanel().getCurrentTreePanel().updateSubSuperTreeButton();
-            getMainPanel().getControlPanel().search();
+            getMainPanel().getCurrentTreePanel().updateButtonToUncollapseAll();
+            getMainPanel().getControlPanel().search0();
+            getMainPanel().getControlPanel().search1();
+            getMainPanel().getControlPanel().updateDomainStructureEvaluethresholdDisplay();
+            getMainPanel().getControlPanel().updateDepthCollapseDepthDisplay();
+            getMainPanel().getControlPanel().updateRankCollapseRankDisplay();
             getSequenceRelationTypeBox().removeAllItems();
             for( final SequenceRelation.SEQUENCE_RELATION_TYPE type : getMainPanel().getCurrentPhylogeny()
                     .getRelevantSequenceRelationTypes() ) {
                 _sequence_relation_type_box.addItem( type );
             }
+            getMainPanel().getCurrentTreePanel().repaint();
             //setSequenceRelationQueries( getMainPanel().getCurrentPhylogeny().getSequenceRelationQueries() );
             // according to GUILHEM the line above can be removed.
         }
@@ -1777,23 +2631,100 @@ final class ControlPanel extends JPanel implements ActionListener {
     /**
      * Uncollapse all nodes.
      */
-    void uncollapseAll( final TreePanel tp ) {
+    final void uncollapseAll( final TreePanel tp ) {
         final Phylogeny t = tp.getPhylogeny();
         if ( ( t != null ) && !t.isEmpty() ) {
-            t.setAllNodesToNotCollapse();
+            for( final PhylogenyNodeIterator iter = t.iteratorPreorder(); iter.hasNext(); ) {
+                final PhylogenyNode node = iter.next();
+                node.setCollapse( false );
+            }
+            tp.resetNodeIdToDistToLeafMap();
+            tp.updateSetOfCollapsedExternalNodes();
             t.recalculateNumberOfExternalDescendants( false );
+            tp.setNodeInPreorderToNull();
+            t.clearHashIdToNodeMap();
+            tp.resetDepthCollapseDepthValue();
+            tp.resetRankCollapseRankValue();
             showWhole();
         }
     }
 
-    void updateDomainStructureEvaluethresholdDisplay() {
+    final void updateDomainStructureEvaluethresholdDisplay() {
         if ( _domain_structure_evalue_thr_tf != null ) {
-            _domain_structure_evalue_thr_tf.setText( "10^"
-                    + getMainPanel().getCurrentTreePanel().getDomainStructureEvalueThreshold() );
+            _domain_structure_evalue_thr_tf
+                    .setText( "10^" + getMainPanel().getCurrentTreePanel().getDomainStructureEvalueThresholdExp() );
+        }
+    }
+
+    private final String obtainDepthCollapseDepthValue() {
+        if ( getMainPanel().getCurrentTreePanel() == null ) {
+            return "";
+        }
+        final TreePanel tp = getMainPanel().getCurrentTreePanel();
+        final Phylogeny p = tp.getPhylogeny();
+        if ( ( p == null ) || ( p.getNumberOfExternalNodes() < 3 ) ) {
+            return "off";
+        }
+        else if ( tp.getDepthCollapseDepthValue() < 0 ) {
+            tp.setDepthCollapseDepthValue( PhylogenyMethods.calculateMaxDepth( p ) );
+            return "off";
+        }
+        else if ( tp.getDepthCollapseDepthValue() == PhylogenyMethods.calculateMaxDepth( p ) ) {
+            return "off";
+        }
+        return String.valueOf( tp.getDepthCollapseDepthValue() );
+    }
+
+    private final String obtainRankCollapseDepthValue() {
+        if ( getMainPanel().getCurrentTreePanel() == null ) {
+            return "";
+        }
+        final TreePanel tp = getMainPanel().getCurrentTreePanel();
+        final Phylogeny p = tp.getPhylogeny();
+        if ( ( p == null ) || ( p.getNumberOfExternalNodes() < 3 ) ) {
+            return "off";
+        }
+        else {
+            final String ranks[] = PhylogenyMethods.obtainPresentRanksSorted( p );
+            if ( ranks.length < 1 ) {
+                return "off";
+            }
+            else if ( tp.getRankCollapseRankValue() < 0 ) {
+                tp.setRankCollapseRankValue( ranks.length - 1 );
+                return "off";
+            }
+            else if ( tp.getRankCollapseRankValue() == ( ranks.length - 1 ) ) {
+                return "off";
+            }
         }
+        return String.valueOf( tp.getRankCollapseRankValue() );
     }
 
-    void zoomInX( final float factor, final float x_correction_factor ) {
+    final void updateDepthCollapseDepthDisplay() {
+        if ( _depth_collapse_depth_tf != null ) {
+            _depth_collapse_depth_tf.setText( " " + obtainDepthCollapseDepthValue() );
+        }
+    }
+
+    final void updateRankCollapseRankDisplay() {
+        if ( _rank_collapse_depth_tf != null ) {
+            final String r = obtainRankCollapseDepthValue();
+            if ( r.equals( "off" ) ) {
+                _rank_collapse_depth_tf.setText( " off" );
+                _rank_collapse_depth_tf.setToolTipText( "the current taxonomic rank threshold" );
+            }
+            else {
+                final String ranks[] = PhylogenyMethods
+                        .obtainPresentRanksSorted( getMainPanel().getCurrentTreePanel().getPhylogeny() );
+                final int rr = Integer.parseInt( r );
+                _rank_collapse_depth_tf.setText( ranks[ rr ] );
+                _rank_collapse_depth_tf.setToolTipText( ( rr + 1 ) + "/" + ( ranks.length - 1 ) + ": "
+                        + ranks[ Integer.parseInt( r ) ] );
+            }
+        }
+    }
+
+    final void zoomInX( final float factor, final float x_correction_factor ) {
         final JScrollBar sb = getMainPanel().getCurrentScrollPane().getHorizontalScrollBar();
         final TreePanel treepanel = getMainPanel().getCurrentTreePanel();
         treepanel.multiplyUrtFactor( 1f );
@@ -1801,14 +2732,15 @@ final class ControlPanel extends JPanel implements ActionListener {
                 || ( treepanel.getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.UNROOTED )
                 || isDrawPhylogram( getMainPanel().getCurrentTabIndex() )
                 || ( getOptions().getCladogramType() == CLADOGRAM_TYPE.NON_LINED_UP ) ) {
-            final double x = ( sb.getMaximum() - sb.getMinimum() ) / ( sb.getValue() + ( sb.getVisibleAmount() / 2.0 ) );
+            final double x = ( sb.getMaximum() - sb.getMinimum() )
+                    / ( sb.getValue() + ( sb.getVisibleAmount() / 2.0 ) );
             treepanel.setXdistance( ( treepanel.getXdistance() * factor ) );
             treepanel.setXcorrectionFactor( ( treepanel.getXcorrectionFactor() * x_correction_factor ) );
             getMainPanel().adjustJScrollPane();
             treepanel.resetPreferredSize();
             getMainPanel().getCurrentScrollPane().getViewport().validate();
-            sb.setValue( ForesterUtil.roundToInt( ( ( sb.getMaximum() - sb.getMinimum() ) / x )
-                    - ( sb.getVisibleAmount() / 2.0 ) ) );
+            sb.setValue( ForesterUtil
+                    .roundToInt( ( ( sb.getMaximum() - sb.getMinimum() ) / x ) - ( sb.getVisibleAmount() / 2.0 ) ) );
         }
         else {
             final int x = sb.getMaximum() - sb.getMinimum() - sb.getVisibleAmount() - sb.getValue();
@@ -1823,7 +2755,7 @@ final class ControlPanel extends JPanel implements ActionListener {
         treepanel.updateOvSizes();
     }
 
-    void zoomInY( final float factor ) {
+    final void zoomInY( final float factor ) {
         final JScrollBar sb = getMainPanel().getCurrentScrollPane().getVerticalScrollBar();
         final TreePanel treepanel = getMainPanel().getCurrentTreePanel();
         treepanel.multiplyUrtFactor( 1.1f );
@@ -1832,13 +2764,13 @@ final class ControlPanel extends JPanel implements ActionListener {
         getMainPanel().adjustJScrollPane();
         treepanel.resetPreferredSize();
         getMainPanel().getCurrentScrollPane().getViewport().validate();
-        sb.setValue( ForesterUtil.roundToInt( ( ( sb.getMaximum() - sb.getMinimum() ) / x )
-                - ( sb.getVisibleAmount() / 2.0 ) ) );
+        sb.setValue( ForesterUtil
+                .roundToInt( ( ( sb.getMaximum() - sb.getMinimum() ) / x ) - ( sb.getVisibleAmount() / 2.0 ) ) );
         treepanel.resetPreferredSize();
         treepanel.updateOvSizes();
     }
 
-    void zoomOutX( final float factor, final float x_correction_factor ) {
+    final void zoomOutX( final float factor, final float x_correction_factor ) {
         final TreePanel treepanel = getMainPanel().getCurrentTreePanel();
         treepanel.multiplyUrtFactor( 1f );
         if ( ( treepanel.getXdistance() * factor ) > 0.0 ) {
@@ -1876,24 +2808,31 @@ final class ControlPanel extends JPanel implements ActionListener {
         }
     }
 
-    void zoomOutY( final float factor ) {
+    private final boolean isDrawPhylogram( int currentTabIndex ) {
+        Options.PHYLOGENY_DISPLAY_TYPE t = getTreeDisplayType( currentTabIndex );
+        return ( ( t == Options.PHYLOGENY_DISPLAY_TYPE.ALIGNED_PHYLOGRAM )
+                | ( t == Options.PHYLOGENY_DISPLAY_TYPE.UNALIGNED_PHYLOGRAM ) );
+    }
+
+    final void zoomOutY( final float factor ) {
         final TreePanel treepanel = getMainPanel().getCurrentTreePanel();
         treepanel.multiplyUrtFactor( 0.9f );
         if ( ( treepanel.getYdistance() * factor ) > 0.0 ) {
             final JScrollBar sb = getMainPanel().getCurrentScrollPane().getVerticalScrollBar();
-            final double x = ( sb.getMaximum() - sb.getMinimum() ) / ( sb.getValue() + ( sb.getVisibleAmount() / 2.0 ) );
+            final double x = ( sb.getMaximum() - sb.getMinimum() )
+                    / ( sb.getValue() + ( sb.getVisibleAmount() / 2.0 ) );
             treepanel.setYdistance( ( treepanel.getYdistance() * factor ) );
             getMainPanel().adjustJScrollPane();
             treepanel.resetPreferredSize();
             getMainPanel().getCurrentScrollPane().getViewport().validate();
-            sb.setValue( ForesterUtil.roundToInt( ( ( sb.getMaximum() - sb.getMinimum() ) / x )
-                    - ( sb.getVisibleAmount() / 2.0 ) ) );
+            sb.setValue( ForesterUtil
+                    .roundToInt( ( ( sb.getMaximum() - sb.getMinimum() ) / x ) - ( sb.getVisibleAmount() / 2.0 ) ) );
             treepanel.resetPreferredSize();
             treepanel.updateOvSizes();
         }
     }
 
-    static JLabel customizeLabel( final JLabel label, final Configuration configuration ) {
+    final static JLabel customizeLabel( final JLabel label, final Configuration configuration ) {
         label.setFont( ControlPanel.jcb_bold_font );
         if ( !configuration.isUseNativeUI() ) {
             label.setForeground( configuration.getGuiCheckboxTextColor() );
@@ -1902,21 +2841,17 @@ final class ControlPanel extends JPanel implements ActionListener {
         return label;
     }
 
-    enum NodeClickAction {
-        SHOW_DATA,
-        COLLAPSE,
-        REROOT,
-        SUBTREE,
-        SWAP,
-        COLOR_SUBTREE,
-        OPEN_TAX_WEB,
-        OPEN_SEQ_WEB,
-        CUT_SUBTREE,
-        COPY_SUBTREE,
-        DELETE_NODE_OR_SUBTREE,
-        PASTE_SUBTREE,
-        ADD_NEW_NODE,
-        EDIT_NODE_DATA,
-        BLAST;
+    final public JCheckBox getUseBranchWidthsCb() {
+        return _width_branches;
+    }
+
+    public Options.PHYLOGENY_DISPLAY_TYPE getTreeDisplayType() {
+        if ( _display_as_unaligned_phylogram_rb.isSelected() ) {
+            return Options.PHYLOGENY_DISPLAY_TYPE.UNALIGNED_PHYLOGRAM;
+        }
+        else if ( _display_as_aligned_phylogram_rb.isSelected() ) {
+            return Options.PHYLOGENY_DISPLAY_TYPE.ALIGNED_PHYLOGRAM;
+        }
+        return Options.PHYLOGENY_DISPLAY_TYPE.CLADOGRAM;
     }
 }