kkv change

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

diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index 36e5164..58580eb 100755 (executable)
--- a/src/jalview/gui/DasSourceBrowser.java
+++ b/src/jalview/gui/DasSourceBrowser.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -41,13 +41,23 @@ public class DasSourceBrowser extends GDasSourceBrowser
 \r
   Vector selectedSources;\r
 \r
-  String DEFAULT_REGISTRY = "http://das.sanger.ac.uk/registry/das1/sources/";\r
+  public static String DEFAULT_REGISTRY = "http://www.dasregistry.org/das1/sources/";\r
+\r
+  boolean loadingDasSources = false;\r
 \r
 \r
   public DasSourceBrowser()\r
   {\r
-    registryURL.setText(jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",\r
-        DEFAULT_REGISTRY) );\r
+    String registry = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",\r
+        DEFAULT_REGISTRY);\r
+\r
+    if(registry.indexOf("/registry/das1/sources/")>-1)\r
+    {\r
+      jalview.bin.Cache.setProperty("DAS_REGISTRY_URL", DEFAULT_REGISTRY);\r
+      registry = DEFAULT_REGISTRY;\r
+    }\r
+\r
+    registryURL.setText( registry );\r
 \r
     setSelectedFromProperties();\r
 \r
@@ -83,15 +93,19 @@ public class DasSourceBrowser extends GDasSourceBrowser
           }\r
         });\r
 \r
-    if(dasSources==null)\r
+    if(dasSources!=null)\r
     {\r
-    Thread worker = new Thread(this);\r
-    worker.start();\r
-    }\r
-    else\r
-     {\r
        init();\r
-     }\r
+    }\r
+  }\r
+\r
+  public void paintComponent(java.awt.Graphics g)\r
+  {\r
+    if (dasSources == null && !loadingDasSources)\r
+    {\r
+      Thread worker = new Thread(this);\r
+      worker.start();\r
+    }\r
   }\r
 \r
   void init()\r
@@ -239,6 +253,8 @@ public class DasSourceBrowser extends GDasSourceBrowser
 \r
   public void run()\r
   {\r
+    loadingDasSources = true;\r
+\r
     addLocal.setVisible(false);\r
     refresh.setVisible(false);\r
     progressBar.setVisible(true);\r
@@ -250,6 +266,8 @@ public class DasSourceBrowser extends GDasSourceBrowser
 \r
     init();\r
 \r
+    loadingDasSources = false;\r
+\r
   }\r
 \r
   public Vector getSelectedSources()\r