update author list in license for (JAL-826)

[jalview.git] / src / jalview / ws / ebi / EBIFetchClient.java

diff --git a/src/jalview/ws/ebi/EBIFetchClient.java b/src/jalview/ws/ebi/EBIFetchClient.java
index d5ab2e1..b837354 100644 (file)
--- a/src/jalview/ws/ebi/EBIFetchClient.java
+++ b/src/jalview/ws/ebi/EBIFetchClient.java
@@ -1,20 +1,19 @@
 /*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)\r
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle\r
  * \r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
+ * This file is part of Jalview.\r
  * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
+ * Jalview is free software: you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License \r
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\r
  * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ * Jalview is distributed in the hope that it will be useful, but \r
+ * WITHOUT ANY WARRANTY; without even the implied warranty \r
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR \r
+ * PURPOSE.  See the GNU General Public License for more details.\r
+ * \r
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 package jalview.ws.ebi;\r
 \r
@@ -85,9 +84,7 @@ public class EBIFetchClient
   {\r
     try\r
     {\r
-      call\r
-              .setOperationName(new QName("urn:Dbfetch",\r
-                      "getSupportedFormats"));\r
+      call.setOperationName(new QName("urn:Dbfetch", "getSupportedFormats"));\r
       call.setReturnType(XMLType.SOAP_ARRAY);\r
 \r
       return (String[]) call.invoke(new Object[]\r
@@ -124,6 +121,10 @@ public class EBIFetchClient
     String[] data = fetchData(ids, f, s);\r
     // TODO: after JV 2.4 - test data==null and pass error(s) back up if\r
     // possible (OutOfMemoryErrors are usual problem)\r
+    if (data == null)\r
+    {\r
+      return null;\r
+    }\r
     File outFile = null;\r
     try\r
     {\r
@@ -147,10 +148,11 @@ public class EBIFetchClient
    * Single DB multiple record retrieval\r
    * \r
    * @param ids\r
-   *                db:query1;query2;query3\r
+   *          db:query1;query2;query3\r
    * @param f\r
-   *                raw/xml\r
-   * @param s ?\r
+   *          raw/xml\r
+   * @param s\r
+   *          ?\r
    * \r
    * @return Raw string array result of query set\r
    */\r