X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDasSourceBrowser.java;h=b58ce95ecbb02e88b1d3e4bd859310a0ea437fac;hb=197359781e7142ec6bcb53740831fc626c4675cd;hp=6388e07ec6bb36c1f29edc447e4cec1f13b94c83;hpb=408115ff6848403c54eb08a516c990aec455e4cc;p=jalview.git

diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index 6388e07..b58ce95 100755
--- a/src/jalview/gui/DasSourceBrowser.java
+++ b/src/jalview/gui/DasSourceBrowser.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -41,11 +41,23 @@ public class DasSourceBrowser extends GDasSourceBrowser
 
   Vector selectedSources;
 
+  String DEFAULT_REGISTRY = "http://www.dasregistry.org/registry/das1/sources/";
+
+  boolean loadingDasSources = false;
+
 
   public DasSourceBrowser()
   {
-    registryURL.setText(jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",
-        "http://das.sanger.ac.uk/registry/das1/sources/") );
+    String registry = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",
+        DEFAULT_REGISTRY);
+
+    if(registry.equals("http://das.sanger.ac.uk/registry/das1/sources/"))
+    {
+      jalview.bin.Cache.setProperty("DAS_REGISTRY_URL", DEFAULT_REGISTRY);
+      registry = DEFAULT_REGISTRY;
+    }
+
+    registryURL.setText( registry );
 
     setSelectedFromProperties();
 
@@ -81,15 +93,19 @@ public class DasSourceBrowser extends GDasSourceBrowser
           }
         });
 
-    if(dasSources==null)
+    if(dasSources!=null)
     {
-    Thread worker = new Thread(this);
-    worker.start();
-    }
-    else
-     {
        init();
-     }
+    }
+  }
+
+  public void paintComponent(java.awt.Graphics g)
+  {
+    if (dasSources == null && !loadingDasSources)
+    {
+      Thread worker = new Thread(this);
+      worker.start();
+    }
   }
 
   void init()
@@ -237,6 +253,8 @@ public class DasSourceBrowser extends GDasSourceBrowser
 
   public void run()
   {
+    loadingDasSources = true;
+
     addLocal.setVisible(false);
     refresh.setVisible(false);
     progressBar.setVisible(true);
@@ -248,6 +266,8 @@ public class DasSourceBrowser extends GDasSourceBrowser
 
     init();
 
+    loadingDasSources = false;
+
   }
 
   public Vector getSelectedSources()
@@ -678,6 +698,11 @@ public class DasSourceBrowser extends GDasSourceBrowser
      }
   }
 
+  public void reset_actionPerformed(ActionEvent e)
+  {
+    registryURL.setText(DEFAULT_REGISTRY);
+  }
+
   public void saveProperties(Properties properties)
   {
     if (registryURL.getText() == null || registryURL.getText().length() < 1)