X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabawsMsaInterfaceAlignCalcWorker.java;h=0baa767c8833afcf0555c3ca5f4356557dc01231;hb=894672b99c68bc0562ef5a3a0396a4825c8d7d48;hp=1f0d92ca9254763831a6cca83b8c3086db8c7953;hpb=7b45ebcb44dd677bd13bc7f74aca9554edd10f50;p=jalview.git

diff --git a/src/jalview/ws/jws2/JabawsMsaInterfaceAlignCalcWorker.java b/src/jalview/ws/jws2/JabawsMsaInterfaceAlignCalcWorker.java
index 1f0d92c..0baa767 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.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,31 +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.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")
@@ -58,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,8 +130,9 @@ public abstract class JabawsMsaInterfaceAlignCalcWorker extends AbstractJabaCalc
       } catch (WrongParameterException x)
       {
         throw new JobSubmissionException(
-                "Invalid parameter set. Check Jalview implementation.", x);
-
+                MessageManager
+                        .getString("exception.jobsubmission_invalid_params_set"),
+                x);
       }
     }
     return rslt;