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 2016/10/21 09:48:49 UTC
[15/29] incubator-taverna-workbench git commit: TAVERNA-1011 Use
DataBundles.resolve()
TAVERNA-1011 Use DataBundles.resolve()
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/1030bbc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/1030bbc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/1030bbc8
Branch: refs/heads/master
Commit: 1030bbc8164d2ca81810b1cfaae13117839d42f7
Parents: 798a4ef
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Aug 29 19:37:53 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 21 09:17:18 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
.../views/results/saveactions/SaveAllResultsSPI.java | 11 ++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/1030bbc8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ed54fc..b48d7fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<name>Apache Taverna Workbench</name>
<description>Graphical workbench for editing and running Apache Taverna workflows</description>
<properties>
- <taverna.language.version>0.15.1-incubating</taverna.language.version>
+ <taverna.language.version>0.16.0-incubating-SNAPSHOT</taverna.language.version>
<taverna.osgi.version>0.2.1-incubating</taverna.osgi.version>
<taverna.engine.version>3.1.0-incubating</taverna.engine.version>
<taverna.commonactivities.version>2.1.0-incubating</taverna.commonactivities.version>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/1030bbc8/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsSPI.java
----------------------------------------------------------------------
diff --git a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsSPI.java b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsSPI.java
index d45752d..976c637 100644
--- a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsSPI.java
+++ b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsSPI.java
@@ -37,8 +37,10 @@ import javax.swing.AbstractAction;
import javax.swing.JDialog;
import javax.swing.JFileChooser;
+import org.apache.taverna.databundle.DataBundles;
+import org.apache.taverna.databundle.DataBundles.ResolveOptions;
import org.apache.taverna.lang.ui.ExtensionFileFilter;
-import org.apache.taverna.platform.execution.impl.local.T2ReferenceConverter;
+//import org.apache.taverna.platform.execution.impl.local.T2ReferenceConverter;
import org.apache.log4j.Logger;
/**
@@ -169,12 +171,15 @@ public abstract class SaveAllResultsSPI extends AbstractAction {
Object result = null;
try {
if (chosenReferences.containsKey(name))
- result = T2ReferenceConverter.convertPathToObject(chosenReferences.get(name));
+ result = DataBundles.resolve(chosenReferences.get(name),
+ ResolveOptions.STRING,
+ ResolveOptions.REPLACE_ERRORS,
+ ResolveOptions.REPLACE_NULL);
} catch (IOException e) {
logger.warn("Error getting value for " + name, e);
}
if (result == null)
- result = "null";
+ result = "(null)";
return result;
}