Merge branch 'develop' into releases/Release_2_10_2_Branch

[jalview.git] / src / jalview / ws / dbsources / das / datamodel / JalviewSource.java

diff --git a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java
index 9cc4239..07ba027 100644 (file)
--- a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java
+++ b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java
@@ -216,9 +216,8 @@ public class JalviewSource implements jalviewSourceI
   {
     for (CAPABILITY p : getVersion().getCAPABILITY())
     {
-      if (p.getType().equalsIgnoreCase(capability.getName())
-              || p.getType().equalsIgnoreCase(
-                      "das1:" + capability.getName()))
+      if (p.getType().equalsIgnoreCase(capability.getName()) || p.getType()
+              .equalsIgnoreCase("das1:" + capability.getName()))
       {
         return p;
       }
@@ -258,10 +257,9 @@ public class JalviewSource implements jalviewSourceI
       for (COORDINATES cs : v.getCOORDINATES())
       {
         COORDINATES ltst = latestc.get(cs.getUri());
-        if (ltst == null
-                || ltst.getVersion() == null
-                || (ltst.getVersion() != null && cs.getVersion() != null && isLaterThan(
-                        ltst.getVersion(), cs.getVersion())))
+        if (ltst == null || ltst.getVersion() == null
+                || (ltst.getVersion() != null && cs.getVersion() != null
+                        && isLaterThan(ltst.getVersion(), cs.getVersion())))
         {
           latestc.put(cs.getUri(), cs);
         }
@@ -279,10 +277,13 @@ public class JalviewSource implements jalviewSourceI
          */
         try
         {
-          seqsources.add(ds = new DasSequenceSource(getTitle() + " ("
-                  + cs.getAuthority() + " " + cs.getSource()
-                  + (cs.getVersion() != null ? " " + cs.getVersion() : "")
-                  + ")", cs.getAuthority(), source, v, cs, connprov));
+          seqsources.add(ds = new DasSequenceSource(
+                  getTitle() + " (" + cs.getAuthority() + " "
+                          + cs.getSource()
+                          + (cs.getVersion() != null ? " " + cs.getVersion()
+                                  : "")
+                          + ")",
+                  cs.getAuthority(), source, v, cs, connprov));
           if (seqsources.size() > 1)
           {
             System.err.println("Added another sequence DB source for "
@@ -301,8 +302,8 @@ public class JalviewSource implements jalviewSourceI
     {
       try
       {
-        seqsources.add(new DasSequenceSource(getTitle(), getTitle(),
-                source, getVersion(), null, connprov));
+        seqsources.add(new DasSequenceSource(getTitle(), getTitle(), source,
+                getVersion(), null, connprov));
       } catch (Exception e)
       {
         // TODO Auto-generated catch block
@@ -342,14 +343,14 @@ public class JalviewSource implements jalviewSourceI
 
       for (CAPABILITY cap : getVersion().getCAPABILITY())
       {
-        String capname = cap.getType().substring(
-                cap.getType().indexOf(":") + 1);
+        String capname = cap.getType()
+                .substring(cap.getType().indexOf(":") + 1);
         int p = cap.getQueryUri().lastIndexOf(capname);
         if (p < -1)
         {
           throw new Exception(MessageManager.formatMessage(
-                  "exception.invalid_das_source",
-                  new String[] { source.getUri() }));
+                  "exception.invalid_das_source", new String[]
+                  { source.getUri() }));
         }
         if (cap.getQueryUri().charAt(p) == '/')
         {
@@ -369,8 +370,8 @@ public class JalviewSource implements jalviewSourceI
   @Override
   public boolean isNewerThan(jalviewSourceI other)
   {
-    return isLaterThan(getVersion().getCreated(), other.getVersion()
-            .getCreated());
+    return isLaterThan(getVersion().getCreated(),
+            other.getVersion().getCreated());
   }
 
   @Override