\r
import javax.swing.*;\r
\r
+import org.biodas.jdas.client.SourcesClient;\r
+import org.biodas.jdas.schema.sources.SOURCE;\r
+import org.biodas.jdas.schema.sources.SOURCES;\r
import org.biojava.dasobert.das.*;\r
import org.biojava.dasobert.das2.*;\r
import org.biojava.dasobert.das2.io.*;\r
* \r
* @return list of sources\r
*/\r
- public static DasSource[] getDASSources()\r
+ public static SOURCE[] getDASSources()\r
{\r
\r
String registryURL = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",\r
* @param registryURL\r
* return sources from registryURL\r
*/\r
- public static DasSource[] getDASSources(String registryURL)\r
+ public static SOURCE[] getDASSources(String registryURL)\r
{\r
- DasSourceReaderImpl reader = new DasSourceReaderImpl();\r
-\r
+ \r
try\r
{\r
URL url = new URL(registryURL);\r
+ org.biodas.jdas.client.SourcesClientInterface client = new SourcesClient();\r
+ \r
+ SOURCES sources = client.fetchData(registryURL);\r
\r
- DasSource[] sources = reader.readDasSource(url);\r
-\r
- List das1sources = new ArrayList();\r
- for (int i = 0; i < sources.length; i++)\r
- {\r
- DasSource ds = sources[i];\r
- if (ds instanceof Das2Source)\r
- {\r
- Das2Source d2s = (Das2Source) ds;\r
- if (d2s.hasDas1Capabilities())\r
- {\r
- Das1Source d1s = DasSourceConverter.toDas1Source(d2s);\r
- das1sources.add(d1s);\r
- }\r
-\r
- }\r
- else if (ds instanceof Das1Source)\r
- {\r
- das1sources.add((Das1Source) ds);\r
- }\r
- }\r
+ List<SOURCE> dassources = sources.getSOURCE();\r
\r
- return (Das1Source[]) das1sources.toArray(new Das1Source[das1sources\r
- .size()]);\r
+ return dassources.toArray(new SOURCE[dassources.size()]);\r
} catch (Exception ex)\r
{\r
System.err.println("Failed to contact DAS1 registry at "\r