X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2Fparams%2FAnnotationFile.java;h=b610fca46fb04694abe1b8dca685c36d2a73a2b4;hb=b483c2012e40cab4b38f650dc049c94efe7e27c2;hp=17020d3f6f44cc13a5cdf04949688f326074129b;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git

diff --git a/src/jalview/ws/rest/params/AnnotationFile.java b/src/jalview/ws/rest/params/AnnotationFile.java
index 17020d3..b610fca 100644
--- a/src/jalview/ws/rest/params/AnnotationFile.java
+++ b/src/jalview/ws/rest/params/AnnotationFile.java
@@ -1,20 +1,23 @@
-/*******************************************************************************
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
- *
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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 <http://www.gnu.org/licenses/>.
- *******************************************************************************/
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ws.rest.params;
 
 import jalview.datamodel.AlignmentI;
@@ -23,8 +26,6 @@ import jalview.ws.params.simple.Option;
 import jalview.ws.rest.InputType;
 import jalview.ws.rest.NoValidInputDataException;
 import jalview.ws.rest.RestJob;
-import jalview.ws.rest.RestServiceDescription;
-import jalview.ws.rest.InputType.molType;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -44,8 +45,7 @@ public class AnnotationFile extends InputType
 {
   public AnnotationFile()
   {
-    super(new Class[]
-    { AlignmentI.class });
+    super(new Class[] { AlignmentI.class });
   }
 
   /**
@@ -71,10 +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().printAnnotations(
-                      al.getAlignmentAnnotation(), al.getGroups(),
-                      al.getProperties()));
+      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<OptionI> 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;
   }