X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDasSourceBrowser.java;h=58580eb03dc89b79461e25a9f87f22e1b9543686;hb=048137e4ef1a2252d884afdd6ac8a12f0385eb16;hp=36e51647c1e4491ff79221cdfb717d48a89b5d29;hpb=09d25d31d26bdc71914b8441872f724f1d75f0cc;p=jalview.git

diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index 36e5164..58580eb 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,13 +41,23 @@ public class DasSourceBrowser extends GDasSourceBrowser
 
   Vector selectedSources;
 
-  String DEFAULT_REGISTRY = "http://das.sanger.ac.uk/registry/das1/sources/";
+  public static String DEFAULT_REGISTRY = "http://www.dasregistry.org/das1/sources/";
+
+  boolean loadingDasSources = false;
 
 
   public DasSourceBrowser()
   {
-    registryURL.setText(jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",
-        DEFAULT_REGISTRY) );
+    String registry = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",
+        DEFAULT_REGISTRY);
+
+    if(registry.indexOf("/registry/das1/sources/")>-1)
+    {
+      jalview.bin.Cache.setProperty("DAS_REGISTRY_URL", DEFAULT_REGISTRY);
+      registry = DEFAULT_REGISTRY;
+    }
+
+    registryURL.setText( registry );
 
     setSelectedFromProperties();
 
@@ -83,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()
@@ -239,6 +253,8 @@ public class DasSourceBrowser extends GDasSourceBrowser
 
   public void run()
   {
+    loadingDasSources = true;
+
     addLocal.setVisible(false);
     refresh.setVisible(false);
     progressBar.setVisible(true);
@@ -250,6 +266,8 @@ public class DasSourceBrowser extends GDasSourceBrowser
 
     init();
 
+    loadingDasSources = false;
+
   }
 
   public Vector getSelectedSources()