X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Febi%2FEBIFetchClient.java;h=b83735481335327c152c43bce987c5b179be2884;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=d5ab2e1a3b501cc83d1fd3e5b066c63ea2c18d4b;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git

diff --git a/src/jalview/ws/ebi/EBIFetchClient.java b/src/jalview/ws/ebi/EBIFetchClient.java
index d5ab2e1..b837354 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.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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 <http://www.gnu.org/licenses/>.
  */
 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,6 +121,10 @@ 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)
+    {
+      return null;
+    }
     File outFile = null;
     try
     {
@@ -147,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
    */