X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2Fdas%2Fdatamodel%2FJalviewSource.java;h=f3729a849350f0f0276f3effdcce0dcaaf1514fe;hb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;hp=139bafeb0b2fd150102f127a5d3e8d4ef0dc2e20;hpb=1cc81e06ac2faa5ee4b8879e9fa019956e34259f;p=jalview.git

diff --git a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java
index 139bafe..f3729a8 100644
--- a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java
+++ b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java
@@ -24,10 +24,13 @@ import jalview.ws.seqfetcher.DbSourceProxy;
 public class JalviewSource implements jalviewSourceI
 {
   SOURCE source;
+
   MultipleConnectionPropertyProviderI connprov;
-  public JalviewSource(SOURCE local2, MultipleConnectionPropertyProviderI connprov, boolean local)
+
+  public JalviewSource(SOURCE local2,
+          MultipleConnectionPropertyProviderI connprov, boolean local)
   {
-    this.connprov=connprov;
+    this.connprov = connprov;
     this.local = local;
     source = local2;
   }
@@ -311,22 +314,26 @@ public class JalviewSource implements jalviewSourceI
   {
     try
     {
-      // kind of dumb, since org.biodas.jdas.dassources.utils.VersionAdapter.getSourceUriFromQueryUri() does this,
-      // but this way, we can access non DAS 1.6 compliant sources (which have to have a URL like <sourcename>/das/ and cause a validation exception)
-      
+      // kind of dumb, since
+      // org.biodas.jdas.dassources.utils.VersionAdapter.getSourceUriFromQueryUri()
+      // does this,
+      // but this way, we can access non DAS 1.6 compliant sources (which have
+      // to have a URL like <sourcename>/das/ and cause a validation exception)
+
       for (CAPABILITY cap : getVersion().getCAPABILITY())
       {
         String capname = cap.getType().substring(
                 cap.getType().indexOf(":") + 1);
-        int p=cap.getQueryUri().lastIndexOf(capname);
-        if (p<-1) {
-          throw new Exception("Invalid das source: "+source.getUri());
-        } 
-        if (cap.getQueryUri().charAt(p)=='/')
+        int p = cap.getQueryUri().lastIndexOf(capname);
+        if (p < -1)
+        {
+          throw new Exception("Invalid das source: " + source.getUri());
+        }
+        if (cap.getQueryUri().charAt(p) == '/')
         {
           p--;
         }
-        return cap.getQueryUri().substring(0,p);
+        return cap.getQueryUri().substring(0, p);
       }
     } catch (Exception x)
     {