X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Frest%2Fparams%2FTree.java;h=5baa61f98c26a6d4a5fb097226c9b219592c5a1a;hb=864558097ceffef983b15f24598cfdaf20efd52d;hp=69d2f58c2c400625347e95fb01afee1d2b3cc6c8;hpb=231cba7c0cb9097957cd61ef96aab8e32e2d0337;p=jalview.git
diff --git a/src/jalview/ws/rest/params/Tree.java b/src/jalview/ws/rest/params/Tree.java
index 69d2f58..5baa61f 100644
--- a/src/jalview/ws/rest/params/Tree.java
+++ b/src/jalview/ws/rest/params/Tree.java
@@ -1,10 +1,29 @@
+/*
+ * 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.
+ *
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ws.rest.params;
-import jalview.datamodel.AlignmentI;
+import jalview.util.MessageManager;
+import jalview.ws.params.OptionI;
import jalview.ws.rest.InputType;
import jalview.ws.rest.RestJob;
-import jalview.ws.rest.RestServiceDescription;
-import jalview.ws.rest.InputType.molType;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
@@ -14,30 +33,37 @@ import org.apache.http.entity.mime.content.ContentBody;
/**
* format a tree for input to a rest service
+ *
* @author JimP
- *
+ *
*/
-public class Tree extends InputType {
+public class Tree extends InputType
+{
public Tree()
{
- super(new Class[] { jalview.analysis.NJTree.class} );
+ super(new Class[] { jalview.analysis.NJTree.class });
}
// TODO specify modifiers for tree output format
@Override
- public ContentBody formatForInput(RestJob rj) throws UnsupportedEncodingException
+ public ContentBody formatForInput(RestJob rj)
+ throws UnsupportedEncodingException
{
// TODO: implement tree inputType
- /*rj.getTreeForInput(token);
- return new StringBody(new ) */
- throw new Error("Tree InputType not yet implemented");
- //return null;
+ /*
+ * rj.getTreeForInput(token); return new StringBody(new )
+ */
+ throw new Error(
+ MessageManager
+ .getString("error.tree_inputtype_not_yet_implemented"));
+ // return null;
}
+
public String getURLtokenPrefix()
{
- return "NEWICK";
+ return "NEWICK";
}
-
+
@Override
public List getURLEncodedParameter()
{
@@ -53,4 +79,10 @@ public class Tree extends InputType {
return true;
}
-}
\ No newline at end of file
+ @Override
+ public List getOptions()
+ {
+ return getBaseOptions();
+ }
+
+}