TAVERNA-988 brief attempt to update loop-ui for scufl2
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/7e375f80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/7e375f80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/7e375f80 Branch: refs/heads/master Commit: 7e375f80013eb7baf99b55dfe9cbd0e4d4e980d5 Parents: 2ddb60a Author: Stian Soiland-Reyes <[email protected]> Authored: Thu Jul 14 15:03:45 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Thu Jul 14 15:03:45 2016 +0100 ---------------------------------------------------------------------- .../taverna/workbench/loop/AddLoopFactory.java | 12 +++++------- .../workbench/loop/LoopConfigureAction.java | 17 +++++++++++------ 2 files changed, 16 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/7e375f80/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/AddLoopFactory.java ---------------------------------------------------------------------- diff --git a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/AddLoopFactory.java b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/AddLoopFactory.java index 087cba2..0adcbef 100644 --- a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/AddLoopFactory.java +++ b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/AddLoopFactory.java @@ -27,19 +27,17 @@ import java.util.List; import javax.swing.AbstractAction; import javax.swing.Action; +import org.apache.log4j.Logger; +import org.apache.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.scufl2.api.common.Scufl2Tools; +import org.apache.taverna.scufl2.api.configurations.Configuration; +import org.apache.taverna.scufl2.api.core.Processor; import org.apache.taverna.workbench.MainWindow; import org.apache.taverna.workbench.edits.EditManager; import org.apache.taverna.workbench.file.FileManager; import org.apache.taverna.workbench.selection.SelectionManager; import org.apache.taverna.workbench.ui.views.contextualviews.AddLayerFactorySPI; -import org.apache.log4j.Logger; - -import uk.org.taverna.configuration.app.ApplicationConfiguration; -import org.apache.taverna.scufl2.api.common.Scufl2Tools; -import org.apache.taverna.scufl2.api.configurations.Configuration; -import org.apache.taverna.scufl2.api.core.Processor; - import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/7e375f80/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureAction.java ---------------------------------------------------------------------- diff --git a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureAction.java b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureAction.java index d324c95..b359a16 100644 --- a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureAction.java +++ b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigureAction.java @@ -20,19 +20,23 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import org.apache.log4j.Logger; - -import com.fasterxml.jackson.databind.node.ObjectNode; - -import uk.org.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.scufl2.api.activity.Activity; +import org.apache.taverna.scufl2.api.common.Scufl2Tools; import org.apache.taverna.scufl2.api.core.Processor; +import org.apache.taverna.scufl2.api.port.InputPort; +import org.apache.taverna.scufl2.api.port.OutputPort; import org.apache.taverna.scufl2.api.profiles.Profile; - +import org.apache.taverna.workbench.edits.CompoundEdit; +import org.apache.taverna.workbench.edits.Edit; +import org.apache.taverna.workbench.edits.EditException; import org.apache.taverna.workbench.edits.EditManager; import org.apache.taverna.workbench.file.FileManager; import org.apache.taverna.workbench.helper.HelpEnabledDialog; -import org.apache.taverna.workflowmodel.Edit; import org.apache.taverna.workflowmodel.processor.dispatch.layers.LoopConfiguration; +import com.fasterxml.jackson.databind.node.ObjectNode; + /** * @author Alan R Williams * @author Stian Soiland-Reyes @@ -153,6 +157,7 @@ public class LoopConfigureAction extends AbstractAction { protected List<Edit<?>> checkPortMappings(Activity<?> conditionActivity) { List<Edit<?>> compoundEdit = new ArrayList<Edit<?>>(); + Activity x = new Scufl2Tools().processorBindingForProcessor(processor, profile).getBoundActivity(); if (processor.getActivityList().isEmpty()) { return compoundEdit; }
