You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:29:10 UTC
[06/50] [abbrv] incubator-taverna-server git commit: Empty delimiter
is same as undelimited.
Empty delimiter is same as undelimited.
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/be2723ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/be2723ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/be2723ec
Branch: refs/heads/master
Commit: be2723ec3f5ad6bcc5573b4371d84b0842a4bf58
Parents: ef0aeb0
Author: Donal Fellows <do...@manchester.ac.uk>
Authored: Fri Mar 28 14:11:32 2014 +0000
Committer: Donal Fellows <do...@manchester.ac.uk>
Committed: Fri Mar 28 14:11:32 2014 +0000
----------------------------------------------------------------------
.../src/main/java/org/taverna/server/master/InputREST.java | 6 +++++-
.../org/taverna/server/master/rest/TavernaServerInputREST.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/be2723ec/server-webapp/src/main/java/org/taverna/server/master/InputREST.java
----------------------------------------------------------------------
diff --git a/server-webapp/src/main/java/org/taverna/server/master/InputREST.java b/server-webapp/src/main/java/org/taverna/server/master/InputREST.java
index a1a7387..6dd41d0 100644
--- a/server-webapp/src/main/java/org/taverna/server/master/InputREST.java
+++ b/server-webapp/src/main/java/org/taverna/server/master/InputREST.java
@@ -131,8 +131,12 @@ class InputREST implements TavernaServerInputREST, InputBean {
throw new BadInputPortNameException("bad input name");
if (ac == null)
throw new BadPropertyValueException("no content!");
+ if (inputDescriptor.delimiter != null
+ && inputDescriptor.delimiter.isEmpty())
+ inputDescriptor.delimiter = null;
if (ac instanceof InDesc.Reference)
- return setRemoteInput(name, (InDesc.Reference) ac, inputDescriptor.delimiter, ui);
+ return setRemoteInput(name, (InDesc.Reference) ac,
+ inputDescriptor.delimiter, ui);
if (!(ac instanceof InDesc.File || ac instanceof InDesc.Value))
throw new BadPropertyValueException("unknown content type");
support.permitUpdate(run);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/be2723ec/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java
----------------------------------------------------------------------
diff --git a/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java b/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java
index 14aad3f..dcd2629 100644
--- a/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java
+++ b/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java
@@ -292,7 +292,7 @@ public interface TavernaServerInputREST {
@XmlAttribute(required = false)
public Uri descriptorRef;
/** The character to use to split the input into a list. */
- @XmlAttribute(required = false)
+ @XmlAttribute(name = "listDelimiter", required = false)
public String delimiter;
/**