git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into releases/Release_2_11_1_Branch
[jalview.git]
/
src
/
jalview
/
ws
/
rest
/
InputType.java
diff --git
a/src/jalview/ws/rest/InputType.java
b/src/jalview/ws/rest/InputType.java
index
fff318e
..
88431a6
100644
(file)
--- a/
src/jalview/ws/rest/InputType.java
+++ b/
src/jalview/ws/rest/InputType.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-130,13
+130,13
@@
public abstract class InputType
{
if (type == null)
{
{
if (type == null)
{
- return new StringBody(utf8.encode(content).asCharBuffer()
- .toString());
+ return new StringBody(
+ utf8.encode(content).asCharBuffer().toString());
}
else
{
}
else
{
- return new StringBody(utf8.encode(content).asCharBuffer()
- .toString(), type, utf8);
+ return new StringBody(
+ utf8.encode(content).asCharBuffer().toString(), type, utf8);
}
} catch (Exception ex)
{
}
} catch (Exception ex)
{
@@
-307,9
+307,10
@@
public abstract class InputType
{
// TODO: revise architecture - this is counter intuitive - options with
// different values to their names are actually parameters
{
// 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)
{
}
if (rg.length() > 0)
{
@@
-317,7
+318,8
@@
public abstract class InputType
}
}
StringBuffer warnings;
}
}
StringBuffer warnings;
- if (!configureFromURLtokenString(urltoks, warnings = new StringBuffer()))
+ if (!configureFromURLtokenString(urltoks,
+ warnings = new StringBuffer()))
{
throw new InvalidArgumentException(warnings.toString());
}
{
throw new InvalidArgumentException(warnings.toString());
}
@@
-326,8
+328,8
@@
public abstract class InputType
protected OptionI createMolTypeOption(String name, String descr,
boolean req, molType curType, molType defType)
{
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);
}
curType == null ? "" : curType.toString(),
molType.toStringValues(), null);
}