X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2Fdm%2FAAConSettings.java;h=708787ec2c411670594c9bbc412fdcd8d2186fed;hb=4b2392caa53f1de3400e7916d1d9c7b815d446f4;hp=d3ba1a7cda94c17c7d6a29f6596b22602eec0734;hpb=ad20cd92225f2ee8c251d39b00b90555d382a616;p=jalview.git
diff --git a/src/jalview/ws/jws2/dm/AAConSettings.java b/src/jalview/ws/jws2/dm/AAConSettings.java
index d3ba1a7..708787e 100644
--- a/src/jalview/ws/jws2/dm/AAConSettings.java
+++ b/src/jalview/ws/jws2/dm/AAConSettings.java
@@ -1,28 +1,26 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.
+ * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
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;
import jalview.ws.jws2.ParameterUtils;
@@ -30,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
*
@@ -72,7 +76,8 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
preset = pr;
return;
}
- List oldargs = new ArrayList(), newargs = new ArrayList();
+ List oldargs = new ArrayList(),
+ newargs = new ArrayList();
oldargs.addAll(preset.getArguments());
// need to compare parameters
for (ArgumentI newparg : pr.getArguments())
@@ -89,21 +94,22 @@ public class AAConSettings extends jalview.ws.params.AutoCalcSetting
return;
}
// Try even harder to migrate arguments.
- throw new Error("Parameter migration not implemented yet");
+ throw new Error(MessageManager
+ .getString("error.parameter_migration_not_implemented_yet"));
}
}
public List getJobArgset()
{
- return jobArgset == null ? null : JabaParamStore
- .getJabafromJwsArgs(jobArgset);
+ return jobArgset == null ? null
+ : JabaParamStore.getJabafromJwsArgs(jobArgset);
}
public void setJobArgset(List 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()
@@ -142,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() };
}
}