X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fseqfetcher%2FASequenceFetcher.java;h=1baa58be74f9cf001970af6d71f67bef1a49071e;hb=f215c30c91a7532eb97655349b70b9eb73a283d5;hp=013fb1593d77db8ccfe6acb1c4bab7e1d2e11fe5;hpb=729da71b3927879d79062fe4770ed024068bbd17;p=jalview.git diff --git a/src/jalview/ws/seqfetcher/ASequenceFetcher.java b/src/jalview/ws/seqfetcher/ASequenceFetcher.java index 013fb15..1baa58b 100644 --- a/src/jalview/ws/seqfetcher/ASequenceFetcher.java +++ b/src/jalview/ws/seqfetcher/ASequenceFetcher.java @@ -1,20 +1,19 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4) - * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle * - * This program 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 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program 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. + * 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. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * 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 . */ package jalview.ws.seqfetcher; @@ -211,8 +210,8 @@ public class ASequenceFetcher * Retrieve an instance of the proxy for the given source * * @param db - * database source string TODO: add version string/wildcard for - * retrieval of specific DB source/version combinations. + * database source string TODO: add version string/wildcard for + * retrieval of specific DB source/version combinations. * @return an instance of DbSourceProxy for that db. */ public DbSourceProxy getSourceProxy(String db) @@ -226,11 +225,10 @@ public class ASequenceFetcher * dbrefsource * * @param dbSourceProxy - * reference for class implementing - * jalview.ws.seqfetcher.DbSourceProxy + * reference for class implementing + * jalview.ws.seqfetcher.DbSourceProxy * @throws java.lang.IllegalArgumentException - * if class does not implement - * jalview.ws.seqfetcher.DbSourceProxy + * if class does not implement jalview.ws.seqfetcher.DbSourceProxy */ protected void addDBRefSourceImpl(Class dbSourceProxy) throws java.lang.IllegalArgumentException @@ -299,6 +297,7 @@ public class ASequenceFetcher /** * select sources which are implemented by instances of the given class + * * @param class that implements DbSourceProxy * @return null or vector of source names for fetchers */ @@ -306,9 +305,11 @@ public class ASequenceFetcher { if (!jalview.ws.seqfetcher.DbSourceProxy.class.isAssignableFrom(class1)) { - throw new Error("Implmentation Error - getDbInstances must be given a class that implements jalview.ws.seqfetcher.DbSourceProxy (was given '"+class1+"')"); + throw new Error( + "Implmentation Error - getDbInstances must be given a class that implements jalview.ws.seqfetcher.DbSourceProxy (was given '" + + class1 + "')"); } - if (FETCHABLEDBS==null) + if (FETCHABLEDBS == null) { return null; } @@ -324,7 +325,7 @@ public class ASequenceFetcher src.addElement(dbn); } } - if (src.size()>0) + if (src.size() > 0) { src.copyInto(sources = new String[src.size()]); }