X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FSequenceFetcher.java;h=cb44a3773fe64c9830b46e9dad31ea8477752da6;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=ad7b578632e13d96827e840f5e52860725dc0134;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/jalview/ws/SequenceFetcher.java b/src/jalview/ws/SequenceFetcher.java
index ad7b578..cb44a37 100644
--- a/src/jalview/ws/SequenceFetcher.java
+++ b/src/jalview/ws/SequenceFetcher.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -52,6 +52,7 @@ public class SequenceFetcher extends ASequenceFetcher
   {
     this(true);
   }
+
   public SequenceFetcher(boolean addDas)
   {
     addDBRefSourceImpl(jalview.ws.dbsources.EmblSource.class);
@@ -60,13 +61,12 @@ 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) {
+    if (addDas)
+    {
       registerDasSequenceSources();
     }
   }
@@ -167,13 +167,11 @@ public class SequenceFetcher extends ASequenceFetcher
           {
             nm = nm.substring(4);
           }
-          dassrc.add(new String[]
-          { srcs[i], nm.toUpperCase() });
+          dassrc.add(new String[] { srcs[i], nm.toUpperCase() });
         }
         else
         {
-          nondas.add(new String[]
-          { srcs[i], nm.toUpperCase() });
+          nondas.add(new String[] { srcs[i], nm.toUpperCase() });
         }
       }
     }
@@ -224,13 +222,14 @@ public class SequenceFetcher extends ASequenceFetcher
             + "With one argument, the argument will be resolved to one or more db sources and each will be queried with their test accession only.\n"
             + "If given two arguments, SequenceFetcher will try to find the DbFetcher corresponding to <DBNAME> and retrieve <ACCNO> from it.\n"
             + "The -nodas option will exclude DAS sources from the database fetchers Jalview will try to use.";
-    boolean withDas=true;
-    if (argv!=null && argv.length>0 && argv[0].toLowerCase().startsWith("-nodas"))
+    boolean withDas = true;
+    if (argv != null && argv.length > 0
+            && argv[0].toLowerCase().startsWith("-nodas"))
     {
-      withDas=false;
-      String targs[] = new String[argv.length-1];
+      withDas = false;
+      String targs[] = new String[argv.length - 1];
       System.arraycopy(argv, 1, targs, 0, targs.length);
-      argv=targs;
+      argv = targs;
     }
     if (argv != null && argv.length > 0)
     {
@@ -244,11 +243,13 @@ public class SequenceFetcher extends ASequenceFetcher
           AlignmentI al = null;
           try
           {
-            al = sp.getSequenceRecords(argv.length>1 ? argv[1] : sp.getTestQuery());
+            al = sp.getSequenceRecords(argv.length > 1 ? argv[1] : sp
+                    .getTestQuery());
           } catch (Exception e)
           {
             e.printStackTrace();
-            System.err.println("Error when retrieving " + (argv.length>1 ? argv[1] : sp.getTestQuery())
+            System.err.println("Error when retrieving "
+                    + (argv.length > 1 ? argv[1] : sp.getTestQuery())
                     + " from " + argv[0] + "\nUsage: " + usage);
           }
           SequenceI[] prod = al.getSequencesArray();
@@ -280,7 +281,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
@@ -326,9 +329,8 @@ public class SequenceFetcher extends ASequenceFetcher
             }
             else
             {
-              noProds.addElement((dna ? new Object[]
-              { al, al } : new Object[]
-              { al }));
+              noProds.addElement((dna ? new Object[] { al, al }
+                      : new Object[] { al }));
             }
 
           }
@@ -343,9 +345,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
         {
@@ -360,8 +366,7 @@ public class SequenceFetcher extends ASequenceFetcher
             }
             if (ds == null)
             {
-              ds = new Alignment(new SequenceI[]
-              { sq });
+              ds = new Alignment(new SequenceI[] { sq });
 
             }
             else