From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 13 Nov 2017 11:53:27 +0000 (+0000)
Subject: JAL-2810 mainFramTabs -> tabs
X-Git-Tag: Release_2_10_3b1~39^2~3
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=fadadda1048287caa60c611d8bccc05ec6f370d2

JAL-2810 mainFramTabs -> tabs
---

diff --git a/src/jalview/fts/core/GFTSPanel.java b/src/jalview/fts/core/GFTSPanel.java
index 5a11107..5b8227f 100644
--- a/src/jalview/fts/core/GFTSPanel.java
+++ b/src/jalview/fts/core/GFTSPanel.java
@@ -89,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>();
@@ -252,12 +252,12 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
     {
       if (fetcher == null)
       {
-        mainFramTabs = null;
+        tabs = null;
       }
       jbInit();
       if (fetcher != null)
       {
-        mainFramTabs.addTab(MessageManager.getString("label.retrieve_ids"),
+        tabs.addTab(MessageManager.getString("label.retrieve_ids"),
                 fetcher);
         fetcher.setDatabaseChooserVisible(false);
         fetcher.embedWithFTSPanel(this);
@@ -270,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();
           }
@@ -667,12 +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.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
     {