JAL-2629 combine with/without defaults in one method call

[jalview.git] / src / jalview / jbgui / GAlignFrame.java

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 507bbc8..8226cee 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -1764,7 +1764,7 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        hmmBuildRun_actionPerformed();
+        hmmBuild_actionPerformed(true);
       }
     });
     hmmBuildSettings.setText(
@@ -1774,7 +1774,7 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        hmmBuildSettings_actionPerformed();
+        hmmBuild_actionPerformed(false);
       }
     });
     hmmAlignRun.setText(MessageManager.formatMessage(
@@ -1784,7 +1784,7 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        hmmAlignRun_actionPerformed();
+        hmmAlign_actionPerformed(true);
       }
     });
     hmmAlignSettings.setText(
@@ -1794,7 +1794,7 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        hmmAlignSettings_actionPerformed();
+        hmmAlign_actionPerformed(false);
       }
     });
     hmmSearchRun.setText(MessageManager.formatMessage(
@@ -1804,7 +1804,17 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        hmmSearchRun_actionPerformed();
+        hmmSearch_actionPerformed(true);
+      }
+    });
+    hmmSearchSettings.setText(
+            MessageManager.getString("label.edit_settings_and_run"));
+    hmmSearchSettings.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        hmmSearch_actionPerformed(false);
       }
     });
     addDatabase.setText(MessageManager.getString("label.add_database"));
@@ -1822,16 +1832,6 @@ public class GAlignFrame extends JInternalFrame
         }
       }
     });
-    hmmSearchSettings.setText(
-            MessageManager.getString("label.edit_settings_and_run"));
-    hmmSearchSettings.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        hmmSearchSettings_actionPerformed();
-      }
-    });
     selectHighlighted.addActionListener(al);
     JMenu tooltipSettingsMenu = new JMenu(
             MessageManager.getString("label.sequence_id_tooltip"));
@@ -2538,11 +2538,11 @@ public class GAlignFrame extends JInternalFrame
   {
   }
 
-  protected void hmmBuildRun_actionPerformed()
+  protected void hmmBuild_actionPerformed(boolean withDefaults)
   {
   }
 
-  protected void hmmSearchRun_actionPerformed()
+  protected void hmmSearch_actionPerformed(boolean withDefaults)
   {
   }
 
@@ -2551,19 +2551,7 @@ public class GAlignFrame extends JInternalFrame
   {
   }
 
-  protected void hmmAlignRun_actionPerformed()
-  {
-  }
-
-  protected void hmmBuildSettings_actionPerformed()
-  {
-  }
-
-  protected void hmmSearchSettings_actionPerformed()
-  {
-  }
-
-  protected void hmmAlignSettings_actionPerformed()
+  protected void hmmAlign_actionPerformed(boolean withDefaults)
   {
   }