JAL-4034 Fix #2 show an icon and a button to press to initiate search

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

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index 57beaee..c5488f0 100755 (executable)
--- a/src/jalview/jbgui/GFinder.java
+++ b/src/jalview/jbgui/GFinder.java
@@ -43,7 +43,6 @@ import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
-import javax.swing.text.JTextComponent;
 
 public class GFinder extends JPanel
 {
@@ -52,6 +51,12 @@ public class GFinder extends JPanel
 
   private static final String FINDER_CACHE_KEY = "CACHE.FINDER";
 
+  /*
+   * if more checkboxes are wanted, increase this value
+   * and add to centrePanel in jbInit()  
+   */
+  private static final int PANEL_ROWS = 4;
+
   protected JButton createFeatures;
 
   protected JvCacheableInputBox<String> searchBox;
@@ -96,13 +101,13 @@ public class GFinder extends JPanel
      */
     this.setLayout(new BorderLayout());
     JPanel eastPanel = new JPanel();
-    eastPanel.setLayout(new GridLayout(4, 1));
+    eastPanel.setLayout(new GridLayout(PANEL_ROWS, 1));
     this.add(eastPanel, BorderLayout.EAST);
     JPanel centrePanel = new JPanel();
-    centrePanel.setLayout(new GridLayout(4, 1));
+    centrePanel.setLayout(new GridLayout(PANEL_ROWS, 1));
     this.add(centrePanel, BorderLayout.CENTER);
     JPanel westPanel = new JPanel();
-    westPanel.setLayout(new GridLayout(4, 1));
+    westPanel.setLayout(new GridLayout(PANEL_ROWS, 1));
     this.add(westPanel, BorderLayout.WEST);
 
     /*
@@ -117,26 +122,24 @@ public class GFinder extends JPanel
      * search box
      */
     searchBox = new JvCacheableInputBox<>(FINDER_CACHE_KEY, 25);
-    searchBox.setFont(VERDANA_12);
-    ((JTextComponent) searchBox.getEditor().getEditorComponent())
-            .addCaretListener(new CaretListener()
-            {
-              @Override
-              public void caretUpdate(CaretEvent e)
-              {
-                textfield_caretUpdate();
-              }
-            });
-    searchBox.getEditor().getEditorComponent()
-            .addKeyListener(new KeyAdapter()
-            {
-              @Override
-              public void keyPressed(KeyEvent e)
-              {
-                textfield_keyPressed(e);
-              }
-            });
-    centrePanel.add(searchBox);
+    searchBox.getComponent().setFont(VERDANA_12);
+    searchBox.addCaretListener(new CaretListener()
+    {
+      @Override
+      public void caretUpdate(CaretEvent e)
+      {
+        textfield_caretUpdate();
+      }
+    });
+    searchBox.addKeyListener(new KeyAdapter()
+    {
+      @Override
+      public void keyPressed(KeyEvent e)
+      {
+        textfield_keyPressed(e);
+      }
+    });
+    centrePanel.add(searchBox.getComponent());
 
     /*
      * search options checkboxes
@@ -153,7 +156,7 @@ public class GFinder extends JPanel
     ignoreHidden.setText(MessageManager.getString("label.ignore_hidden"));
     ignoreHidden.setToolTipText(
             MessageManager.getString("label.ignore_hidden_tooltip"));
-    
+
     centrePanel.add(caseSensitive);
     centrePanel.add(searchDescription);
     centrePanel.add(ignoreHidden);