X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Client.java;h=984c004438b131e8306ed6aa848b60e85d62b186;hb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;hp=01b28e17fcbe6e76107b401f4bd03847091e5f7c;hpb=95c7342823b32fbf5b1e249ea5d855018db8dcfd;p=jalview.git

diff --git a/src/jalview/ws/jws2/Jws2Client.java b/src/jalview/ws/jws2/Jws2Client.java
index 01b28e1..984c004 100644
--- a/src/jalview/ws/jws2/Jws2Client.java
+++ b/src/jalview/ws/jws2/Jws2Client.java
@@ -1,19 +1,20 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.ws.jws2;
 
@@ -45,8 +46,8 @@ public abstract class Jws2Client extends jalview.ws.WSClient
 
   protected List<Argument> paramset;
 
-  public Jws2Client(AlignFrame _alignFrame,
-          WsParamSetI preset, List<Argument> arguments)
+  public Jws2Client(AlignFrame _alignFrame, WsParamSetI preset,
+          List<Argument> arguments)
   {
     alignFrame = _alignFrame;
     this.preset = preset;
@@ -78,6 +79,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
   {
     return processParams(sh, editParams, false);
   }
+
   protected boolean processParams(Jws2Instance sh, boolean editParams,
           boolean adjustingExisting)
   {
@@ -89,9 +91,9 @@ public abstract class Jws2Client extends jalview.ws.WSClient
         sh.paramStore = new JabaParamStore(sh,
                 Desktop.getUserParameterStore());
       }
-      WsJobParameters jobParams = (preset==null && paramset!=null && paramset.size()>0) 
-              ?  new WsJobParameters(null, sh, null, paramset) 
-        : new WsJobParameters(sh, preset);
+      WsJobParameters jobParams = (preset == null && paramset != null && paramset
+              .size() > 0) ? new WsJobParameters(null, sh, null, paramset)
+              : new WsJobParameters(sh, preset);
       if (adjustingExisting)
       {
         jobParams.setName("Adjusting parameters for existing Calculation");
@@ -103,9 +105,9 @@ public abstract class Jws2Client extends jalview.ws.WSClient
       WsParamSetI prset = jobParams.getPreset();
       if (prset == null)
       {
-        paramset = jobParams.isServiceDefaults() ? null : JabaParamStore.getJabafromJwsArgs(jobParams
-                .getJobParams());
-        this.preset=null;
+        paramset = jobParams.isServiceDefaults() ? null : JabaParamStore
+                .getJabafromJwsArgs(jobParams.getJobParams());
+        this.preset = null;
       }
       else
       {