JAL-2810 mainFramTabs -> tabs

[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 0c5ab11..5b8227f 100644 (file)
--- a/src/jalview/fts/core/GFTSPanel.java
+++ b/src/jalview/fts/core/GFTSPanel.java
@@ -33,7 +33,6 @@ import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -90,7 +89,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
   protected JInternalFrame mainFrame = new JInternalFrame(
           getFTSFrameTitle());
 
-  protected JTabbedPane mainFramTabs = new JTabbedPane();
+  protected JTabbedPane tabs = new JTabbedPane();
   protected IProgressIndicator progressIndicator;
 
   protected JComboBox<FTSDataColumnI> cmb_searchTarget = new JComboBox<FTSDataColumnI>();
@@ -253,13 +252,15 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
     {
       if (fetcher == null)
       {
-        mainFramTabs = null;
+        tabs = null;
       }
       jbInit();
       if (fetcher != null)
       {
-        mainFramTabs.addTab("Retrieve IDs", fetcher);
+        tabs.addTab(MessageManager.getString("label.retrieve_ids"),
+                fetcher);
         fetcher.setDatabaseChooserVisible(false);
+        fetcher.embedWithFTSPanel(this);
       }
       mainFrame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
       final JPanel ftsPanel = this;
@@ -269,8 +270,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
         public void focusGained(FocusEvent e)
         {
           // TODO: make selected tab gain focus in correct widget
-          if (mainFramTabs != null
-                  && mainFramTabs.getSelectedComponent() == ftsPanel)
+          if (tabs != null
+                  && tabs.getSelectedComponent() == ftsPanel)
           {
             txt_search.requestFocusInWindow();
           }
@@ -356,7 +357,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
       }
     });
 
-    btn_autosearch.setText("");
+    btn_autosearch.setText(MessageManager.getString("option.autosearch"));
     btn_autosearch.setToolTipText(
             MessageManager.getString("option.enable_disable_autosearch"));
     btn_back.setFont(new java.awt.Font("Verdana", 0, 12));
@@ -666,13 +667,12 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
     this.add(pnl_results, java.awt.BorderLayout.CENTER);
     this.add(pnl_actions, java.awt.BorderLayout.SOUTH);
     mainFrame.setVisible(true);
-    if (mainFramTabs != null)
+    if (tabs != null)
     {
-      mainFramTabs.setOpaque(true);
-      mainFramTabs.setBackground(Color.white);
-      mainFramTabs.insertTab("Free Text Search", null, this, "", 0);
-      mainFrame.setContentPane(mainFramTabs);
-      mainFramTabs.setVisible(true);
+      tabs.setOpaque(true);
+      tabs.insertTab("Free Text Search", null, this, "", 0);
+      mainFrame.setContentPane(tabs);
+      tabs.setVisible(true);
     }
     else
     {
@@ -837,7 +837,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
     }
   }
 
-  protected void btn_back_ActionPerformed()
+  public void btn_back_ActionPerformed()
   {
     closeAction();
     new SequenceFetcher(progressIndicator);
@@ -850,7 +850,7 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
     btn_cancel.setEnabled(false);
   }
 
-  protected void btn_cancel_ActionPerformed()
+  public void btn_cancel_ActionPerformed()
   {
     closeAction();
   }