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-2360colourSchemeApplicability
[jalview.git]
/
src
/
jalview
/
ws
/
rest
/
params
/
AnnotationFile.java
diff --git
a/src/jalview/ws/rest/params/AnnotationFile.java
b/src/jalview/ws/rest/params/AnnotationFile.java
index
d6f0c82
..
5962a91
100644
(file)
--- a/
src/jalview/ws/rest/params/AnnotationFile.java
+++ b/
src/jalview/ws/rest/params/AnnotationFile.java
@@
-45,8
+45,7
@@
public class AnnotationFile extends InputType
{
public AnnotationFile()
{
{
public AnnotationFile()
{
- super(new Class[]
- { AlignmentI.class });
+ super(new Class[] { AlignmentI.class });
}
/**
}
/**
@@
-112,8
+111,7
@@
public class AnnotationFile extends InputType
if (tok.startsWith("format"))
{
if (tok.startsWith("format"))
{
- for (String fmt : new String[]
- { CSVANNOT, JVANNOT })
+ for (String fmt : new String[] { CSVANNOT, JVANNOT })
{
if (val.equalsIgnoreCase(fmt))
{
{
if (val.equalsIgnoreCase(fmt))
{
@@
-123,8
+121,7
@@
public class AnnotationFile extends InputType
}
warnings.append("Invalid annotation file format '" + val
+ "'. Must be one of (");
}
warnings.append("Invalid annotation file format '" + val
+ "'. Must be one of (");
- for (String fmt : new String[]
- { CSVANNOT, JVANNOT })
+ for (String fmt : new String[] { CSVANNOT, JVANNOT })
{
warnings.append(" " + fmt);
}
{
warnings.append(" " + fmt);
}
@@
-139,8
+136,8
@@
public class AnnotationFile extends InputType
// TODO - consider disregarding base options here.
List<OptionI> lst = getBaseOptions();
lst.add(new Option("format", "Alignment annotation upload format",
// TODO - consider disregarding base options here.
List<OptionI> lst = getBaseOptions();
lst.add(new Option("format", "Alignment annotation upload format",
- true, JVANNOT, format, Arrays.asList(new String[]
- { JVANNOT, CSVANNOT }), null));
+ true, JVANNOT, format, Arrays.asList(new String[] { JVANNOT,
+ CSVANNOT }), null));
return lst;
}
}
return lst;
}
}