X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fdm%2FAAConSettings.java;h=708787ec2c411670594c9bbc412fdcd8d2186fed;hb=3d0101179759ef157b088ea135423cd909512d9f;hp=e78172e911f2079e8dd71d2ac4e186c19d8fbeef;hpb=10b903bf6b22d53e8920091efb2145d6b6a677ba;p=jalview.git

diff --git a/src/jalview/ws/jws2/dm/AAConSettings.java b/src/jalview/ws/jws2/dm/AAConSettings.java
index e78172e..708787e 100644
--- a/src/jalview/ws/jws2/dm/AAConSettings.java
+++ b/src/jalview/ws/jws2/dm/AAConSettings.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,12 +20,6 @@
  */
 package jalview.ws.jws2.dm;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import compbio.metadata.Argument;
-import compbio.metadata.Option;
-
 import jalview.util.MessageManager;
 import jalview.ws.jws2.JabaParamStore;
 import jalview.ws.jws2.JabaPreset;
@@ -34,6 +28,12 @@ import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ArgumentI;
 import jalview.ws.params.WsParamSetI;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import compbio.metadata.Argument;
+import compbio.metadata.Option;
+
 /**
  * preferences for running AACon service
  * 
@@ -76,7 +76,8 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
         preset = pr;
         return;
       }
-      List<ArgumentI> oldargs = new ArrayList<ArgumentI>(), newargs = new ArrayList<ArgumentI>();
+      List<ArgumentI> oldargs = new ArrayList<ArgumentI>(),
+              newargs = new ArrayList<ArgumentI>();
       oldargs.addAll(preset.getArguments());
       // need to compare parameters
       for (ArgumentI newparg : pr.getArguments())
@@ -93,21 +94,22 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
         return;
       }
       // Try even harder to migrate arguments.
-      throw new Error(MessageManager.getString("error.parameter_migration_not_implemented_yet"));
+      throw new Error(MessageManager
+              .getString("error.parameter_migration_not_implemented_yet"));
     }
   }
 
   public List<Argument> getJobArgset()
   {
-    return jobArgset == null ? null : JabaParamStore
-            .getJabafromJwsArgs(jobArgset);
+    return jobArgset == null ? null
+            : JabaParamStore.getJabafromJwsArgs(jobArgset);
   }
 
   public void setJobArgset(List<Argument> jobArgset)
   {
     // TODO: test if parameters valid for service
-    this.jobArgset = jobArgset == null ? null : JabaParamStore
-            .getJwsArgsfromJaba(jobArgset);
+    this.jobArgset = jobArgset == null ? null
+            : JabaParamStore.getJwsArgsfromJaba(jobArgset);
   }
 
   public String getWsParamFile()
@@ -146,7 +148,6 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
   @Override
   public String[] getServiceURLs()
   {
-    return new String[]
-    { service.getUri() };
+    return new String[] { service.getUri() };
   }
 }