X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Frest%2Fparams%2FAnnotationFile.java;h=dd1f39e572f7e0c1eeee67b08ed7ba2920164e8e;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=1820182df8e7856be75ffc42482308a8afc77415;hpb=8d6b113f475c6b5916f7685cfd289e054d95a9ee;p=jalview.git diff --git a/src/jalview/ws/rest/params/AnnotationFile.java b/src/jalview/ws/rest/params/AnnotationFile.java index 1820182..dd1f39e 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.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -45,8 +45,7 @@ public class AnnotationFile extends InputType { 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")) { - for (String fmt : new String[] - { CSVANNOT, JVANNOT }) + for (String fmt : new String[] { CSVANNOT, JVANNOT }) { if (val.equalsIgnoreCase(fmt)) { @@ -123,8 +121,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); } @@ -139,8 +136,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[] - { JVANNOT, CSVANNOT }), null)); + true, JVANNOT, format, Arrays.asList(new String[] { JVANNOT, + CSVANNOT }), null)); return lst; } }