JAL-1217 check and avoid NPE if no datastore object instantiated

[jalview.git] / src / jalview / ws / SequenceFetcher.java

diff --git a/src/jalview/ws/SequenceFetcher.java b/src/jalview/ws/SequenceFetcher.java
index 111c510..14b6997 100644 (file)
--- a/src/jalview/ws/SequenceFetcher.java
+++ b/src/jalview/ws/SequenceFetcher.java
@@ -1,20 +1,20 @@
-/*\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 file is part of Jalview.\r
- * \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
- * 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
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * 
+ * 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.
+ *  
+ * 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;\r
 \r
 import jalview.datamodel.Alignment;\r
@@ -22,7 +22,6 @@ import jalview.datamodel.AlignmentI;
 import jalview.datamodel.DBRefSource;\r
 import jalview.datamodel.SequenceI;\r
 import jalview.ws.dbsources.das.api.jalviewSourceI;\r
-import jalview.ws.dbsources.das.datamodel.DasSequenceSource;\r
 import jalview.ws.seqfetcher.ASequenceFetcher;\r
 import jalview.ws.seqfetcher.DbSourceProxy;\r
 \r
@@ -79,15 +78,18 @@ public class SequenceFetcher extends ASequenceFetcher
     ArrayList<String> dassrc = new ArrayList<String>(), nondas = new ArrayList<String>();\r
     for (int i = 0; i < srcs.length; i++)\r
     {\r
-      boolean das = false,skip=false;\r
+      boolean das = false, skip = false;\r
       String nm;\r
       for (DbSourceProxy dbs : getSourceProxy(srcs[i]))\r
       {\r
-        // Skip the alignment databases for the moment - they're not useful for verifying a single sequence against its reference source\r
+        // Skip the alignment databases for the moment - they're not useful for\r
+        // verifying a single sequence against its reference source\r
         if (dbs.isA(DBRefSource.ALIGNMENTDB))\r
         {\r
-          skip=true;\r
-        } else {\r
+          skip = true;\r
+        }\r
+        else\r
+        {\r
           nm = dbs.getDbName();\r
           if (getSourceProxy(srcs[i]) instanceof jalview.ws.dbsources.das.datamodel.DasSequenceSource)\r
           {\r