Merge develop to Release_2_8_3_Branch

[jalview.git] / src / jalview / ws / SequenceFetcher.java

diff --git a/src/jalview/ws/SequenceFetcher.java b/src/jalview/ws/SequenceFetcher.java
index 33afd10..9c42f0a 100644 (file)
--- a/src/jalview/ws/SequenceFetcher.java
+++ b/src/jalview/ws/SequenceFetcher.java
@@ -20,6 +20,11 @@
  */
 package jalview.ws;
 
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Vector;
+
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.DBRefSource;
@@ -28,11 +33,6 @@ import jalview.ws.dbsources.das.api.jalviewSourceI;
 import jalview.ws.seqfetcher.ASequenceFetcher;
 import jalview.ws.seqfetcher.DbSourceProxy;
 
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Vector;
-
 /**
  * This is the the concrete implementation of the sequence retrieval interface
  * and abstract class in jalview.ws.seqfetcher. This implements the run-time
@@ -61,10 +61,8 @@ public class SequenceFetcher extends ASequenceFetcher
     addDBRefSourceImpl(jalview.ws.dbsources.UnprotName.class);
     addDBRefSourceImpl(jalview.ws.dbsources.Pdb.class);
     addDBRefSourceImpl(jalview.ws.dbsources.PfamFull.class);
-    addDBRefSourceImpl(jalview.ws.dbsources.PfamSeed.class); // ensures Seed
-    // alignment is
-    // 'default' for
-    // PFAM
+    addDBRefSourceImpl(jalview.ws.dbsources.PfamSeed.class);
+    // ensures Seed alignment is 'default' for PFAM
     addDBRefSourceImpl(jalview.ws.dbsources.RfamFull.class);
     addDBRefSourceImpl(jalview.ws.dbsources.RfamSeed.class);
     if (addDas)
@@ -285,7 +283,9 @@ public class SequenceFetcher extends ASequenceFetcher
       String db = dbSources[dbsource];
       // skip me
       if (db.equals(DBRefSource.PDB))
+      {
         continue;
+      }
       for (DbSourceProxy sp : sfetcher.getSourceProxy(db))
       {
         System.out.println("Source: " + sp.getDbName() + " (" + db
@@ -348,9 +348,13 @@ public class SequenceFetcher extends ASequenceFetcher
           System.out.println("ERROR:No alignment retrieved.");
           StringBuffer raw = sp.getRawRecords();
           if (raw != null)
+          {
             System.out.println(raw.toString());
+          }
           else
+          {
             System.out.println("ERROR:No Raw results.");
+          }
         }
         else
         {