X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2Fparams%2FAnnotationFile.java;h=ad62e4572fc26dc7a49cbe7c5607d42dd11d475f;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=37e051fd88a029fd6ff7c67203b5c8989a94351c;hpb=ad20cd92225f2ee8c251d39b00b90555d382a616;p=jalview.git
diff --git a/src/jalview/ws/rest/params/AnnotationFile.java b/src/jalview/ws/rest/params/AnnotationFile.java
index 37e051f..ad62e45 100644
--- a/src/jalview/ws/rest/params/AnnotationFile.java
+++ b/src/jalview/ws/rest/params/AnnotationFile.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.ws.rest.params;
@@ -42,8 +45,7 @@ public class AnnotationFile extends InputType
{
public AnnotationFile()
{
- super(new Class[]
- { AlignmentI.class });
+ super(new Class[] { AlignmentI.class });
}
/**
@@ -70,9 +72,8 @@ public class AnnotationFile extends InputType
if (format.equals(JVANNOT))
{
return new StringBody(
- new jalview.io.AnnotationFile().printAnnotations(
- al.getAlignmentAnnotation(), al.getGroups(),
- al.getProperties()));
+ new jalview.io.AnnotationFile()
+ .printAnnotationsForAlignment(al));
}
else
{
@@ -110,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))
{
@@ -121,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);
}
@@ -137,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;
}
}