X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2Fparams%2FJobConstant.java;h=d27f839501f81592698b6d51ce1af31aac62949a;hb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;hp=01b54cb023283f473bd956ee0486668b55bf1cab;hpb=231cba7c0cb9097957cd61ef96aab8e32e2d0337;p=jalview.git
diff --git a/src/jalview/ws/rest/params/JobConstant.java b/src/jalview/ws/rest/params/JobConstant.java
index 01b54cb..d27f839 100644
--- a/src/jalview/ws/rest/params/JobConstant.java
+++ b/src/jalview/ws/rest/params/JobConstant.java
@@ -1,10 +1,29 @@
+/*******************************************************************************
+ * 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
+ *
+ * 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 .
+ *******************************************************************************/
package jalview.ws.rest.params;
+import jalview.ws.params.OptionI;
import jalview.ws.rest.InputType;
import jalview.ws.rest.NoValidInputDataException;
import jalview.ws.rest.RestJob;
import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
@@ -13,17 +32,21 @@ import org.apache.http.entity.mime.content.StringBody;
/**
* defines a constant value always provided as a parameter.
+ *
* @author JimP
- *
+ *
*/
public class JobConstant extends InputType
{
String value;
+
/**
*
- * @param param name of parameter
- * @param val value of parameter
+ * @param param
+ * name of parameter
+ * @param val
+ * value of parameter
*/
public JobConstant(String param, String val)
{
@@ -37,7 +60,7 @@ public class JobConstant extends InputType
public ContentBody formatForInput(RestJob rj)
throws UnsupportedEncodingException, NoValidInputDataException
{
-
+
return new StringBody(value);
}
@@ -45,10 +68,17 @@ public class JobConstant extends InputType
public List getURLEncodedParameter()
{
ArrayList prm = new ArrayList();
-
- if (value!=null && value.length()>0)
+
+ if (value != null && value.length() > 0)
{
- prm.add(value);
+ try
+ {
+ prm.add(URLEncoder.encode(value, "UTF-8"));
+ } catch (UnsupportedEncodingException ex)
+ {
+ throw new Error("Couldn't encode '" + value + "' as UTF-8.", ex);
+
+ }
}
return prm;
}
@@ -63,11 +93,13 @@ public class JobConstant extends InputType
public boolean configureFromURLtokenString(List tokenstring,
StringBuffer warnings)
{
- if (tokenstring.size()>1) {
+ if (tokenstring.size() > 1)
+ {
warnings.append("IMPLEMENTATION ERROR: Constant POST parameters cannot have more than one value.");
return false;
}
- if (tokenstring.size()==1) {
+ if (tokenstring.size() == 1)
+ {
value = tokenstring.get(0);
}
return true;
@@ -80,4 +112,11 @@ public class JobConstant extends InputType
warnings.append("IMPLEMENTATION ERROR: No Properties to configure for a Constant parameter.");
return false;
}
+
+ @Override
+ public List getOptions()
+ {
+ // empty list - this parameter isn't configurable, so don't try.
+ return new ArrayList();
+ }
}