From: amwaterhouse Date: Thu, 30 Nov 2006 15:06:38 +0000 (+0000) Subject: DasRegistry moved again X-Git-Tag: Release_2_3~524 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=63f7dffaa9b668ad5ab7d8092e5232908e4b0bcb;p=jalview.git DasRegistry moved again --- diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java index b58ce95..58580eb 100755 --- a/src/jalview/gui/DasSourceBrowser.java +++ b/src/jalview/gui/DasSourceBrowser.java @@ -41,7 +41,7 @@ public class DasSourceBrowser extends GDasSourceBrowser Vector selectedSources; - String DEFAULT_REGISTRY = "http://www.dasregistry.org/registry/das1/sources/"; + public static String DEFAULT_REGISTRY = "http://www.dasregistry.org/das1/sources/"; boolean loadingDasSources = false; @@ -51,7 +51,7 @@ public class DasSourceBrowser extends GDasSourceBrowser String registry = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL", DEFAULT_REGISTRY); - if(registry.equals("http://das.sanger.ac.uk/registry/das1/sources/")) + if(registry.indexOf("/registry/das1/sources/")>-1) { jalview.bin.Cache.setProperty("DAS_REGISTRY_URL", DEFAULT_REGISTRY); registry = DEFAULT_REGISTRY; diff --git a/src/jalview/io/DasSequenceFeatureFetcher.java b/src/jalview/io/DasSequenceFeatureFetcher.java index 1c5da54..f6e6f9b 100755 --- a/src/jalview/io/DasSequenceFeatureFetcher.java +++ b/src/jalview/io/DasSequenceFeatureFetcher.java @@ -459,7 +459,7 @@ public class DasSequenceFeatureFetcher DasSourceReaderImpl reader = new DasSourceReaderImpl(); String registryURL = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL", - "http://www.dasregistry.org/registry/das1/sources/" + DasSourceBrowser.DEFAULT_REGISTRY ); try