X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FMainFrame.java;h=0866f1c9cbf20971536c98044704fd47acbc68ff;hb=30ea6e22e29814b611cf523d0b39b9e0197e63dc;hp=0f7fd20b5774673287f93d3921516b3aacedbaa4;hpb=b4d39d202d7162aed8a41f2e1c42ac81f91c9341;p=jalview.git

diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrame.java b/forester/java/src/org/forester/archaeopteryx/MainFrame.java
index 0f7fd20..0866f1c 100644
--- a/forester/java/src/org/forester/archaeopteryx/MainFrame.java
+++ b/forester/java/src/org/forester/archaeopteryx/MainFrame.java
@@ -65,8 +65,8 @@ import org.forester.phylogeny.PhylogenyMethods.DESCENDANT_SORT_PRIORITY;
 import org.forester.phylogeny.PhylogenyNode;
 import org.forester.phylogeny.PhylogenyNode.NH_CONVERSION_SUPPORT_VALUE_STYLE;
 import org.forester.phylogeny.data.Annotation;
-import org.forester.phylogeny.data.NodeVisualization.NodeFill;
-import org.forester.phylogeny.data.NodeVisualization.NodeShape;
+import org.forester.phylogeny.data.NodeVisualData.NodeFill;
+import org.forester.phylogeny.data.NodeVisualData.NodeShape;
 import org.forester.sdi.GSDI;
 import org.forester.sdi.GSDIR;
 import org.forester.sdi.SDIException;
@@ -140,7 +140,6 @@ public abstract class MainFrame extends JFrame implements ActionListener {
     JMenuItem                   _lineage_inference;
     // file menu:
     JMenuItem                   _open_item;
-    JMenuItem                   _open_url_item;
     JMenuItem                   _save_item;
     JMenuItem                   _save_all_item;
     JMenuItem                   _close_item;
@@ -192,7 +191,6 @@ public abstract class MainFrame extends JFrame implements ActionListener {
     JMenuItem                   _cycle_node_shape_mi;
     JMenuItem                   _cycle_node_fill_mi;
     JMenuItem                   _choose_node_size_mi;
-    JCheckBoxMenuItem           _taxonomy_colorize_node_shapes_cbmi;
     JCheckBoxMenuItem           _show_confidence_stddev_cbmi;
     // _  print
     JCheckBoxMenuItem           _graphics_export_visible_only_cbmi;
@@ -209,6 +207,7 @@ public abstract class MainFrame extends JFrame implements ActionListener {
     JRadioButtonMenuItem        _extract_taxonomy_pfam_strict_rbmi;
     JRadioButtonMenuItem        _extract_taxonomy_pfam_relaxed_rbmi;
     JCheckBoxMenuItem           _replace_underscores_cbmi;
+    JCheckBoxMenuItem           _allow_errors_in_distance_to_parent_cbmi;
     JCheckBoxMenuItem           _use_brackets_for_conf_in_nh_export_cbmi;
     JCheckBoxMenuItem           _use_internal_names_for_conf_in_nh_export_cbmi;
     // _  search
@@ -269,10 +268,7 @@ public abstract class MainFrame extends JFrame implements ActionListener {
                 applet = getCurrentTreePanel().obtainApplet();
             }
         }
-        if ( o == _open_url_item ) {
-            readPhylogeniesFromURL();
-        }
-        else if ( o == _exit_item ) {
+        if ( o == _exit_item ) {
             close();
         }
         else if ( o == _gsdi_item ) {
@@ -407,9 +403,6 @@ public abstract class MainFrame extends JFrame implements ActionListener {
         else if ( o == _show_default_node_shapes_external_cbmi ) {
             updateOptions( getOptions() );
         }
-        else if ( o == _taxonomy_colorize_node_shapes_cbmi ) {
-            updateOptions( getOptions() );
-        }
         else if ( o == _non_lined_up_cladograms_rbmi ) {
             updateOptions( getOptions() );
             showWhole();
@@ -424,15 +417,18 @@ public abstract class MainFrame extends JFrame implements ActionListener {
         }
         else if ( o == _search_case_senstive_cbmi ) {
             updateOptions( getOptions() );
-            getMainPanel().getControlPanel().search();
+            getMainPanel().getControlPanel().search0();
+            getMainPanel().getControlPanel().search1();
         }
         else if ( o == _search_whole_words_only_cbmi ) {
             updateOptions( getOptions() );
-            getMainPanel().getControlPanel().search();
+            getMainPanel().getControlPanel().search0();
+            getMainPanel().getControlPanel().search1();
         }
         else if ( o == _inverse_search_result_cbmi ) {
             updateOptions( getOptions() );
-            getMainPanel().getControlPanel().search();
+            getMainPanel().getControlPanel().search0();
+            getMainPanel().getControlPanel().search1();
         }
         else if ( o == _show_scale_cbmi ) {
             updateOptions( getOptions() );
@@ -594,10 +590,7 @@ public abstract class MainFrame extends JFrame implements ActionListener {
 
     void buildFileMenu() {
         _file_jmenu = createMenu( "File", getConfiguration() );
-        _file_jmenu.add( _open_url_item = new JMenuItem( "Read tree from URL/webservice..." ) );
-        _file_jmenu.addSeparator();
         _file_jmenu.add( _exit_item = new JMenuItem( "Exit" ) );
-        customizeJMenuItem( _open_url_item );
         customizeJMenuItem( _exit_item );
         _jmenubar.add( _file_jmenu );
     }
@@ -1147,8 +1140,6 @@ public abstract class MainFrame extends JFrame implements ActionListener {
         }
     }
 
-    abstract void readPhylogeniesFromURL();
-
     void readPhylogeniesFromWebservice( final int i ) {
         final UrlTreeReader reader = new UrlTreeReader( this, i );
         new Thread( reader ).start();
@@ -1280,8 +1271,6 @@ public abstract class MainFrame extends JFrame implements ActionListener {
                 && _show_default_node_shapes_internal_cbmi.isSelected() );
         options.setShowDefaultNodeShapesExternal( ( _show_default_node_shapes_external_cbmi != null )
                 && _show_default_node_shapes_external_cbmi.isSelected() );
-        options.setTaxonomyColorizeNodeShapes( ( _taxonomy_colorize_node_shapes_cbmi != null )
-                && _taxonomy_colorize_node_shapes_cbmi.isSelected() );
         if ( ( _non_lined_up_cladograms_rbmi != null ) && ( _non_lined_up_cladograms_rbmi.isSelected() ) ) {
             options.setCladogramType( CLADOGRAM_TYPE.NON_LINED_UP );
         }
@@ -1347,6 +1336,8 @@ public abstract class MainFrame extends JFrame implements ActionListener {
         }
         options.setReplaceUnderscoresInNhParsing( ( _replace_underscores_cbmi != null )
                 && _replace_underscores_cbmi.isSelected() );
+        options.setAllowErrorsInDistanceToParent( ( _allow_errors_in_distance_to_parent_cbmi != null )
+                && _allow_errors_in_distance_to_parent_cbmi.isSelected() );
         options.setMatchWholeTermsOnly( ( _search_whole_words_only_cbmi != null )
                 && _search_whole_words_only_cbmi.isSelected() );
         options.setInverseSearchResult( ( _inverse_search_result_cbmi != null )
@@ -1427,7 +1418,7 @@ public abstract class MainFrame extends JFrame implements ActionListener {
 
     private void annotateSequences() {
         if ( getCurrentTreePanel() != null ) {
-            final Set<Long> nodes = getCurrentTreePanel().getFoundNodes();
+            final Set<Long> nodes = getCurrentTreePanel().getFoundNodes0();
             if ( ( nodes == null ) || nodes.isEmpty() ) {
                 JOptionPane
                         .showMessageDialog( this,