X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabawsMsaInterfaceAlignCalcWorker.java;h=d45a0e1f27e36d8606349dc1298155a4550cf30f;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=679ecf795ae27882133137594451df11542c174b;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git

diff --git a/src/jalview/ws/jws2/JabawsMsaInterfaceAlignCalcWorker.java b/src/jalview/ws/jws2/JabawsMsaInterfaceAlignCalcWorker.java
index 679ecf7..d45a0e1 100644
--- a/src/jalview/ws/jws2/JabawsMsaInterfaceAlignCalcWorker.java
+++ b/src/jalview/ws/jws2/JabawsMsaInterfaceAlignCalcWorker.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,32 +20,31 @@
  */
 package jalview.ws.jws2;
 
+import jalview.api.AlignViewportI;
+import jalview.api.AlignmentViewPanel;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.Annotation;
+import jalview.datamodel.SequenceI;
+import jalview.gui.AlignFrame;
+import jalview.util.MessageManager;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.WsParamSetI;
+
 import java.util.Iterator;
 import java.util.List;
 
 import compbio.data.msa.MsaWS;
-import compbio.data.msa.SequenceAnnotation;
 import compbio.data.sequence.Alignment;
 import compbio.data.sequence.Score;
-import compbio.data.sequence.ScoreManager;
 import compbio.metadata.Argument;
 import compbio.metadata.ChunkHolder;
 import compbio.metadata.JobStatus;
 import compbio.metadata.JobSubmissionException;
 import compbio.metadata.ResultNotAvailableException;
 import compbio.metadata.WrongParameterException;
-import jalview.api.AlignViewportI;
-import jalview.api.AlignmentViewPanel;
-import jalview.datamodel.AlignmentAnnotation;
-import jalview.datamodel.Annotation;
-import jalview.datamodel.SequenceI;
-import jalview.gui.AlignFrame;
-import jalview.util.MessageManager;
-import jalview.workers.AlignCalcWorker;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
-import jalview.ws.params.WsParamSetI;
 
-public abstract class JabawsMsaInterfaceAlignCalcWorker extends AbstractJabaCalcWorker
+public abstract class JabawsMsaInterfaceAlignCalcWorker extends
+        AbstractJabaCalcWorker
 {
 
   @SuppressWarnings("unchecked")
@@ -59,8 +58,8 @@ public abstract class JabawsMsaInterfaceAlignCalcWorker extends AbstractJabaCalc
     super(alignViewport, alignPanel);
   }
 
-  public JabawsMsaInterfaceAlignCalcWorker(Jws2Instance service, AlignFrame alignFrame,
-          WsParamSetI preset, List<Argument> paramset)
+  public JabawsMsaInterfaceAlignCalcWorker(Jws2Instance service,
+          AlignFrame alignFrame, WsParamSetI preset, List<Argument> paramset)
   {
     this(alignFrame.getCurrentView(), alignFrame.alignPanel);
     this.guiProgress = alignFrame;
@@ -130,7 +129,10 @@ public abstract class JabawsMsaInterfaceAlignCalcWorker extends AbstractJabaCalc
         rslt = msaservice.customAlign(seqs, getJabaArguments());
       } catch (WrongParameterException x)
       {
-          throw new JobSubmissionException(MessageManager.getString("exception.jobsubmission_invalid_params_set"), x);
+        throw new JobSubmissionException(
+                MessageManager
+                        .getString("exception.jobsubmission_invalid_params_set"),
+                x);
       }
     }
     return rslt;