X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGFinder.java;h=eb4b9102b7fd8d422e066bc3c49f6d3bedd4a344;hb=7047b076a62df177047ceb16c3611efe020bdd76;hp=c335b33d376309a76eef6dfad6318b9214817e2f;hpb=136c0793b90b72b928c4d77dc109dd5c644e00d3;p=jalview.git

diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java
index c335b33..eb4b910 100755
--- 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
 {
@@ -59,7 +58,8 @@ public class GFinder extends JPanel
 
   protected JButton createFeatures = new JButton();
 
-  protected JvCacheableInputBox<String> searchBox = new JvCacheableInputBox<String>(getCacheKey());
+  protected JvCacheableInputBox<String> searchBox = new JvCacheableInputBox<String>(
+          getCacheKey());
 
   BorderLayout mainBorderLayout = new BorderLayout();
 
@@ -133,18 +133,17 @@ public class GFinder extends JPanel
         createFeatures_actionPerformed();
       }
     });
-    searchBox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 12));
-    ((JTextComponent) searchBox.getEditor().getEditorComponent())
-            .addCaretListener(new CaretListener()
-    {
-      @Override
-      public void caretUpdate(CaretEvent e)
-      {
-        textfield_caretUpdate(e);
-      }
-    });
-    searchBox.getEditor().getEditorComponent()
-            .addKeyListener(new java.awt.event.KeyAdapter()
+    searchBox.getComponent()
+            .setFont(new java.awt.Font("Verdana", Font.PLAIN, 12));
+    searchBox.addCaretListener(new CaretListener()
+            {
+              @Override
+              public void caretUpdate(CaretEvent e)
+              {
+                textfield_caretUpdate(e);
+              }
+            });
+    searchBox.addKeyListener(new java.awt.event.KeyAdapter()
             {
               @Override
               public void keyPressed(KeyEvent e)
@@ -160,18 +159,18 @@ public class GFinder extends JPanel
     caseSensitive.setHorizontalAlignment(SwingConstants.LEFT);
     caseSensitive.setText(MessageManager.getString("label.match_case"));
 
-    searchDescription.setText(MessageManager
-            .getString("label.include_description"));
+    searchDescription
+            .setText(MessageManager.getString("label.include_description"));
 
     actionsPanel.add(findNext, null);
     actionsPanel.add(findAll, null);
     actionsPanel.add(createFeatures, null);
     this.add(jLabelFind, java.awt.BorderLayout.WEST);
     this.add(actionsPanel, java.awt.BorderLayout.EAST);
-    this.add(jPanel2, java.awt.BorderLayout.SOUTH);
+    // this.add(jPanel2, java.awt.BorderLayout.SOUTH);
     this.add(jPanel3, java.awt.BorderLayout.NORTH);
     this.add(jPanel4, java.awt.BorderLayout.CENTER);
-    jPanel4.add(searchBox, java.awt.BorderLayout.NORTH);
+    jPanel4.add(searchBox.getComponent(), java.awt.BorderLayout.NORTH);
 
     JPanel optionsPanel = new JPanel();
 
@@ -205,7 +204,6 @@ public class GFinder extends JPanel
   {
   }
 
-
   public void createFeatures_actionPerformed()
   {
   }
@@ -231,8 +229,8 @@ public class GFinder extends JPanel
           if (al != null && al.getHeight() > 0)
           {
             str = jalview.analysis.AlignSeq.extractGaps(
-                    jalview.util.Comparison.GapChars, al.getSequenceAt(0)
-                            .getSequenceAsString());
+                    jalview.util.Comparison.GapChars,
+                    al.getSequenceAt(0).getSequenceAsString());
 
           }
         }
@@ -240,10 +238,6 @@ public class GFinder extends JPanel
     }
   }
 
-
-
-
-
   /**
    * Returns unique key used for storing Finder cache items in the cache data
    * structure
@@ -255,6 +249,4 @@ public class GFinder extends JPanel
     return FINDER_CACHE_KEY;
   }
 
-
-
 }