Reduced jar size by 20%

[jalview.git] / src / jalview / appletgui / Finder.java

diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java
index fcca0c1..f59216f 100755 (executable)
--- a/src/jalview/appletgui/Finder.java
+++ b/src/jalview/appletgui/Finder.java
@@ -26,7 +26,7 @@ import java.awt.event.*;
 \r
 import jalview.datamodel.*;\r
 \r
-public class Finder extends Panel\r
+public class Finder extends Panel implements ActionListener\r
 {\r
   AlignViewport av;\r
   AlignmentPanel ap;\r
@@ -62,37 +62,26 @@ public class Finder extends Panel
     });\r
   }\r
 \r
-  public void textfield_actionPerformed(ActionEvent e)\r
+  public void actionPerformed(ActionEvent evt)\r
   {\r
-    doSearch(false);\r
-  }\r
+    if (evt.getSource() == textfield)\r
+      doSearch(false);\r
 \r
-  public void findNext_actionPerformed(ActionEvent e)\r
-  {\r
-    doSearch(false);\r
-  }\r
-\r
-  public void findAll_actionPerformed(ActionEvent e)\r
-  {\r
-    resIndex = 0;\r
-    seqIndex = 0;\r
-    doSearch(true);\r
-  }\r
+    else if (evt.getSource() == findNext)\r
+      doSearch(false);\r
 \r
-  public void cancel_actionPerformed(ActionEvent e)\r
-  {\r
-    try\r
+    else if (evt.getSource() == findAll)\r
     {\r
-      // if allResults is null, this effectively switches displaySearch flag in seqCanvas\r
-      ap.highlightSearchResults(null);\r
-      ap.idPanel.highlightSearchResults(null);\r
-      // frame.setClosed(true);\r
+      resIndex = 0;\r
+      seqIndex = 0;\r
+      doSearch(true);\r
     }\r
-    catch (Exception ex)\r
-    {}\r
+    else if(evt.getSource() == createNewGroup)\r
+      createNewGroup_actionPerformed();\r
   }\r
 \r
-  public void createNewGroup_actionPerformed(ActionEvent e)\r
+\r
+  public void createNewGroup_actionPerformed()\r
   {\r
     Color[] newColors = new Color[24];\r
     for (int i = 0; i < 24; i++)\r
@@ -326,26 +315,14 @@ public class Finder extends Panel
                   textfield_keyTyped(e);\r
               }\r
           });\r
-      textfield.addActionListener(new java.awt.event.ActionListener() {\r
-              public void actionPerformed(ActionEvent e) {\r
-                  textfield_actionPerformed(e);\r
-              }\r
-          });\r
+      textfield.addActionListener(this);\r
       findAll.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));\r
       findAll.setLabel("Find all");\r
-      findAll.addActionListener(new java.awt.event.ActionListener() {\r
-              public void actionPerformed(ActionEvent e) {\r
-                  findAll_actionPerformed(e);\r
-              }\r
-          });\r
+      findAll.addActionListener(this);\r
       findNext.setEnabled(false);\r
       findNext.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));\r
       findNext.setLabel("Find Next");\r
-      findNext.addActionListener(new java.awt.event.ActionListener() {\r
-              public void actionPerformed(ActionEvent e) {\r
-                  findNext_actionPerformed(e);\r
-              }\r
-          });\r
+      findNext.addActionListener(this);\r
       jPanel1.setBounds(new Rectangle(180, 5, 141, 64));\r
       jPanel1.setLayout(gridLayout1);\r
       gridLayout1.setHgap(0);\r
@@ -354,11 +331,7 @@ public class Finder extends Panel
       createNewGroup.setEnabled(false);\r
       createNewGroup.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10));\r
       createNewGroup.setLabel("Create new group");\r
-      createNewGroup.addActionListener(new java.awt.event.ActionListener() {\r
-              public void actionPerformed(ActionEvent e) {\r
-                  createNewGroup_actionPerformed(e);\r
-              }\r
-          });\r
+      createNewGroup.addActionListener(this);\r
       jPanel1.add(findNext, null);\r
       jPanel1.add(findAll, null);\r
       jPanel1.add(createNewGroup, null);\r