X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2Fdas%2Fdatamodel%2FDasSourceRegistry.java;h=8d5579fce65034a6a9841cca85af6551c0f6df43;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=761bcc866d869b6c54dae7419e5b3a5a0528e31f;hpb=aa030270d61a25a3417f674c48c2d323ff238277;p=jalview.git diff --git a/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java b/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java index 761bcc8..8d5579f 100644 --- a/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java +++ b/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java @@ -1,22 +1,29 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.ws.dbsources.das.datamodel; +import jalview.bin.Cache; +import jalview.ws.dbsources.das.api.DasSourceRegistryI; +import jalview.ws.dbsources.das.api.jalviewSourceI; + import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; @@ -36,10 +43,6 @@ import org.biodas.jdas.schema.sources.SOURCE; import org.biodas.jdas.schema.sources.SOURCES; import org.biodas.jdas.schema.sources.VERSION; -import jalview.bin.Cache; -import jalview.ws.dbsources.das.api.DasSourceRegistryI; -import jalview.ws.dbsources.das.api.jalviewSourceI; - /** * */ @@ -53,7 +56,8 @@ public class DasSourceRegistry implements DasSourceRegistryI, private Hashtable localSources = null; - public static String DEFAULT_REGISTRY = "http://www.dasregistry.org/das/"; + // public static String DEFAULT_REGISTRY = "http://www.dasregistry.org/das/"; + public static String DEFAULT_REGISTRY = "http://www.ebi.ac.uk/das-srv/registry/das/"; /** * true if thread is running and we are talking to DAS registry service