X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2Fdas%2Fdatamodel%2FDasSourceRegistry.java;h=de7f380132869ccbc607fc1c5fcd004b2aed8676;hb=788e840cc150aa4777a370cebfdf5d17589bbbaf;hp=b184ff22e4190261b7286dbdc12fec7023970629;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git

diff --git a/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java b/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
index b184ff2..de7f380 100644
--- a/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
+++ b/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
@@ -46,8 +46,8 @@ import org.biodas.jdas.schema.sources.VERSION;
 /**
  *
  */
-public class DasSourceRegistry implements DasSourceRegistryI,
-        MultipleConnectionPropertyProviderI
+public class DasSourceRegistry
+        implements DasSourceRegistryI, MultipleConnectionPropertyProviderI
 {
   // private org.biodas.jdas.schema.sources.SOURCE[] dasSources = null;
   private List<jalviewSourceI> dasSources = null;
@@ -69,6 +69,7 @@ public class DasSourceRegistry implements DasSourceRegistryI,
     return loadingDasSources;
   }
 
+  @Override
   public String getDasRegistryURL()
   {
     String registry = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",
@@ -83,8 +84,7 @@ public class DasSourceRegistry implements DasSourceRegistryI,
     if (registry.lastIndexOf("sources.xml") == registry.length() - 11)
     {
       // no trailing sources.xml document for registry in JDAS
-      jalview.bin.Cache.setProperty(
-              jalview.bin.Cache.DAS_REGISTRY_URL,
+      jalview.bin.Cache.setProperty(jalview.bin.Cache.DAS_REGISTRY_URL,
               registry = registry.substring(0,
                       registry.lastIndexOf("sources.xml")));
     }
@@ -137,8 +137,8 @@ public class DasSourceRegistry implements DasSourceRegistryI,
           }
           else
           {
-            System.out.println("Debug: Ignored older source "
-                    + jsrc.getTitle());
+            System.out.println(
+                    "Debug: Ignored older source " + jsrc.getTitle());
           }
         }
         else
@@ -150,9 +150,8 @@ public class DasSourceRegistry implements DasSourceRegistryI,
       return dsrc;
     } catch (Exception ex)
     {
-      System.err.println("Failed to contact DAS1 registry at "
-              + registryURL);
-      ex.printStackTrace();
+      System.out.println(
+              "DAS1 registry at " + registryURL + " no longer exists");
       return new ArrayList<jalviewSourceI>();
     }
   }
@@ -193,8 +192,8 @@ public class DasSourceRegistry implements DasSourceRegistryI,
           int bar = token.indexOf("|");
           if (bar == -1)
           {
-            System.err
-                    .println("Warning: DAS user local source appears to have no nickname (expected a '|' followed by nickname)\nOffending definition: '"
+            System.err.println(
+                    "Warning: DAS user local source appears to have no nickname (expected a '|' followed by nickname)\nOffending definition: '"
                             + token + "'");
           }
           String url = token.substring(bar + 1);
@@ -218,8 +217,8 @@ public class DasSourceRegistry implements DasSourceRegistryI,
             }
           } catch (Exception q)
           {
-            System.err
-                    .println("Unexpected exception when creating local source from '"
+            System.err.println(
+                    "Unexpected exception when creating local source from '"
                             + token + "'");
             q.printStackTrace();
           }
@@ -373,8 +372,7 @@ public class DasSourceRegistry implements DasSourceRegistryI,
       {
         String token = en.nextElement().toString();
         jalviewSourceI srco = localSources.get(token);
-        sb.append(token + "|"
-                + (srco.isSequenceSource() ? "sequence:" : "")
+        sb.append(token + "|" + (srco.isSequenceSource() ? "sequence:" : "")
                 + srco.getUri() + "\t");
       }
       return sb.toString();
@@ -390,8 +388,8 @@ public class DasSourceRegistry implements DasSourceRegistryI,
     try
     {
       // TODO: allow same credentials for https and http
-      authStash.put(new URL(
-              "http://www.compbio.dundee.ac.uk/geneweb/das/myseq/"),
+      authStash.put(
+              new URL("http://www.compbio.dundee.ac.uk/geneweb/das/myseq/"),
               "Basic SmltOm1pSg==");
     } catch (MalformedURLException e)
     {