git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
ParameterUtils.java
diff --git
a/src/jalview/ws/jws2/ParameterUtils.java
b/src/jalview/ws/jws2/ParameterUtils.java
index
80d71b5
..
62ddd0a
100644
(file)
--- a/
src/jalview/ws/jws2/ParameterUtils.java
+++ b/
src/jalview/ws/jws2/ParameterUtils.java
@@
-1,30
+1,36
@@
/*
/*
- * 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
*
* 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.
*
*
* 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/>.
+ * 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;
*/
package jalview.ws.jws2;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
+import jalview.util.MessageManager;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import compbio.metadata.*;
+import compbio.metadata.Option;
+import compbio.metadata.Parameter;
+import compbio.metadata.RunnerConfig;
+import compbio.metadata.ValueConstrain;
+import compbio.metadata.WrongParameterException;
public class ParameterUtils
{
public class ParameterUtils
{
@@
-129,6
+135,7
@@
public class ParameterUtils
{
copy.setName(option.getName());
copy.setDescription(option.getDescription());
{
copy.setName(option.getName());
copy.setDescription(option.getDescription());
+ copy.setBasicURL(option.getBasicURL());
copy.setFurtherDetails(option.getFurtherDetails());
copy.setRequired(option.isRequired());
List<String> names = option.getOptionNames();
copy.setFurtherDetails(option.getFurtherDetails());
copy.setRequired(option.isRequired());
List<String> names = option.getOptionNames();
@@
-142,8
+149,7
@@
public class ParameterUtils
}
else
{
}
else
{
- copy.addOptionNames(names.toArray(new String[]
- {}));
+ copy.addOptionNames(names.toArray(new String[] {}));
}
}
try
}
}
try
@@
-180,7
+186,8
@@
public class ParameterUtils
{
e.printStackTrace();
throw new Error(
{
e.printStackTrace();
throw new Error(
- "Implementation error: could not copy ValueConstrain!");
+ MessageManager
+ .getString("error.implementation_error_couldnt_copy_value_constraint"));
}
}
}
}
@@
-195,8
+202,7
@@
public class ParameterUtils
List<String> pv = parameter.getPossibleValues();
if (pv != null)
{
List<String> pv = parameter.getPossibleValues();
if (pv != null)
{
- copy.addPossibleValues(pv.toArray(new String[]
- {}));
+ copy.addPossibleValues(pv.toArray(new String[] {}));
}
setOptionFrom(copy, parameter);
return copy;
}
setOptionFrom(copy, parameter);
return copy;