DasRegistry moved again
authoramwaterhouse <Andrew Waterhouse>
Thu, 30 Nov 2006 15:06:38 +0000 (15:06 +0000)
committeramwaterhouse <Andrew Waterhouse>
Thu, 30 Nov 2006 15:06:38 +0000 (15:06 +0000)
src/jalview/gui/DasSourceBrowser.java
src/jalview/io/DasSequenceFeatureFetcher.java

index b58ce95..58580eb 100755 (executable)
@@ -41,7 +41,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
 \r
   Vector selectedSources;\r
 \r
-  String DEFAULT_REGISTRY = "http://www.dasregistry.org/registry/das1/sources/";\r
+  public static String DEFAULT_REGISTRY = "http://www.dasregistry.org/das1/sources/";\r
 \r
   boolean loadingDasSources = false;\r
 \r
@@ -51,7 +51,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
     String registry = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",\r
         DEFAULT_REGISTRY);\r
 \r
-    if(registry.equals("http://das.sanger.ac.uk/registry/das1/sources/"))\r
+    if(registry.indexOf("/registry/das1/sources/")>-1)\r
     {\r
       jalview.bin.Cache.setProperty("DAS_REGISTRY_URL", DEFAULT_REGISTRY);\r
       registry = DEFAULT_REGISTRY;\r
index 1c5da54..f6e6f9b 100755 (executable)
@@ -459,7 +459,7 @@ public class DasSequenceFeatureFetcher
     DasSourceReaderImpl reader = new DasSourceReaderImpl();\r
 \r
     String registryURL = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",\r
-        "http://www.dasregistry.org/registry/das1/sources/"\r
+        DasSourceBrowser.DEFAULT_REGISTRY\r
         );\r
 \r
     try\r