git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2416 order score models by order of addition rather than name
[jalview.git]
/
src
/
jalview
/
ws
/
dbsources
/
das
/
datamodel
/
DasSourceRegistry.java
diff --git
a/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
b/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
index
08e14e8
..
b184ff2
100644
(file)
--- a/
src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
+++ b/
src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,6
+20,10
@@
*/
package jalview.ws.dbsources.das.datamodel;
*/
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;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
@@
-39,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 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;
-
/**
*
*/
/**
*
*/
@@
-56,7
+56,8
@@
public class DasSourceRegistry implements DasSourceRegistryI,
private Hashtable<String, jalviewSourceI> localSources = null;
private Hashtable<String, jalviewSourceI> 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
/**
* true if thread is running and we are talking to DAS registry service
@@
-258,8
+259,8
@@
public class DasSourceRegistry implements DasSourceRegistryI,
}
/*
}
/*
- *
- */
+ *
+ */
@Override
public jalviewSourceI createLocalSource(String url, String name,
@Override
public jalviewSourceI createLocalSource(String url, String name,