Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar

[jalview.git] / src / jalview / fts / core / GFTSPanel.java

diff --git a/src/jalview/fts/core/GFTSPanel.java b/src/jalview/fts/core/GFTSPanel.java
index 51363b2..0dccc0c 100644 (file)
--- a/src/jalview/fts/core/GFTSPanel.java
+++ b/src/jalview/fts/core/GFTSPanel.java
@@ -93,7 +93,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
   protected JInternalFrame mainFrame = new JInternalFrame(
           getFTSFrameTitle());
 
-  protected JTabbedPane tabs = jalview.jbgui.GDesktop.createTabbedPane();
+  protected JTabbedPane tabs = new JTabbedPane();
  
   protected IProgressIndicator progressIndicator;
 
@@ -136,7 +136,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
 
   protected JLabel lbl_blank = new JLabel(balnkPlaceholderImage);
 
-  JTabbedPane tabbedPane = jalview.jbgui.GDesktop.createTabbedPane();
+  JTabbedPane tabbedPane = new JTabbedPane();
 
   private JPanel pnl_actions = new JPanel();
 
@@ -297,7 +297,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
   private void jbInit() throws Exception
   {
 
-    txt_search = new JvCacheableInputBox<>(getCacheKey());
+    txt_search = new JvCacheableInputBox<>(getCacheKey(), 45);
     populateCmbSearchTargetOptions();
     Integer width = getTempUserPrefs().get("FTSPanel.width") == null ? 800
             : getTempUserPrefs().get("FTSPanel.width");
@@ -377,8 +377,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
     btn_autosearch.setText(MessageManager.getString("option.autosearch"));
     btn_autosearch.setToolTipText(
             MessageManager.getString("option.enable_disable_autosearch"));
-       btn_autosearch.setSelected(Platform.isJS() ? false : 
-               Cache.getDefault(getAutosearchPreference(), true));
+    btn_autosearch.setSelected(!Platform.isJS()
+            && Cache.getDefault(getAutosearchPreference(), true));
     btn_autosearch.addActionListener(new java.awt.event.ActionListener()
     {
       @Override