X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2Fparams%2FAnnotationFile.java;h=b610fca46fb04694abe1b8dca685c36d2a73a2b4;hb=2eaab3084d84daa55785c0c288592d2a7f603742;hp=d6f0c827e848884e8d431d6b7da6b3c371f68e24;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/ws/rest/params/AnnotationFile.java b/src/jalview/ws/rest/params/AnnotationFile.java index d6f0c82..b610fca 100644 --- 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() { - super(new Class[] - { AlignmentI.class }); + super(new Class[] { AlignmentI.class }); } /** @@ -72,9 +71,8 @@ public class AnnotationFile extends InputType AlignmentI al = rj.getAlignmentForInput(token, molType.MIX); if (format.equals(JVANNOT)) { - return new StringBody( - new jalview.io.AnnotationFile() - .printAnnotationsForAlignment(al)); + return new StringBody(new jalview.io.AnnotationFile() + .printAnnotationsForAlignment(al)); } else { @@ -84,9 +82,8 @@ public class AnnotationFile extends InputType "Unrecognised format for exporting Annotation (" + format + ")"); } - return new StringBody( - new jalview.io.AnnotationFile().printCSVAnnotations(al - .getAlignmentAnnotation())); + return new StringBody(new jalview.io.AnnotationFile() + .printCSVAnnotations(al.getAlignmentAnnotation())); } } @@ -112,8 +109,7 @@ public class AnnotationFile extends InputType if (tok.startsWith("format")) { - for (String fmt : new String[] - { CSVANNOT, JVANNOT }) + for (String fmt : new String[] { CSVANNOT, JVANNOT }) { if (val.equalsIgnoreCase(fmt)) { @@ -123,8 +119,7 @@ public class AnnotationFile extends InputType } 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); } @@ -138,8 +133,8 @@ public class AnnotationFile extends InputType { // TODO - consider disregarding base options here. List lst = getBaseOptions(); - lst.add(new Option("format", "Alignment annotation upload format", - true, JVANNOT, format, Arrays.asList(new String[] + lst.add(new Option("format", "Alignment annotation upload format", true, + JVANNOT, format, Arrays.asList(new String[] { JVANNOT, CSVANNOT }), null)); return lst; }