http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/pom.xml 
b/taverna-dataflow-activity-ui/pom.xml
deleted file mode 100644
index d93cf07..0000000
--- a/taverna-dataflow-activity-ui/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-                <groupId>net.sf.taverna</groupId>
-                <artifactId>taverna-parent</artifactId>
-                <version>3.0.1-SNAPSHOT</version>
-       </parent>
-       <groupId>net.sf.taverna.t2.ui-activities</groupId>
-       <artifactId>dataflow-activity-ui</artifactId>
-        <version>2.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
-       <name>Taverna 2 Dataflow Activity UI</name>
-       <dependencies>
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-api</groupId>
-                       <artifactId>activity-icons-api</artifactId>
-                       <version>${t2.ui.api.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-api</groupId>
-                       <artifactId>activity-palette-api</artifactId>
-                       <version>${t2.ui.api.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-api</groupId>
-                       <artifactId>contextual-views-api</artifactId>
-                       <version>${t2.ui.api.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-api</groupId>
-                       <artifactId>file-api</artifactId>
-                       <version>${t2.ui.api.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-api</groupId>
-                       <artifactId>edits-api</artifactId>
-                       <version>${t2.ui.api.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-components</groupId>
-                       <artifactId>workflow-view</artifactId>
-                       <version>${t2.ui.components.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-components</groupId>
-                       <artifactId>graph-view</artifactId>
-                       <version>${t2.ui.components.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>uk.org.taverna.scufl2</groupId>
-                       <artifactId>scufl2-api</artifactId>
-                       <version>${scufl2.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.help</groupId>
-                       <artifactId>javahelp</artifactId>
-                        <version>${javahelp.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-api</groupId>
-                       <artifactId>activity-tools</artifactId>
-                       <version>${t2.ui.api.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-api</groupId>
-                       <artifactId>helper-api</artifactId>
-                       <version>${t2.ui.api.version}</version>
-               </dependency>
-
-               <!--  testing dependencies -->
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-                        <version> ${junit.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-impl</groupId>
-                       <artifactId>file-impl</artifactId>
-                       <version>${t2.ui.impl.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.taverna.t2.ui-impl</groupId>
-                       <artifactId>edits-impl</artifactId>
-                       <version>${t2.ui.impl.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <!-- <dependency>
-                       <groupId>uk.org.taverna.scufl2</groupId>
-                       <artifactId>scufl2-t2flow</artifactId>
-                       <version>${scufl2.version}</version>
-                       <scope>test</scope>
-               </dependency> -->
-       </dependencies>
-       <repositories>
-               <repository>
-                       <releases />
-                       <snapshots>
-                               <enabled>false</enabled>
-                       </snapshots>
-                       <id>mygrid-repository</id>
-                       <name>myGrid Repository</name>
-                       <url>http://www.mygrid.org.uk/maven/repository
-                       </url>
-               </repository>
-               <repository>
-                       <releases>
-                               <enabled>false</enabled>
-                       </releases>
-                       <snapshots />
-                       <id>mygrid-snapshot-repository</id>
-                       <name>myGrid Snapshot Repository</name>
-                       
<url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
-               </repository>
-       </repositories>
-</project>
-

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/actions/EditNestedDataflowAction.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/actions/EditNestedDataflowAction.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/actions/EditNestedDataflowAction.java
deleted file mode 100644
index 679209c..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/actions/EditNestedDataflowAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *
- */
-package net.sf.taverna.t2.activities.dataflow.actions;
-
-import java.awt.event.ActionEvent;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-
-import com.fasterxml.jackson.databind.JsonNode;
-
-import 
net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowTemplateService;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.common.Scufl2Tools;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.profiles.ProcessorBinding;
-
-@SuppressWarnings("serial")
-public class EditNestedDataflowAction extends AbstractAction {
-
-       private final Activity activity;
-       private final SelectionManager selectionManager;
-
-       private Scufl2Tools scufl2Tools = new Scufl2Tools();
-
-       public EditNestedDataflowAction(Activity activity, SelectionManager 
selectionManager) {
-               super("Edit nested workflow");
-               this.activity = activity;
-               this.selectionManager = selectionManager;
-       }
-
-       public void actionPerformed(ActionEvent e) {
-               if 
(activity.getType().equals(DataflowTemplateService.ACTIVITY_TYPE)) {
-                       for (Configuration configuration : 
scufl2Tools.configurationsFor(activity, selectionManager.getSelectedProfile())) 
{
-                               JsonNode nested = 
configuration.getJson().get("nestedWorkflow");
-                               Workflow nestedWorkflow = 
selectionManager.getSelectedWorkflowBundle().getWorkflows().getByName(nested.asText());
-                               if (nestedWorkflow != null) {
-                                       
selectionManager.setSelectedWorkflow(nestedWorkflow);
-                                       break;
-                               }
-                       }
-               }
-       }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/menu/EditNestedDataflowMenuAction.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/menu/EditNestedDataflowMenuAction.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/menu/EditNestedDataflowMenuAction.java
deleted file mode 100644
index 8bdf0e1..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/menu/EditNestedDataflowMenuAction.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package net.sf.taverna.t2.activities.dataflow.menu;
-
-import javax.swing.Action;
-
-import net.sf.taverna.t2.activities.dataflow.actions.EditNestedDataflowAction;
-import 
net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowTemplateService;
-import 
net.sf.taverna.t2.workbench.activitytools.AbstractConfigureActivityMenuAction;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-
-public class EditNestedDataflowMenuAction extends 
AbstractConfigureActivityMenuAction {
-
-       private SelectionManager selectionManager;
-
-       public EditNestedDataflowMenuAction() {
-               super(DataflowTemplateService.ACTIVITY_TYPE);
-       }
-
-       @Override
-       protected Action createAction() {
-               EditNestedDataflowAction configAction = new 
EditNestedDataflowAction(findActivity(), selectionManager);
-               return configAction;
-       }
-
-       public void setSelectionManager(SelectionManager selectionManager) {
-               this.selectionManager = selectionManager;
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowActivityIcon.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowActivityIcon.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowActivityIcon.java
deleted file mode 100644
index 6d7e766..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowActivityIcon.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- *  Modifications to the initial code base are copyright of their
- *  respective authors, or their employers as appropriate.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- 
******************************************************************************/
-package net.sf.taverna.t2.activities.dataflow.servicedescriptions;
-
-import java.net.URI;
-
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconSPI;
-
-/**
- *
- * @author Alex Nenadic
- * @author alanrw
- *
- */
-public class DataflowActivityIcon implements ActivityIconSPI{
-
-       private static Icon icon;
-
-       public int canProvideIconScore(URI activityType) {
-               if (DataflowTemplateService.ACTIVITY_TYPE.equals(activityType))
-                       return DEFAULT_ICON + 1;
-               else
-                       return NO_ICON;
-       }
-
-       public Icon getIcon(URI activityType) {
-               return getDataflowIcon();
-       }
-
-       public static Icon getDataflowIcon() {
-               if (icon == null) {
-                       icon = new 
ImageIcon(DataflowActivityIcon.class.getResource("/dataflow.png"));
-               }
-               return icon;
-       }
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowTemplateService.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowTemplateService.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowTemplateService.java
deleted file mode 100644
index f5cd8f2..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowTemplateService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package net.sf.taverna.t2.activities.dataflow.servicedescriptions;
-
-import java.net.URI;
-
-import javax.swing.Icon;
-
-import net.sf.taverna.t2.servicedescriptions.AbstractTemplateService;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescription;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
-
-public class DataflowTemplateService extends AbstractTemplateService {
-
-       public static final URI ACTIVITY_TYPE = 
URI.create("http://ns.taverna.org.uk/2010/activity/nested-workflow";);
-
-       private static final String A_CONFIGURABLE_NESTED_WORKFLOW = "A service 
that allows you to have one workflow nested within another";
-       private static final String DATAFLOW = "Nested workflow";
-
-       private static final URI providerId = 
URI.create("http://taverna.sf.net/2010/service-provider/dataflow";);
-
-       @Override
-       public URI getActivityType() {
-               return ACTIVITY_TYPE;
-       }
-
-       @Override
-       public Configuration getActivityConfiguration() {
-               Configuration configuration = new Configuration();
-               configuration.setType(ACTIVITY_TYPE.resolve("#Config"));
-               return configuration;
-       }
-
-       @Override
-       public Icon getIcon() {
-               return DataflowActivityIcon.getDataflowIcon();
-       }
-
-       public String getName() {
-               return DATAFLOW;
-       }
-
-       public String getDescription() {
-               return A_CONFIGURABLE_NESTED_WORKFLOW;
-       }
-
-       public static ServiceDescription getServiceDescription() {
-               DataflowTemplateService dts = new DataflowTemplateService();
-               return dts.templateService;
-       }
-
-       public String getId() {
-               return providerId.toString();
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityContextualView.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityContextualView.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityContextualView.java
deleted file mode 100644
index 7bc44cb..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityContextualView.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- *  Modifications to the initial code base are copyright of their
- *  respective authors, or their employers as appropriate.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- 
******************************************************************************/
-package net.sf.taverna.t2.activities.dataflow.views;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.Frame;
-
-import javax.swing.Action;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-
-import net.sf.taverna.t2.activities.dataflow.actions.EditNestedDataflowAction;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import 
net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import 
net.sf.taverna.t2.workbench.file.importworkflow.actions.ReplaceNestedWorkflowAction;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import 
net.sf.taverna.t2.workbench.ui.actions.activity.HTMLBasedActivityContextualView;
-
-import org.apache.log4j.Logger;
-
-import uk.org.taverna.scufl2.api.activity.Activity;
-
-@SuppressWarnings("serial")
-public class DataflowActivityContextualView extends 
HTMLBasedActivityContextualView {
-
-       static Logger logger = 
Logger.getLogger(DataflowActivityContextualView.class);
-
-       private final EditManager editManager;
-       private final FileManager fileManager;
-       private final MenuManager menuManager;
-       private final ActivityIconManager activityIconManager;
-       private final ColourManager colourManager;
-       private final WorkbenchConfiguration workbenchConfiguration;
-       private final ServiceDescriptionRegistry serviceDescriptionRegistry;
-
-       private final SelectionManager selectionManager;
-
-       public DataflowActivityContextualView(Activity activity, EditManager 
editManager,
-                       FileManager fileManager, MenuManager menuManager,
-                       ActivityIconManager activityIconManager, ColourManager 
colourManager,
-                       ServiceDescriptionRegistry serviceDescriptionRegistry,
-                       WorkbenchConfiguration workbenchConfiguration, 
SelectionManager selectionManager) {
-               super(activity, colourManager);
-               this.editManager = editManager;
-               this.fileManager = fileManager;
-               this.menuManager = menuManager;
-               this.activityIconManager = activityIconManager;
-               this.colourManager = colourManager;
-               this.serviceDescriptionRegistry = serviceDescriptionRegistry;
-               this.workbenchConfiguration = workbenchConfiguration;
-               this.selectionManager = selectionManager;
-               addEditButtons();
-       }
-
-       @Override
-       public Activity getActivity() {
-               return super.getActivity();
-       }
-
-       public void addEditButtons() {
-               JComponent mainFrame = getMainFrame();
-               JButton viewWorkflowButton = new JButton("Edit workflow");
-               viewWorkflowButton.addActionListener(new 
EditNestedDataflowAction(getActivity(),
-                               selectionManager));
-               JButton configureButton = new JButton(new 
ReplaceNestedWorkflowAction(getActivity(),
-                               editManager, fileManager, menuManager, 
activityIconManager, colourManager,
-                               serviceDescriptionRegistry, 
workbenchConfiguration, selectionManager));
-               configureButton.setIcon(null);
-               JPanel flowPanel = new JPanel(new FlowLayout());
-               flowPanel.add(viewWorkflowButton);
-               flowPanel.add(configureButton);
-               mainFrame.add(flowPanel, BorderLayout.SOUTH);
-               mainFrame.revalidate();
-       }
-
-//     @Override
-//     public JComponent getMainFrame() {
-//             JComponent mainFrame = super.getMainFrame();
-//             JButton viewWorkflowButton = new JButton("Edit workflow");
-//             viewWorkflowButton.addActionListener(new 
EditNestedDataflowAction(getActivity(),
-//                             selectionManager));
-//             JButton configureButton = new JButton(new 
ReplaceNestedWorkflowAction(getActivity(),
-//                             editManager, fileManager, menuManager, 
activityIconManager, colourManager,
-//                             serviceDescriptionRegistry, 
workbenchConfiguration, selectionManager));
-//             configureButton.setIcon(null);
-//             JPanel flowPanel = new JPanel(new FlowLayout());
-//             flowPanel.add(viewWorkflowButton);
-//             flowPanel.add(configureButton);
-//             mainFrame.add(flowPanel, BorderLayout.SOUTH);
-//             return mainFrame;
-//     }
-
-       @Override
-       protected String getRawTableRowsHtml() {
-               return ("<tr><td colspan=2>" + getActivity().getName() + 
"</td></tr>");
-       }
-
-       @Override
-       public String getViewTitle() {
-               return "Nested workflow";
-       }
-
-       @Override
-       public Action getConfigureAction(Frame owner) {
-               return null;
-               // return new OpenNestedDataflowFromFileAction(
-               // (DataflowActivity) getActivity(), owner);
-       }
-
-       @Override
-       public int getPreferredPosition() {
-               return 100;
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityViewFactory.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityViewFactory.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityViewFactory.java
deleted file mode 100644
index e5d8f33..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityViewFactory.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- *  Modifications to the initial code base are copyright of their
- *  respective authors, or their employers as appropriate.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- 
******************************************************************************/
-package net.sf.taverna.t2.activities.dataflow.views;
-
-import java.util.Arrays;
-import java.util.List;
-
-import 
net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowTemplateService;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import 
net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
-import 
net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import uk.org.taverna.scufl2.api.activity.Activity;
-
-public class DataflowActivityViewFactory implements 
ContextualViewFactory<Activity> {
-
-       private EditManager editManager;
-       private FileManager fileManager;
-       private MenuManager menuManager;
-       private ColourManager colourManager;
-       private ActivityIconManager activityIconManager;
-       private WorkbenchConfiguration workbenchConfiguration;
-       private ServiceDescriptionRegistry serviceDescriptionRegistry;
-       private SelectionManager selectionManager;
-
-       public boolean canHandle(Object object) {
-               return object instanceof Activity
-                               && ((Activity) 
object).getType().equals(DataflowTemplateService.ACTIVITY_TYPE);
-       }
-
-       public List<ContextualView> getViews(Activity activity) {
-               return Arrays.asList(new ContextualView[] { new 
DataflowActivityContextualView(activity,
-                               editManager, fileManager, menuManager, 
activityIconManager, colourManager,
-                               serviceDescriptionRegistry, 
workbenchConfiguration, selectionManager) });
-       }
-
-       public void setEditManager(EditManager editManager) {
-               this.editManager = editManager;
-       }
-
-       public void setFileManager(FileManager fileManager) {
-               this.fileManager = fileManager;
-       }
-
-       public void setMenuManager(MenuManager menuManager) {
-               this.menuManager = menuManager;
-       }
-
-       public void setActivityIconManager(ActivityIconManager 
activityIconManager) {
-               this.activityIconManager = activityIconManager;
-       }
-
-       public void setColourManager(ColourManager colourManager) {
-               this.colourManager = colourManager;
-       }
-
-       public void setServiceDescriptionRegistry(ServiceDescriptionRegistry 
serviceDescriptionRegistry) {
-               this.serviceDescriptionRegistry = serviceDescriptionRegistry;
-       }
-
-       public void setWorkbenchConfiguration(WorkbenchConfiguration 
workbenchConfiguration) {
-               this.workbenchConfiguration = workbenchConfiguration;
-       }
-
-       public void setSelectionManager(SelectionManager selectionManager) {
-               this.selectionManager = selectionManager;
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/DataflowMerger.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/DataflowMerger.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/DataflowMerger.java
deleted file mode 100644
index 327e5a7..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/DataflowMerger.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sf.taverna.t2.workbench.edits.CompoundEdit;
-import net.sf.taverna.t2.workbench.edits.Edit;
-import net.sf.taverna.t2.workflow.edits.AddChildEdit;
-import net.sf.taverna.t2.workflow.edits.AddDataLinkEdit;
-import net.sf.taverna.t2.workflow.edits.AddProcessorEdit;
-import net.sf.taverna.t2.workflow.edits.AddWorkflowInputPortEdit;
-import net.sf.taverna.t2.workflow.edits.AddWorkflowOutputPortEdit;
-import uk.org.taverna.scufl2.api.common.AbstractCloneable;
-import uk.org.taverna.scufl2.api.container.WorkflowBundle;
-import uk.org.taverna.scufl2.api.core.ControlLink;
-import uk.org.taverna.scufl2.api.core.DataLink;
-import uk.org.taverna.scufl2.api.core.Processor;
-import uk.org.taverna.scufl2.api.core.Workflow;
-import uk.org.taverna.scufl2.api.port.InputWorkflowPort;
-import uk.org.taverna.scufl2.api.port.OutputWorkflowPort;
-
-/**
- * A tool that allows merging of two workflow.
- * <p>
- * The merge is performed as a series of edit, inserting a copy of the source
- * workflow into the destination workflow.
- *
- * @author Stian Soiland-Reyes
- * @author David Withers
- */
-public class DataflowMerger {
-
-       /**
-        * Make a copy of a workflow.
-        *
-        * @param source
-        *            workflow to copy
-        * @return A copy of the workflow.
-        */
-       public static Workflow copyWorkflow(Workflow source) {
-               WorkflowBundle workflowBundle = 
AbstractCloneable.cloneWorkflowBean(source.getParent());
-               return 
workflowBundle.getWorkflows().getByName(source.getName());
-       }
-
-       private final Workflow destinationWorkflow;
-
-       /**
-        * Construct a {@link DataflowMerger} for the given destination 
workflow.
-        *
-        * @param destinationWorkflow
-        *            Workflow to be merged into
-        */
-       public DataflowMerger(Workflow destinationWorkflow) {
-               this.destinationWorkflow = destinationWorkflow;
-       }
-
-       /**
-        * Make an {@link Edit} that when performed merges the given source 
dataflow
-        * into the destination dataflow.
-        * <p>
-        * Internally a copy is made of the source dataflow, to avoid modifying 
the
-        * links and processors.
-        *
-        * @param sourceDataflow
-        *            Dataflow to merge from
-        * @return An edit that can perform and undo the insertion of the 
components
-        *         from the source dataflow.
-        * @throws MergeException
-        *             If the merge cannot be performed.
-        */
-       public CompoundEdit getMergeEdit(Workflow sourceDataflow)
-                       throws MergeException {
-               return getMergeEdit(sourceDataflow, "");
-       }
-
-       /**
-        * Make an {@link Edit} that when performed merges the given source 
dataflow
-        * into the destination dataflow.
-        * <p>
-        * Internally a copy is made of the source dataflow, to avoid modifying 
the
-        * links and processors.
-        *
-        * @param sourceWorkflow
-        *            Dataflow to merge from
-        * @param prefix
-        *            A prefix which will be inserted in front of the names for 
the
-        *            merged workflow components.
-        * @return An edit that can perform and undo the insertion of the 
components
-        *         from the source dataflow.
-        * @throws MergeException
-        *             If the merge cannot be performed.
-        */
-       public CompoundEdit getMergeEdit(Workflow sourceWorkflow, String prefix)
-                       throws MergeException {
-               List<Edit<?>> compoundEdit = new ArrayList<>();
-
-               Workflow workflow = copyWorkflow(sourceWorkflow);
-
-               for (InputWorkflowPort input : workflow.getInputPorts()) {
-                       
destinationWorkflow.getInputPorts().addWithUniqueName(input);
-                       destinationWorkflow.getInputPorts().remove(input);
-                       compoundEdit.add(new 
AddWorkflowInputPortEdit(destinationWorkflow, input));
-               }
-               for (OutputWorkflowPort output : workflow.getOutputPorts()) {
-                       
destinationWorkflow.getOutputPorts().addWithUniqueName(output);
-                       destinationWorkflow.getOutputPorts().remove(output);
-                       compoundEdit.add(new 
AddWorkflowOutputPortEdit(destinationWorkflow, output));
-               }
-               for (Processor processor : workflow.getProcessors()) {
-                       processor.setName(prefix + processor.getName());
-                       compoundEdit.add(new 
AddProcessorEdit(destinationWorkflow, processor));
-               }
-               for (DataLink dataLink : workflow.getDataLinks()) {
-                       compoundEdit.add(new 
AddDataLinkEdit(destinationWorkflow, dataLink));
-               }
-               for (ControlLink controlLink : workflow.getControlLinks()) {
-                       compoundEdit.add(new 
AddChildEdit<Workflow>(destinationWorkflow, controlLink));
-               }
-
-               return new CompoundEdit(compoundEdit);
-
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/MergeException.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/MergeException.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/MergeException.java
deleted file mode 100644
index 3645f91..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/MergeException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow;
-
-public class MergeException extends Exception {
-       private static final long serialVersionUID = 6018700359518335402L;
-
-       public MergeException() {
-               super();
-       }
-
-       public MergeException(String message, Throwable cause) {
-               super(message, cause);
-       }
-
-       public MergeException(String message) {
-               super(message);
-       }
-
-       public MergeException(Throwable cause) {
-               super(cause);
-       }
-       
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/AddNestedWorkflowAction.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/AddNestedWorkflowAction.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/AddNestedWorkflowAction.java
deleted file mode 100644
index d6f04dd..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/AddNestedWorkflowAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow.actions;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-
-import 
net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowActivityIcon;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import 
net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import 
net.sf.taverna.t2.workbench.file.importworkflow.gui.ImportWorkflowWizard;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.Utils;
-
-/**
- * An action for adding a nested workflow.
- *
- * @author Stian Soiland-Reyes
- *
- */
-public class AddNestedWorkflowAction extends AbstractAction {
-       private static final long serialVersionUID = -2242979457902699028L;
-       private final EditManager editManager;
-       private final FileManager fileManager;
-       private final MenuManager menuManager;
-       private final ColourManager colourManager;
-       private final WorkbenchConfiguration workbenchConfiguration;
-       private final SelectionManager selectionManager;
-
-       public AddNestedWorkflowAction(EditManager editManager, FileManager 
fileManager,
-                       MenuManager menuManager, ColourManager colourManager,
-                       WorkbenchConfiguration workbenchConfiguration, 
SelectionManager selectionManager) {
-               super("Add nested workflow", 
DataflowActivityIcon.getDataflowIcon());
-               this.editManager = editManager;
-               this.fileManager = fileManager;
-               this.menuManager = menuManager;
-               this.colourManager = colourManager;
-               this.workbenchConfiguration = workbenchConfiguration;
-               this.selectionManager = selectionManager;
-       }
-
-       public void actionPerformed(ActionEvent e) {
-               final Component parentComponent;
-               if (e.getSource() instanceof Component) {
-                       parentComponent = (Component) e.getSource();
-               } else {
-                       parentComponent = null;
-               }
-               ImportWorkflowWizard wizard = new ImportWorkflowWizard(
-                               Utils.getParentFrame(parentComponent), 
editManager, fileManager, menuManager,
-                               colourManager, workbenchConfiguration, 
selectionManager);
-               wizard.setMergeEnabled(false);
-               wizard.setVisible(true);
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ImportWorkflowAction.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ImportWorkflowAction.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ImportWorkflowAction.java
deleted file mode 100644
index 6d9fffb..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ImportWorkflowAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow.actions;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-
-import 
net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowActivityIcon;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import 
net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import 
net.sf.taverna.t2.workbench.file.importworkflow.gui.ImportWorkflowWizard;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.Utils;
-
-/**
- * A general version of {@link AddNestedWorkflowAction} and {@link 
MergeWorkflowAction} that allows
- * the user to choose which action to perform.
- *
- * @author Stian Soiland-Reyes
- *
- */
-public class ImportWorkflowAction extends AbstractAction {
-       private static final long serialVersionUID = -2242979457902699028L;
-       private final EditManager editManager;
-       private final FileManager fileManager;
-       private final MenuManager menuManager;
-       private final ColourManager colourManager;
-       private final WorkbenchConfiguration workbenchConfiguration;
-       private final SelectionManager selectionManager;
-
-       public ImportWorkflowAction(EditManager editManager, FileManager 
fileManager,
-                       MenuManager menuManager, ColourManager colourManager,
-                       WorkbenchConfiguration workbenchConfiguration, 
SelectionManager selectionManager) {
-               super("Import workflow", 
DataflowActivityIcon.getDataflowIcon());
-               this.editManager = editManager;
-               this.fileManager = fileManager;
-               this.menuManager = menuManager;
-               this.colourManager = colourManager;
-               this.workbenchConfiguration = workbenchConfiguration;
-               this.selectionManager = selectionManager;
-       }
-
-       public void actionPerformed(ActionEvent e) {
-               final Component parentComponent;
-               if (e.getSource() instanceof Component) {
-                       parentComponent = (Component) e.getSource();
-               } else {
-                       parentComponent = null;
-               }
-               ImportWorkflowWizard wizard = new ImportWorkflowWizard(
-                               Utils.getParentFrame(parentComponent), 
editManager, fileManager, menuManager,
-                               colourManager, workbenchConfiguration, 
selectionManager);
-               wizard.setVisible(true);
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/MergeWorkflowAction.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/MergeWorkflowAction.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/MergeWorkflowAction.java
deleted file mode 100644
index d86f97c..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/MergeWorkflowAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow.actions;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import 
net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import 
net.sf.taverna.t2.workbench.file.importworkflow.gui.ImportWorkflowWizard;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.Utils;
-
-/**
- * An action for merging two workflows
- *
- * @author Stian Soiland-Reyes
- *
- */
-public class MergeWorkflowAction extends AbstractAction {
-       private static final long serialVersionUID = -2242979457902699028L;
-       private final EditManager editManager;
-       private final FileManager fileManager;
-       private final MenuManager menuManager;
-       private final ColourManager colourManager;
-       private final WorkbenchConfiguration workbenchConfiguration;
-       private final SelectionManager selectionManager;
-
-       public MergeWorkflowAction(EditManager editManager, FileManager 
fileManager,
-                       MenuManager menuManager, ColourManager colourManager,
-                       WorkbenchConfiguration workbenchConfiguration, 
SelectionManager selectionManager) {
-               super("Merge workflow");
-               this.editManager = editManager;
-               this.fileManager = fileManager;
-               this.menuManager = menuManager;
-               this.colourManager = colourManager;
-               this.workbenchConfiguration = workbenchConfiguration;
-               this.selectionManager = selectionManager;
-       }
-
-       public void actionPerformed(ActionEvent e) {
-               final Component parentComponent;
-               if (e.getSource() instanceof Component) {
-                       parentComponent = (Component) e.getSource();
-               } else {
-                       parentComponent = null;
-               }
-               ImportWorkflowWizard wizard = new ImportWorkflowWizard(
-                               Utils.getParentFrame(parentComponent), 
editManager, fileManager, menuManager,
-                               colourManager, workbenchConfiguration, 
selectionManager);
-               wizard.setNestedEnabled(false);
-               wizard.setVisible(true);
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/OpenSourceWorkflowAction.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/OpenSourceWorkflowAction.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/OpenSourceWorkflowAction.java
deleted file mode 100644
index f392405..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/OpenSourceWorkflowAction.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2013 The University of Manchester
- *
- *  Modifications to the initial code base are copyright of their
- *  respective authors, or their employers as appropriate.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- 
******************************************************************************/
-package net.sf.taverna.t2.workbench.file.importworkflow.actions;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import java.util.prefs.Preferences;
-
-import javax.swing.AbstractAction;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.filechooser.FileFilter;
-
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.icons.WorkbenchIcons;
-
-import org.apache.log4j.Logger;
-
-/**
- * @author David Withers
- */
-@SuppressWarnings("serial")
-public abstract class OpenSourceWorkflowAction extends AbstractAction {
-
-       private static Logger logger = 
Logger.getLogger(OpenSourceWorkflowAction.class);
-
-       private static final String OPEN_WORKFLOW = "Open workflow...";
-
-       protected FileManager fileManager;
-
-       public OpenSourceWorkflowAction(FileManager fileManager) {
-               super(OPEN_WORKFLOW, WorkbenchIcons.openIcon);
-               this.fileManager = fileManager;
-       }
-
-       public void actionPerformed(ActionEvent e) {
-               final Component parentComponent;
-               if (e.getSource() instanceof Component) {
-                       parentComponent = (Component) e.getSource();
-               } else {
-                       parentComponent = null;
-               }
-               openWorkflows(parentComponent);
-       }
-
-       public abstract void openWorkflows(Component parentComponent, File[] 
files);
-
-       /**
-        * Pop up an Open-dialogue to select one or more workflow files to open.
-        *
-        * @param parentComponent
-        *            The UI parent component to use for pop up dialogues
-        * @param openCallback
-        *            An {@link OpenCallback} to be called during the file 
opening.
-        *            The callback will be invoked for each file that has been
-        *            opened, as file opening happens in a separate thread that
-        *            might execute after the return of this method.
-        * @return <code>false</code> if no files were selected or the dialogue 
was
-        *         cancelled, or <code>true</code> if the process of opening 
one or
-        *         more files has been started.
-        */
-       public boolean openWorkflows(final Component parentComponent) {
-               JFileChooser fileChooser = new JFileChooser();
-               Preferences prefs = Preferences.userNodeForPackage(getClass());
-               String curDir = prefs.get("currentDir", 
System.getProperty("user.home"));
-               fileChooser.setDialogTitle(OPEN_WORKFLOW);
-
-               fileChooser.resetChoosableFileFilters();
-               fileChooser.setAcceptAllFileFilterUsed(false);
-               List<FileFilter> fileFilters = fileManager.getOpenFileFilters();
-               if (fileFilters.isEmpty()) {
-                       logger.warn("No file types found for opening workflow");
-                       JOptionPane
-                                       .showMessageDialog(parentComponent,
-                                                       "No file types found 
for opening workflow.", "Error",
-                                                       
JOptionPane.ERROR_MESSAGE);
-                       return false;
-               }
-               for (FileFilter fileFilter : fileFilters) {
-                       fileChooser.addChoosableFileFilter(fileFilter);
-               }
-
-               fileChooser.setFileFilter(fileFilters.get(0));
-
-               fileChooser.setCurrentDirectory(new File(curDir));
-               fileChooser.setMultiSelectionEnabled(true);
-
-               int returnVal = fileChooser.showOpenDialog(parentComponent);
-               if (returnVal == JFileChooser.APPROVE_OPTION) {
-                       prefs.put("currentDir", 
fileChooser.getCurrentDirectory().toString());
-                       final File[] selectedFiles = 
fileChooser.getSelectedFiles();
-                       if (selectedFiles.length == 0) {
-                               logger.warn("No files selected");
-                               return false;
-                       }
-                       new FileOpenerThread(parentComponent, 
selectedFiles).start();
-                       return true;
-               }
-               return false;
-       }
-
-       private final class FileOpenerThread extends Thread {
-               private final File[] files;
-               private final Component parentComponent;
-
-               private FileOpenerThread(Component parentComponent, File[] 
selectedFiles) {
-                       super("Opening workflows(s) " + 
Arrays.asList(selectedFiles));
-                       this.parentComponent = parentComponent;
-                       this.files = selectedFiles;
-               }
-
-               @Override
-               public void run() {
-                       openWorkflows(parentComponent, files);
-               }
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ReplaceNestedWorkflowAction.java
----------------------------------------------------------------------
diff --git 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ReplaceNestedWorkflowAction.java
 
b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ReplaceNestedWorkflowAction.java
deleted file mode 100644
index 9199ab5..0000000
--- 
a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ReplaceNestedWorkflowAction.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow.actions;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import 
net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.Edit;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import 
net.sf.taverna.t2.workbench.file.importworkflow.gui.ImportWorkflowWizard;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.Utils;
-import 
net.sf.taverna.t2.workbench.ui.actions.activity.ActivityConfigurationAction;
-import net.sf.taverna.t2.workflow.edits.ConfigureEdit;
-import uk.org.taverna.scufl2.api.activity.Activity;
-import uk.org.taverna.scufl2.api.configurations.Configuration;
-import uk.org.taverna.scufl2.api.core.Workflow;
-
-public class ReplaceNestedWorkflowAction extends ActivityConfigurationAction {
-       private static final long serialVersionUID = 1L;
-
-       private final EditManager editManager;
-       private final FileManager fileManager;
-       private final MenuManager menuManager;
-
-       private final ColourManager colourManager;
-
-       private final WorkbenchConfiguration workbenchConfiguration;
-
-       private final SelectionManager selectionManager;
-
-       public ReplaceNestedWorkflowAction(Activity activity, EditManager 
editManager,
-                       FileManager fileManager, MenuManager menuManager,
-                       ActivityIconManager activityIconManager, ColourManager 
colourManager,
-                       ServiceDescriptionRegistry serviceDescriptionRegistry,
-                       WorkbenchConfiguration workbenchConfiguration, 
SelectionManager selectionManager) {
-               super(activity, activityIconManager, 
serviceDescriptionRegistry);
-               this.editManager = editManager;
-               this.fileManager = fileManager;
-               this.menuManager = menuManager;
-               this.colourManager = colourManager;
-               this.workbenchConfiguration = workbenchConfiguration;
-               this.selectionManager = selectionManager;
-               putValue(NAME, "Replace nested workflow");
-       }
-
-       public void actionPerformed(ActionEvent e) {
-               final Component parentComponent;
-               if (e.getSource() instanceof Component) {
-                       parentComponent = (Component) e.getSource();
-               } else {
-                       parentComponent = null;
-               }
-               ImportWorkflowWizard wizard = new ImportWorkflowWizard(
-                               Utils.getParentFrame(parentComponent), 
editManager, fileManager, menuManager,
-                               colourManager, workbenchConfiguration, 
selectionManager) {
-                       private static final long serialVersionUID = 1L;
-
-//                     @Override
-//                     protected Edit<?> makeInsertNestedWorkflowEdit(Workflow 
nestedFlow, String name) {
-//                             Configuration configuration = new 
Configuration();
-//                             configuration.setType(null);
-//                             // TODO use service registry
-//                             return new 
ConfigureEdit<Activity>(getActivity(), null, configuration);
-//                     }
-
-//                     @Override
-//                     protected Activity getInsertedActivity() {
-//                             return getActivity();
-//                     }
-               };
-
-               wizard.setMergeEnabled(false);
-//             
wizard.setCustomDestinationDataflow(fileManager.getCurrentDataflow(),
-//                             "Existing nested workflow");
-//             wizard.setDestinationEnabled(false);
-               wizard.setVisible(true);
-       }
-
-}

Reply via email to