TAVERNA-1002 Use own copy of createDefaultIterationStrategyStack
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/393b3224 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/393b3224 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/393b3224 Branch: refs/heads/master Commit: 393b3224e9c03fc8dedae171d0ab29848730050e Parents: c320db8 Author: Stian Soiland-Reyes <[email protected]> Authored: Fri Jul 1 01:30:33 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Fri Jul 1 01:30:33 2016 +0100 ---------------------------------------------------------------------- taverna-iteration-strategy-ui/pom.xml | 2 +- .../editor/IterationStrategyEditorControl.java | 19 ++++++++++++++++++- .../editor/RunIterationStrategyEditor.java | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/393b3224/taverna-iteration-strategy-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-iteration-strategy-ui/pom.xml b/taverna-iteration-strategy-ui/pom.xml index 174c7eb..aae2e15 100644 --- a/taverna-iteration-strategy-ui/pom.xml +++ b/taverna-iteration-strategy-ui/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>org.apache.taverna.language</groupId> <artifactId>taverna-scufl2-api</artifactId> - <version>0.15.2-incubating-SNAPSHOT</version> + <version>${taverna.language.version}</version> </dependency> <dependency> <groupId>org.apache.taverna.engine</groupId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/393b3224/taverna-iteration-strategy-ui/src/main/java/org/apache/taverna/workbench/iterationstrategy/editor/IterationStrategyEditorControl.java ---------------------------------------------------------------------- diff --git a/taverna-iteration-strategy-ui/src/main/java/org/apache/taverna/workbench/iterationstrategy/editor/IterationStrategyEditorControl.java b/taverna-iteration-strategy-ui/src/main/java/org/apache/taverna/workbench/iterationstrategy/editor/IterationStrategyEditorControl.java index d0213da..70ff008 100644 --- a/taverna-iteration-strategy-ui/src/main/java/org/apache/taverna/workbench/iterationstrategy/editor/IterationStrategyEditorControl.java +++ b/taverna-iteration-strategy-ui/src/main/java/org/apache/taverna/workbench/iterationstrategy/editor/IterationStrategyEditorControl.java @@ -45,8 +45,10 @@ import org.apache.taverna.scufl2.api.core.Processor; import org.apache.taverna.scufl2.api.iterationstrategy.CrossProduct; import org.apache.taverna.scufl2.api.iterationstrategy.DotProduct; import org.apache.taverna.scufl2.api.iterationstrategy.IterationStrategyNode; +import org.apache.taverna.scufl2.api.iterationstrategy.IterationStrategyStack; import org.apache.taverna.scufl2.api.iterationstrategy.IterationStrategyTopNode; import org.apache.taverna.scufl2.api.iterationstrategy.PortNode; +import org.apache.taverna.scufl2.api.port.InputProcessorPort; import org.apache.taverna.workbench.icons.WorkbenchIcons; import org.apache.taverna.workbench.iterationstrategy.IterationStrategyIcons; @@ -117,13 +119,28 @@ public class IterationStrategyEditorControl extends JPanel { private Processor processor; + public void createDefaultIterationStrategyStack(Processor p) { + p.setIterationStrategyStack(new IterationStrategyStack()); + CrossProduct crossProduct = new CrossProduct(); + for (InputProcessorPort in : p.getInputPorts()) { + // As this is a NamedSet the above will always be in + // the same alphabetical order + // FIXME: What about different Locales? + crossProduct.add(new PortNode(crossProduct, in)); + } + p.getIterationStrategyStack().add(crossProduct); + } + + /** * Create a new panel from the supplied iteration strategy */ public IterationStrategyEditorControl(Processor p) { this.processor = p; if (p.getIterationStrategyStack() == null || p.getIterationStrategyStack().isEmpty()) { - new Scufl2Tools().createDefaultIterationStrategyStack(p); + // FIXME: Use Scufl2Tools for taverna-language 0.15.2 or newer + // new Scufl2Tools().createDefaultIterationStrategyStack(p); + createDefaultIterationStrategyStack(p); } if (p.getIterationStrategyStack().size() > 1) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/393b3224/taverna-iteration-strategy-ui/src/test/java/org/apache/taverna/workbench/iterationstrategy/editor/RunIterationStrategyEditor.java ---------------------------------------------------------------------- diff --git a/taverna-iteration-strategy-ui/src/test/java/org/apache/taverna/workbench/iterationstrategy/editor/RunIterationStrategyEditor.java b/taverna-iteration-strategy-ui/src/test/java/org/apache/taverna/workbench/iterationstrategy/editor/RunIterationStrategyEditor.java index cf08594..a645c89 100644 --- a/taverna-iteration-strategy-ui/src/test/java/org/apache/taverna/workbench/iterationstrategy/editor/RunIterationStrategyEditor.java +++ b/taverna-iteration-strategy-ui/src/test/java/org/apache/taverna/workbench/iterationstrategy/editor/RunIterationStrategyEditor.java @@ -37,7 +37,7 @@ public class RunIterationStrategyEditor { InputProcessorPort fish = new InputProcessorPort(p, "fish"); fish.setDepth(2); InputProcessorPort other = new InputProcessorPort(p, "other"); - other.setDepth(0) + other.setDepth(0); InputProcessorPort soup = new InputProcessorPort(p, "soup"); soup.setDepth(1);
