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
JAL-244 Fix window size narrow adjustment not becoming a manual adjustment clash
[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
8437929
..
c7fad05
100644
(file)
--- a/
src/jalview/ws/jws2/ParameterUtils.java
+++ b/
src/jalview/ws/jws2/ParameterUtils.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * 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.
*
*
* This file is part of Jalview.
*
@@
-22,12
+22,15
@@
package jalview.ws.jws2;
import jalview.util.MessageManager;
import jalview.util.MessageManager;
-import java.net.MalformedURLException;
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
{
@@
-90,12
+93,13
@@
public class ParameterUtils
{
try
{
{
try
{
- o.setDefaultValue(isParameter(param, pseparator) ? getParamValue(
- param, pseparator) : param);
+ o.setDefaultValue(isParameter(param, pseparator)
+ ? getParamValue(param, pseparator)
+ : param);
} catch (WrongParameterException e)
{
} catch (WrongParameterException e)
{
- System.out.println("Problem setting value for the parameter: "
- + param);
+ System.out.println(
+ "Problem setting value for the parameter: " + param);
e.printStackTrace();
}
}
e.printStackTrace();
}
}
@@
-146,8
+150,7
@@
public class ParameterUtils
}
else
{
}
else
{
- copy.addOptionNames(names.toArray(new String[]
- {}));
+ copy.addOptionNames(names.toArray(new String[] {}));
}
}
try
}
}
try
@@
-183,7
+186,8
@@
public class ParameterUtils
} catch (Exception e)
{
e.printStackTrace();
} catch (Exception e)
{
e.printStackTrace();
- throw new Error(MessageManager.getString("error.implementation_error_couldnt_copy_value_constraint"));
+ throw new Error(MessageManager.getString(
+ "error.implementation_error_couldnt_copy_value_constraint"));
}
}
}
}
@@
-198,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;