Merge branch 'alpha/JAL-3066_Jalview_212_slivka-integration' into alpha/JAL-3362_Jalv...

[jalview.git] / src / jalview / ws / gui / MsaWSJob.java

diff --git a/src/jalview/ws/gui/MsaWSJob.java b/src/jalview/ws/gui/MsaWSJob.java
index 86d299a..d8cae20 100644 (file)
--- a/src/jalview/ws/gui/MsaWSJob.java
+++ b/src/jalview/ws/gui/MsaWSJob.java
@@ -6,7 +6,6 @@ import jalview.datamodel.AlignmentOrder;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 import jalview.util.MessageManager;
-import jalview.ws.api.JobId;
 import jalview.ws.jws2.dm.JabaWsParamSet;
 import jalview.ws.params.ArgumentI;
 
@@ -55,6 +54,9 @@ class MsaWSJob extends WsJob
       submitted = true;
       subjobComplete = true;
       returnInput = true;
+    } else
+    {
+      validInput = true;
     }
 
   }
@@ -275,6 +277,7 @@ class MsaWSJob extends WsJob
   {
     // TODO: get attributes for this MsaWS instance to check if it can do two
     // sequence alignment.
+    // TODO: check type of sequences are valid for this service
     if (seqs != null && seqs.size() >= 2) // two or more sequences is valid ?
     {
       return true;
@@ -364,18 +367,4 @@ class MsaWSJob extends WsJob
       jobProgress.append("\nJob Output:\n");
     }
   }
-
-  JobId jobHandle = null;
-  public void setJobHandle(JobId align)
-  {
-    jobHandle = align;
-    setJobId(jobHandle.getJobId());
-
-  }
-
-  public JobId getJobHandle()
-  {
-    return jobHandle;
-  }
-
 }
\ No newline at end of file