You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by re...@apache.org on 2015/03/30 12:15:52 UTC
incubator-taverna-workbench git commit:
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master 79ad02a24 -> 9b12e00e2
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/9b12e00e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/9b12e00e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/9b12e00e
Branch: refs/heads/master
Commit: 9b12e00e2f896e1dda16e54892df5225088f211c
Parents: 79ad02a
Author: Dmitry Repchevsky <re...@list.ru>
Authored: Mon Mar 30 12:08:49 2015 +0200
Committer: Dmitry Repchevsky <re...@list.ru>
Committed: Mon Mar 30 12:14:15 2015 +0200
----------------------------------------------------------------------
.../workbench/loop/LoopConfigurationPanel.java | 2 +-
.../ui/tree/PreRegistrationTreeDnDHandler.java | 3 +--
taverna-results-view/pom.xml | 5 -----
.../results/processor/ProcessorResultsComponent.java | 4 ++--
taverna-run-ui/pom.xml | 15 ---------------
.../workbench/run/actions/RunWorkflowAction.java | 10 +++++-----
6 files changed, 9 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9b12e00e/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigurationPanel.java b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigurationPanel.java
index 28fd47e..5f50c28 100644
--- a/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigurationPanel.java
+++ b/taverna-loop-ui/src/main/java/org/apache/taverna/workbench/loop/LoopConfigurationPanel.java
@@ -58,7 +58,7 @@ import org.apache.taverna.scufl2.api.core.Processor;
import org.apache.taverna.scufl2.api.profiles.Profile;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import net.sf.taverna.t2.activities.beanshell.views.BeanshellConfigurationPanel;
+import org.apache.taverna.activities.beanshell.views.BeanshellConfigurationPanel;
/**
* UI for {@link LoopConfiguration}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9b12e00e/taverna-reference-ui/src/main/java/org/apache/taverna/reference/ui/tree/PreRegistrationTreeDnDHandler.java
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/src/main/java/org/apache/taverna/reference/ui/tree/PreRegistrationTreeDnDHandler.java b/taverna-reference-ui/src/main/java/org/apache/taverna/reference/ui/tree/PreRegistrationTreeDnDHandler.java
index 0f1cadc..2a495a2 100644
--- a/taverna-reference-ui/src/main/java/org/apache/taverna/reference/ui/tree/PreRegistrationTreeDnDHandler.java
+++ b/taverna-reference-ui/src/main/java/org/apache/taverna/reference/ui/tree/PreRegistrationTreeDnDHandler.java
@@ -24,7 +24,6 @@ import static java.awt.datatransfer.DataFlavor.javaFileListFlavor;
import static java.awt.dnd.DnDConstants.ACTION_COPY;
import static java.awt.dnd.DnDConstants.ACTION_MOVE;
import static java.awt.dnd.DragSource.DefaultMoveDrop;
-import static org.apache.taverna.reference.ui.tree.PreRegistrationTreeDnDHandler.InternalNodeDragTransferable.INTERNAL_NODE_FLAVOR;
import java.awt.Point;
import java.awt.datatransfer.DataFlavor;
@@ -150,7 +149,7 @@ public abstract class PreRegistrationTreeDnDHandler implements
if (targetPath != null)
target = (MutableTreeNode) targetPath.getLastPathComponent();
Transferable tr = dtde.getTransferable();
- if (tr.isDataFlavorSupported(INTERNAL_NODE_FLAVOR)) {
+ if (tr.isDataFlavorSupported(InternalNodeDragTransferable.INTERNAL_NODE_FLAVOR)) {
dtde.acceptDrop(ACTION_MOVE);
handleNodeMove(draggedNode, target);
draggedNode = null;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9b12e00e/taverna-results-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-results-view/pom.xml b/taverna-results-view/pom.xml
index b02c74b..b53e146 100644
--- a/taverna-results-view/pom.xml
+++ b/taverna-results-view/pom.xml
@@ -51,11 +51,6 @@
<artifactId>taverna-provenanceconnector</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-provenanceconnector</artifactId>
- <version>${taverna.engine.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9b12e00e/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/ProcessorResultsComponent.java
----------------------------------------------------------------------
diff --git a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/ProcessorResultsComponent.java b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/ProcessorResultsComponent.java
index 0cf9064..d7c3741 100644
--- a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/ProcessorResultsComponent.java
+++ b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/processor/ProcessorResultsComponent.java
@@ -96,8 +96,8 @@ import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.TreePath;
-import net.sf.taverna.t2.facade.WorkflowInstanceFacade;
-import net.sf.taverna.t2.facade.WorkflowInstanceFacade.State;
+import org.apache.taverna.facade.WorkflowInstanceFacade;
+import org.apache.taverna.facade.WorkflowInstanceFacade.State;
import org.apache.taverna.lang.ui.DialogTextArea;
import net.sf.taverna.t2.provenance.ProvenanceConnectorFactory;
import net.sf.taverna.t2.provenance.api.ProvenanceAccess;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9b12e00e/taverna-run-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-run-ui/pom.xml b/taverna-run-ui/pom.xml
index a8bc0b7..989f44a 100644
--- a/taverna-run-ui/pom.xml
+++ b/taverna-run-ui/pom.xml
@@ -51,11 +51,6 @@
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-menu-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-edits-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
@@ -71,21 +66,11 @@
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-file-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-reference-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-report-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9b12e00e/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/RunWorkflowAction.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/RunWorkflowAction.java b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/RunWorkflowAction.java
index 18cd40a..8c80c02 100644
--- a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/RunWorkflowAction.java
+++ b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/RunWorkflowAction.java
@@ -26,7 +26,7 @@ import static java.awt.Toolkit.getDefaultToolkit;
import static java.awt.event.KeyEvent.VK_R;
import static javax.swing.KeyStroke.getKeyStroke;
import static javax.swing.SwingUtilities.invokeLater;
-import static net.sf.taverna.t2.reference.ui.InvalidDataflowReport;
+import static org.apache.taverna.reference.ui.InvalidDataflowReport;
import static org.apache.taverna.workbench.icons.WorkbenchIcons.runIcon;
import java.awt.event.ActionEvent;
@@ -39,10 +39,10 @@ import javax.swing.AbstractAction;
import org.apache.taverna.lang.observer.Observable;
import org.apache.taverna.lang.observer.Observer;
-import net.sf.taverna.t2.reference.ui.CopyWorkflowInProgressDialog;
-import net.sf.taverna.t2.reference.ui.CopyWorkflowSwingWorker;
-import net.sf.taverna.t2.reference.ui.WorkflowLaunchWindow;
-import net.sf.taverna.t2.reference.ui.referenceactions.ReferenceActionSPI;
+import org.apache.taverna.reference.ui.CopyWorkflowInProgressDialog;
+import org.apache.taverna.reference.ui.CopyWorkflowSwingWorker;
+import org.apache.taverna.reference.ui.WorkflowLaunchWindow;
+import org.apache.taverna.reference.ui.referenceactions.ReferenceActionSPI;
import org.apache.taverna.workbench.edits.EditManager;
import org.apache.taverna.workbench.file.FileManager;
import org.apache.taverna.workbench.file.events.ClosedDataflowEvent;