X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Febi%2FEBIFetchClient.java;h=efb2739fdfb9f6b89dfa58c402fb7fdf4d833110;hb=9659f01c9954d78d03e47aaedb89f6122f2b7142;hp=2a13baab4e69bd6f697372df39a26c61f1027959;hpb=8173f37a48a91f794aeb70f7ea111cb26ba4f83e;p=jalview.git diff --git a/src/jalview/ws/ebi/EBIFetchClient.java b/src/jalview/ws/ebi/EBIFetchClient.java index 2a13baa..efb2739 100644 --- a/src/jalview/ws/ebi/EBIFetchClient.java +++ b/src/jalview/ws/ebi/EBIFetchClient.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.ebi; @@ -85,9 +84,7 @@ public class EBIFetchClient { try { - call - .setOperationName(new QName("urn:Dbfetch", - "getSupportedFormats")); + call.setOperationName(new QName("urn:Dbfetch", "getSupportedFormats")); call.setReturnType(XMLType.SOAP_ARRAY); return (String[]) call.invoke(new Object[] @@ -124,7 +121,7 @@ public class EBIFetchClient String[] data = fetchData(ids, f, s); // TODO: after JV 2.4 - test data==null and pass error(s) back up if // possible (OutOfMemoryErrors are usual problem) - if (data==null) + if (data == null) { return null; } @@ -141,8 +138,7 @@ public class EBIFetchClient index++; } out.close(); - } - catch (Exception ex) + } catch (Exception ex) { } return outFile; @@ -152,10 +148,11 @@ public class EBIFetchClient * Single DB multiple record retrieval * * @param ids - * db:query1;query2;query3 + * db:query1;query2;query3 * @param f - * raw/xml - * @param s ? + * raw/xml + * @param s + * ? * * @return Raw string array result of query set */