Allow for frame insets

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

diff --git a/src/jalview/ws/WSThread.java b/src/jalview/ws/WSThread.java
index 4c29537..86ee49a 100644 (file)
--- a/src/jalview/ws/WSThread.java
+++ b/src/jalview/ws/WSThread.java
@@ -1,4 +1,22 @@
-package jalview.ws;
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2006 AM Waterhouse, J Procter, 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 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.
+ *
+ * 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
+ */
+ package jalview.ws;
 
 import jalview.gui.AlignFrame;
 import jalview.gui.WebserviceInfo;
@@ -12,9 +30,9 @@ public abstract class WSThread extends Thread
     /**
      * Generic properties for Web Service Client threads.
      */
-    AlignFrame alignFrame;
+    AlignFrame alignFrame=null;
   WebserviceInfo wsInfo = null;
-  AlignmentView input;
+  AlignmentView input=null;
   boolean jobComplete = false;
   abstract class WSJob {
       /**
@@ -239,9 +257,11 @@ public abstract class WSThread extends Thread
       // System.out.println("I'm alive "+alTitle);
     }
   }
-  if (jobComplete)
+  if (jobComplete && jobs!=null)
   {
     parseResult(); // tidy up and make results available to user
+  } else {
+    Cache.log.debug("WebServiceJob poll loop finished with no jobs created.");
   }
 }
 abstract void StartJob(WSJob job);