JAL-919, JAL-715 - prototype service editing dialog using jalview parameter model...

[jalview.git] / src / jalview / ws / rest / params / Alignment.java

diff --git a/src/jalview/ws/rest/params/Alignment.java b/src/jalview/ws/rest/params/Alignment.java
index 770b564..dc6e6e8 100644 (file)
--- a/src/jalview/ws/rest/params/Alignment.java
+++ b/src/jalview/ws/rest/params/Alignment.java
@@ -1,6 +1,9 @@
 package jalview.ws.rest.params;
 
 import jalview.datamodel.AlignmentI;
+import jalview.ws.params.OptionI;
+import jalview.ws.params.simple.BooleanOption;
+import jalview.ws.params.simple.Option;
 import jalview.ws.rest.InputType;
 import jalview.ws.rest.NoValidInputDataException;
 import jalview.ws.rest.RestJob;
@@ -18,6 +21,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.http.entity.mime.content.ContentBody;
@@ -47,7 +51,7 @@ public class Alignment extends InputType
   /**
    * input data as a file upload rather than inline content
    */
-  public boolean writeAsFile;
+  public boolean writeAsFile=false;
 
   @Override
   public ContentBody formatForInput(RestJob rj)
@@ -165,4 +169,20 @@ public class Alignment extends InputType
     }
     return false;
   }
+  @Override
+  public List<OptionI> getOptions()
+  {
+    List<OptionI> lst = getBaseOptions();
+    lst.add(new BooleanOption("jvsuffix","Append jalview style /start-end suffix to ID", false, false, jvsuffix, null));
+    lst.add(new BooleanOption("writeasfile","Append jalview style /start-end suffix to ID", false, false, writeAsFile, null));
+    
+    lst.add(new Option("format",
+            "Alignment upload format", true, "FASTA",
+            format, Arrays.asList(jalview.io.FormatAdapter.WRITEABLE_FORMATS), null));
+    lst.add(createMolTypeOption("type", "Sequence type", false, type,
+            null));
+    
+    return lst;
+  }
+
 }
\ No newline at end of file