JAL-1807 explicit imports (jalview.gui)

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

diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index fab4cb3..f781473 100644 (file)
--- a/src/jalview/gui/DasSourceBrowser.java
+++ b/src/jalview/gui/DasSourceBrowser.java
@@ -20,6 +20,13 @@
  */
 package jalview.gui;
 
+import jalview.bin.Cache;
+import jalview.jbgui.GDasSourceBrowser;
+import jalview.util.MessageManager;
+import jalview.util.TableSorter;
+import jalview.ws.dbsources.das.api.DasSourceRegistryI;
+import jalview.ws.dbsources.das.api.jalviewSourceI;
+
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
@@ -46,12 +53,6 @@ import org.biodas.jdas.schema.sources.COORDINATES;
 import org.biodas.jdas.schema.sources.PROP;
 import org.biodas.jdas.schema.sources.VERSION;
 
-import jalview.jbgui.GDasSourceBrowser;
-import jalview.util.MessageManager;
-import jalview.util.TableSorter;
-import jalview.ws.dbsources.das.api.DasSourceRegistryI;
-import jalview.ws.dbsources.das.api.jalviewSourceI;
-
 public class DasSourceBrowser extends GDasSourceBrowser implements
         Runnable, ListSelectionListener
 {
@@ -63,7 +64,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
   {
     fs = featureSettings;
     // TODO DasSourceRegistryProvider API
-    sourceRegistry = jalview.bin.Cache.getDasSourceRegistry();
+    sourceRegistry = Cache.getDasSourceRegistry();
     String registry = sourceRegistry.getDasRegistryURL();
 
     registryURL.setText(registry);
@@ -360,7 +361,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
 
   public void refresh_actionPerformed(ActionEvent e)
   {
-    saveProperties(jalview.bin.Cache.applicationProperties);
+    saveProperties(Cache.applicationProperties);
 
     Thread worker = new Thread(this);
     worker.start();
@@ -683,7 +684,7 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
 
   void setSelectedFromProperties()
   {
-    String active = jalview.bin.Cache.getDefault("DAS_ACTIVE_SOURCE",
+    String active = Cache.getDefault("DAS_ACTIVE_SOURCE",
             "uniprot");
     StringTokenizer st = new StringTokenizer(active, "\t");
     selectedSources = new Vector();
@@ -707,11 +708,11 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
   {
     if (registryURL.getText() == null || registryURL.getText().length() < 1)
     {
-      properties.remove(jalview.bin.Cache.DAS_REGISTRY_URL);
+      properties.remove(Cache.DAS_REGISTRY_URL);
     }
     else
     {
-      properties.setProperty(jalview.bin.Cache.DAS_REGISTRY_URL,
+      properties.setProperty(Cache.DAS_REGISTRY_URL,
               registryURL.getText());
     }
 
@@ -724,11 +725,11 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
       }
     }
 
-    properties.setProperty(jalview.bin.Cache.DAS_ACTIVE_SOURCE,
+    properties.setProperty(Cache.DAS_ACTIVE_SOURCE,
             sb.toString());
 
     String sourceprop = sourceRegistry.getLocalSourceString();
-    properties.setProperty(jalview.bin.Cache.DAS_LOCAL_SOURCE, sourceprop);
+    properties.setProperty(Cache.DAS_LOCAL_SOURCE, sourceprop);
   }
 
   class DASTableModel extends AbstractTableModel