X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FSequenceFetcher.java;h=33afd1005177cbffa122fefcdaed0c3dabebe505;hb=ad15cff29620f960119f80176f1fd443da9f6763;hp=ce3e95214da0c9cdb4b7261605be02f2cd1edd43;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git diff --git a/src/jalview/ws/SequenceFetcher.java b/src/jalview/ws/SequenceFetcher.java index ce3e952..33afd10 100644 --- a/src/jalview/ws/SequenceFetcher.java +++ b/src/jalview/ws/SequenceFetcher.java @@ -1,19 +1,21 @@ /* - * 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.ws; @@ -50,6 +52,7 @@ public class SequenceFetcher extends ASequenceFetcher { this(true); } + public SequenceFetcher(boolean addDas) { addDBRefSourceImpl(jalview.ws.dbsources.EmblSource.class); @@ -64,7 +67,8 @@ public class SequenceFetcher extends ASequenceFetcher // PFAM addDBRefSourceImpl(jalview.ws.dbsources.RfamFull.class); addDBRefSourceImpl(jalview.ws.dbsources.RfamSeed.class); - if (addDas) { + if (addDas) + { registerDasSequenceSources(); } } @@ -222,13 +226,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 and retrieve 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 +247,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();