JAL-1667 refactoring to support JAL-1668

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

diff --git a/src/jalview/jbgui/GPDBFetchPanel.java b/src/jalview/jbgui/GPDBFetchPanel.java
index 18c33cd..c7fa057 100644 (file)
--- a/src/jalview/jbgui/GPDBFetchPanel.java
+++ b/src/jalview/jbgui/GPDBFetchPanel.java
@@ -1,9 +1,9 @@
 package jalview.jbgui;
 
 import jalview.gui.Desktop;
-import jalview.gui.PDBFetchPanel.PDBSearchOptionList;
 import jalview.util.MessageManager;
-import jalview.ws.uimodel.PDBSummaryListModel;
+import jalview.ws.dbsources.PDBRestClient.PDBDocField;
+import jalview.ws.uimodel.PDBSearchResponse.PDBResponseSummary;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -29,7 +29,7 @@ public abstract class GPDBFetchPanel extends JPanel
 
   protected JInternalFrame mainFrame = new JInternalFrame(frameTitle);
 
-  protected JComboBox<PDBSearchOptionList> searchTargetOptions = new JComboBox<PDBSearchOptionList>();
+  protected JComboBox<PDBDocField> searchTargetOptions = new JComboBox<PDBDocField>();
 
   protected JButton ok = new JButton();
 
@@ -39,7 +39,7 @@ public abstract class GPDBFetchPanel extends JPanel
   
   protected JTextField search = new JTextField(20);
   
-  protected JList<PDBSummaryListModel> jListSearchResult = new JList<PDBSummaryListModel>();
+  protected JList<PDBResponseSummary> jListSearchResult = new JList<PDBResponseSummary>();
 
   protected JScrollPane searchResultScroller = new JScrollPane(
           jListSearchResult);
@@ -52,8 +52,6 @@ public abstract class GPDBFetchPanel extends JPanel
 
   private BorderLayout mainLayout = new BorderLayout();
 
-
-
   public GPDBFetchPanel()
   {
     try
@@ -119,7 +117,7 @@ public abstract class GPDBFetchPanel extends JPanel
       }
     });
 
-    populateSearchOptionCombo();
+    populateSearchOptionComboBox();
 
     search.setFont(new java.awt.Font("Verdana", 0, 12));
     search.getDocument().addDocumentListener(new DocumentListener()
@@ -146,7 +144,6 @@ public abstract class GPDBFetchPanel extends JPanel
     inputPanel.add(searchTargetOptions);
     inputPanel.add(search);
 
-
     this.setLayout(mainLayout);
     this.add(inputPanel, java.awt.BorderLayout.NORTH);
     this.add(resultPanel, java.awt.BorderLayout.CENTER);
@@ -165,6 +162,6 @@ public abstract class GPDBFetchPanel extends JPanel
 
   public abstract void cancelActionPerformed();
 
-  protected abstract void populateSearchOptionCombo();
+  protected abstract void populateSearchOptionComboBox();
 
 }