in progress

diff --git a/forester/java/src/org/forester/archaeopteryx/Constants.java b/forester/java/src/org/forester/archaeopteryx/Constants.java
index 1f8e21e..27b1f7a 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/Constants.java
+++ b/forester/java/src/org/forester/archaeopteryx/Constants.java
@@ -42,8 +42,8 @@ public final class Constants {
     public final static boolean __SYNTH_LF                                                    = false;                                                               // TODO remove me
     public final static boolean ALLOW_DDBJ_BLAST                                              = false;
     public final static String  PRG_NAME                                                      = "Archaeopteryx";
-    final static String         VERSION                                                       = "0.9892 beta";
-    final static String         PRG_DATE                                                      = "140623";
+    final static String         VERSION                                                       = "0.9893 beta";
+    final static String         PRG_DATE                                                      = "140730";
     final static String         DEFAULT_CONFIGURATION_FILE_NAME                               = "_aptx_configuration_file";
     final static String[]       DEFAULT_FONT_CHOICES                                          = { "Arial", "Helvetica",
             "Verdana", "Tahoma", "Dialog", "Lucida Sans", "SansSerif", "Sans-serif", "Sans"  };

diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrame.java b/forester/java/src/org/forester/archaeopteryx/MainFrame.java
index 8bbedf1..28d0ae3 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/MainFrame.java
+++ b/forester/java/src/org/forester/archaeopteryx/MainFrame.java
@@ -165,8 +165,8 @@ public abstract class MainFrame extends JFrame implements ActionListener {
     JMenuItem                   _annotate_item;\r
     JMenuItem                   _remove_branch_color_item;\r
     JMenuItem                   _remove_visual_styles_item;\r
-    JMenuItem                   _deleted_selected_nodes_item;\r
-    JMenuItem                   _deleted_not_selected_nodes_item;\r
+    JMenuItem                   _delete_selected_nodes_item;\r
+    JMenuItem                   _delete_not_selected_nodes_item;\r
     // font size menu:\r
     JMenuItem                   _super_tiny_fonts_item;\r
     JMenuItem                   _tiny_fonts_item;\r
@@ -325,13 +325,13 @@ public abstract class MainFrame extends JFrame implements ActionListener {
             }\r
             midpointRoot();\r
         }\r
-        else if ( o == _deleted_selected_nodes_item ) {\r
+        else if ( o == _delete_selected_nodes_item ) {\r
             if ( isSubtreeDisplayed() ) {\r
                 return;\r
             }\r
             deleteSelectedNodes( true );\r
         }\r
-        else if ( o == _deleted_not_selected_nodes_item ) {\r
+        else if ( o == _delete_not_selected_nodes_item ) {\r
             if ( isSubtreeDisplayed() ) {\r
                 return;\r
             }\r
@@ -570,7 +570,6 @@ public abstract class MainFrame extends JFrame implements ActionListener {
         if ( delete ) {\r
             res = ext - todo;\r
         }\r
-        \r
         if ( res < 1 ) {\r
             JOptionPane.showMessageDialog( this,\r
                                            "Cannot delete all nodes",\r
@@ -578,9 +577,9 @@ public abstract class MainFrame extends JFrame implements ActionListener {
                                            JOptionPane.ERROR_MESSAGE );\r
             return;\r
         }\r
-        final int result = JOptionPane.showConfirmDialog( null, "OK to " + function.toLowerCase() + " " + todo\r
+        final int result = JOptionPane.showConfirmDialog( null, function + " " + todo\r
                 + " external node(s), from a total of " + ext + " external nodes," + "\nresulting in tree with " + res\r
-                + " nodes", function + " external nodes", JOptionPane.OK_CANCEL_OPTION );\r
+                + " nodes?", function + " external nodes", JOptionPane.OK_CANCEL_OPTION );\r
         if ( result == JOptionPane.OK_OPTION ) {\r
             if ( !delete ) {\r
                 final List<PhylogenyNode> to_delete = new ArrayList<PhylogenyNode>();\r

diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
index b688722..ab1f999 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
+++ b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
@@ -1077,10 +1077,13 @@ public final class MainFrameApplication extends MainFrame {
         _tools_menu.add( _midpoint_root_item = new JMenuItem( "Midpoint-Root" ) );\r
         customizeJMenuItem( _midpoint_root_item );\r
         _tools_menu.addSeparator();\r
-        _tools_menu.add( _deleted_selected_nodes_item = new JMenuItem( "Delete Selected Nodes" ) );\r
-        customizeJMenuItem( _deleted_selected_nodes_item );\r
-        _tools_menu.add( _deleted_not_selected_nodes_item = new JMenuItem( "Retain Selected Nodes" ) );\r
-        customizeJMenuItem( _deleted_not_selected_nodes_item );\r
+        _tools_menu.add( _delete_selected_nodes_item = new JMenuItem( "Delete Selected Nodes" ) );\r
+        _delete_selected_nodes_item.setToolTipText( "To delete all selected external nodes" );\r
+        customizeJMenuItem( _delete_selected_nodes_item );\r
+        _tools_menu.add( _delete_not_selected_nodes_item = new JMenuItem( "Retain Selected Nodes" ) );\r
+        _delete_not_selected_nodes_item.setToolTipText( "To delete all not selected external nodes" );\r
+        \r
+        customizeJMenuItem( _delete_not_selected_nodes_item );\r
         _tools_menu.addSeparator();\r
         _tools_menu.add( _collapse_species_specific_subtrees = new JMenuItem( "Collapse Species-Specific Subtrees" ) );\r
         customizeJMenuItem( _collapse_species_specific_subtrees );\r