JAL-1807 explicit imports (jalview.renderer)

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

diff --git a/src/jalview/ws/SequenceFetcher.java b/src/jalview/ws/SequenceFetcher.java
index ce3e952..9c42f0a 100644 (file)
--- a/src/jalview/ws/SequenceFetcher.java
+++ b/src/jalview/ws/SequenceFetcher.java
@@ -1,23 +1,30 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 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;
@@ -26,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
@@ -50,6 +52,7 @@ public class SequenceFetcher extends ASequenceFetcher
   {
     this(true);
   }
+
   public SequenceFetcher(boolean addDas)
   {
     addDBRefSourceImpl(jalview.ws.dbsources.EmblSource.class);
@@ -58,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();
     }
   }
@@ -222,13 +224,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)
     {
@@ -242,11 +245,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();
@@ -278,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
@@ -341,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
         {