JAL-1668 First version JAL-1668

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

diff --git a/src/jalview/jbgui/GEBIFetchPanel.java b/src/jalview/jbgui/GPDBFetchPanel.java
similarity index 89%
rename from src/jalview/jbgui/GEBIFetchPanel.java
rename to src/jalview/jbgui/GPDBFetchPanel.java
index e00830b..18c33cd 100644 (file)
--- a/src/jalview/jbgui/GEBIFetchPanel.java
+++ b/src/jalview/jbgui/GPDBFetchPanel.java
@@ -1,8 +1,8 @@
 package jalview.jbgui;
 
 import jalview.gui.Desktop;
+import jalview.gui.PDBFetchPanel.PDBSearchOptionList;
 import jalview.util.MessageManager;
-import jalview.ws.uimodel.PDBSearchOptionListModel;
 import jalview.ws.uimodel.PDBSummaryListModel;
 
 import java.awt.BorderLayout;
@@ -23,13 +23,13 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 @SuppressWarnings("serial")
-public abstract class GEBIFetchPanel extends JPanel
+public abstract class GPDBFetchPanel extends JPanel
 {
   protected String frameTitle = "PDB Sequence Fetcher";
 
   protected JInternalFrame mainFrame = new JInternalFrame(frameTitle);
 
-  protected JComboBox<PDBSearchOptionListModel> searchFeild = new JComboBox<PDBSearchOptionListModel>();
+  protected JComboBox<PDBSearchOptionList> searchTargetOptions = new JComboBox<PDBSearchOptionList>();
 
   protected JButton ok = new JButton();
 
@@ -54,7 +54,7 @@ public abstract class GEBIFetchPanel extends JPanel
 
 
 
-  public GEBIFetchPanel()
+  public GPDBFetchPanel()
   {
     try
     {
@@ -109,8 +109,8 @@ public abstract class GEBIFetchPanel extends JPanel
             .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
     resultPanel.add(searchResultScroller);
 
-    searchFeild.setFont(new java.awt.Font("Verdana", 0, 12));
-    searchFeild.addActionListener(new ActionListener()
+    searchTargetOptions.setFont(new java.awt.Font("Verdana", 0, 12));
+    searchTargetOptions.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -119,7 +119,7 @@ public abstract class GEBIFetchPanel extends JPanel
       }
     });
 
-    PDBSearchOptionListModel.populateCombo(searchFeild);
+    populateSearchOptionCombo();
 
     search.setFont(new java.awt.Font("Verdana", 0, 12));
     search.getDocument().addDocumentListener(new DocumentListener()
@@ -143,7 +143,7 @@ public abstract class GEBIFetchPanel extends JPanel
       }
     });
 
-    inputPanel.add(searchFeild);
+    inputPanel.add(searchTargetOptions);
     inputPanel.add(search);
 
 
@@ -165,4 +165,6 @@ public abstract class GEBIFetchPanel extends JPanel
 
   public abstract void cancelActionPerformed();
 
+  protected abstract void populateSearchOptionCombo();
+
 }