X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FInputType.java;h=88431a6ff113d3550b03ce70bfad15677c3d1907;hb=aab74f8748bf49bf6b17ba82f0bc5644d4dc2853;hp=8741ddc630a714b27947e29cc707adc42a65e5af;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git diff --git a/src/jalview/ws/rest/InputType.java b/src/jalview/ws/rest/InputType.java index 8741ddc..88431a6 100644 --- a/src/jalview/ws/rest/InputType.java +++ b/src/jalview/ws/rest/InputType.java @@ -46,7 +46,8 @@ import org.apache.http.entity.mime.content.StringBody; */ public abstract class InputType { - private static final Pattern URL_PATTERN = Pattern.compile("^([^=]+)=?'?([^']*)?'?"); + private static final Pattern URL_PATTERN = Pattern + .compile("^([^=]+)=?'?([^']*)?'?"); /** * not used yet @@ -129,13 +130,13 @@ public abstract class InputType { if (type == null) { - return new StringBody(utf8.encode(content).asCharBuffer() - .toString()); + return new StringBody( + utf8.encode(content).asCharBuffer().toString()); } else { - return new StringBody(utf8.encode(content).asCharBuffer() - .toString(), type, utf8); + return new StringBody( + utf8.encode(content).asCharBuffer().toString(), type, utf8); } } catch (Exception ex) { @@ -306,9 +307,10 @@ public abstract class InputType { // TODO: revise architecture - this is counter intuitive - options with // different values to their names are actually parameters - rg = (arg.getValue().length() > 0) ? (arg.getValue().equals( - arg.getName()) ? arg.getName() : arg.getName() + "='" - + arg.getValue() + "'") : arg.getName(); + rg = (arg.getValue().length() > 0) + ? (arg.getValue().equals(arg.getName()) ? arg.getName() + : arg.getName() + "='" + arg.getValue() + "'") + : arg.getName(); } if (rg.length() > 0) { @@ -316,7 +318,8 @@ public abstract class InputType } } StringBuffer warnings; - if (!configureFromURLtokenString(urltoks, warnings = new StringBuffer())) + if (!configureFromURLtokenString(urltoks, + warnings = new StringBuffer())) { throw new InvalidArgumentException(warnings.toString()); } @@ -325,8 +328,8 @@ public abstract class InputType protected OptionI createMolTypeOption(String name, String descr, boolean req, molType curType, molType defType) { - return new Option(name, descr, req, defType == null ? "" - : defType.toString(), + return new Option(name, descr, req, + defType == null ? "" : defType.toString(), curType == null ? "" : curType.toString(), molType.toStringValues(), null); }