JAL-4389 Adjust preferences menu to work with any WSDiscoverer

[jalview.git] / src / jalview / gui / WS2PreferencesPanel.java

diff --git a/src/jalview/gui/SlivkaPreferences.java b/src/jalview/gui/WS2PreferencesPanel.java
similarity index 98%
rename from src/jalview/gui/SlivkaPreferences.java
rename to src/jalview/gui/WS2PreferencesPanel.java
index 5f2e106..d5dc39e 100644 (file)
--- a/src/jalview/gui/SlivkaPreferences.java
+++ b/src/jalview/gui/WS2PreferencesPanel.java
@@ -39,7 +39,7 @@ import jalview.ws2.client.api.WebServiceDiscovererI;
 import jalview.ws2.client.slivka.SlivkaWSDiscoverer;
 
 @SuppressWarnings("serial")
-public class SlivkaPreferences extends JPanel
+public class WS2PreferencesPanel extends JPanel
 {
   {
     setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
@@ -202,8 +202,8 @@ public class SlivkaPreferences extends JPanel
     final int i = urlListTable.getSelectedRow();
     if (i >= 0)
     {
-      urls.remove(i);
-      statuses.remove(i);
+      URL url = urls.remove(i);
+      statuses.remove(url);
       urlTableModel.fireTableRowsDeleted(i, i);
       discoverer.setUrls(urls);
     }
@@ -286,7 +286,6 @@ public class SlivkaPreferences extends JPanel
   private void moveTableRow(int fromIndex, int toIndex)
   {
     URL url = urls.get(fromIndex);
-    int status = statuses.get(fromIndex);
     urls.set(fromIndex, urls.get(toIndex));
     urls.set(toIndex, url);
     if (urlListTable.getSelectedRow() == fromIndex)
@@ -360,10 +359,10 @@ public class SlivkaPreferences extends JPanel
     add(progressBar);
   }
 
-  SlivkaPreferences()
+  WS2PreferencesPanel(WebServiceDiscovererI discoverer)
   {
     // Initial URLs loading
-    discoverer = SlivkaWSDiscoverer.getInstance();
+    this.discoverer = discoverer;
     urls.addAll(discoverer.getUrls());
     for (URL url : urls)
     {