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 'features/JAL-1723_sequenceReport' into develop
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
dm
/
JabaWsParamSet.java
diff --git
a/src/jalview/ws/jws2/dm/JabaWsParamSet.java
b/src/jalview/ws/jws2/dm/JabaWsParamSet.java
index
7a67f6e
..
6d2b057
100644
(file)
--- a/
src/jalview/ws/jws2/dm/JabaWsParamSet.java
+++ b/
src/jalview/ws/jws2/dm/JabaWsParamSet.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.
*
*
* This file is part of Jalview.
*
@@
-20,15
+20,16
@@
*/
package jalview.ws.jws2.dm;
*/
package jalview.ws.jws2.dm;
+import jalview.util.MessageManager;
+import jalview.ws.jws2.JabaParamStore;
+import jalview.ws.params.ArgumentI;
+import jalview.ws.params.WsParamSetI;
+
import java.util.ArrayList;
import java.util.List;
import compbio.metadata.Option;
import java.util.ArrayList;
import java.util.List;
import compbio.metadata.Option;
-import jalview.ws.jws2.JabaParamStore;
-import jalview.ws.params.ArgumentI;
-import jalview.ws.params.WsParamSetI;
-
public class JabaWsParamSet implements WsParamSetI
{
/**
public class JabaWsParamSet implements WsParamSetI
{
/**
@@
-54,7
+55,8
@@
public class JabaWsParamSet implements WsParamSetI
if (!allJaba(jobParams))
{
throw new Error(
if (!allJaba(jobParams))
{
throw new Error(
- "Cannot create a JabaWSParamSet from non-JabaWS parameters");
+ MessageManager
+ .getString("error.cannot_create_jabaws_param_set"));
}
else
{
}
else
{
@@
-178,7
+180,8
@@
public class JabaWsParamSet implements WsParamSetI
if (!allJaba(args))
{
throw new Error(
if (!allJaba(args))
{
throw new Error(
- "Cannot set arguments to a JabaWSParamSet that are not JabaWS arguments");
+ MessageManager
+ .getString("error.cannot_set_arguments_to_jabaws_param_set"));
}
jabaArguments = new ArrayList<Option>();
for (ArgumentI rg : args)
}
jabaArguments = new ArrayList<Option>();
for (ArgumentI rg : args)