X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2Fparams%2FAnnotationFile.java;h=b610fca46fb04694abe1b8dca685c36d2a73a2b4;hb=2eaab3084d84daa55785c0c288592d2a7f603742;hp=a8bf2d1e9c5d3818b01cf06c927f530d4a6c2550;hpb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git diff --git a/src/jalview/ws/rest/params/AnnotationFile.java b/src/jalview/ws/rest/params/AnnotationFile.java index a8bf2d1..b610fca 100644 --- a/src/jalview/ws/rest/params/AnnotationFile.java +++ b/src/jalview/ws/rest/params/AnnotationFile.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1) - * 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. * @@ -71,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 { @@ -83,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())); } } @@ -135,9 +133,9 @@ 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[] { JVANNOT, - CSVANNOT }), null)); + lst.add(new Option("format", "Alignment annotation upload format", true, + JVANNOT, format, Arrays.asList(new String[] + { JVANNOT, CSVANNOT }), null)); return lst; } }