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' into features/JAL-1793VCF
[jalview.git]
/
src
/
jalview
/
ws
/
rest
/
params
/
SeqIdVector.java
diff --git
a/src/jalview/ws/rest/params/SeqIdVector.java
b/src/jalview/ws/rest/params/SeqIdVector.java
index
e738516
..
0b19629
100644
(file)
--- a/
src/jalview/ws/rest/params/SeqIdVector.java
+++ b/
src/jalview/ws/rest/params/SeqIdVector.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 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.
*
@@
-109,8
+109,8
@@
public class SeqIdVector extends InputType
return true;
} catch (Exception x)
{
return true;
} catch (Exception x)
{
- warnings.append("Invalid molecule type '" + val
- + "'. Must be one of (");
+ warnings.append(
+ "Invalid molecule type '" + val + "'. Must be one of (");
for (molType v : molType.values())
{
warnings.append(" " + v);
for (molType v : molType.values())
{
warnings.append(" " + v);
@@
-127,9
+127,10
@@
public class SeqIdVector extends InputType
List<OptionI> lst = getBaseOptions();
lst.add(new Option("sep",
"Separator character between elements of vector", true, ",",
List<OptionI> lst = getBaseOptions();
lst.add(new Option("sep",
"Separator character between elements of vector", true, ",",
- sep, Arrays.asList(new String[] { " ", ",", ";", "\t", "|" }),
+ sep, Arrays.asList(new String[]
+ { " ", ",", ";", "\t", "|" }), null));
+ lst.add(createMolTypeOption("type", "Sequence type", false, type,
null));
null));
- lst.add(createMolTypeOption("type", "Sequence type", false, type, null));
return lst;
}
}
return lst;
}
}