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/26 19:52:00 UTC
[11/51] [partial] incubator-taverna-workbench git commit: all
packages are moved to org.apache.taverna.*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/AddWFInputAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/AddWFInputAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/AddWFInputAction.java
index 0803b74..c102cd6 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/AddWFInputAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/AddWFInputAction.java
@@ -24,16 +24,16 @@ import static java.awt.event.InputEvent.ALT_DOWN_MASK;
import static java.awt.event.InputEvent.SHIFT_DOWN_MASK;
import static java.awt.event.KeyEvent.VK_I;
import static javax.swing.KeyStroke.getKeyStroke;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.inputIcon;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.inputIcon;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
-import net.sf.taverna.t2.ui.menu.DesignOnlyAction;
-import net.sf.taverna.t2.workbench.design.actions.AddDataflowInputAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
+import org.apache.taverna.ui.menu.DesignOnlyAction;
+import org.apache.taverna.workbench.design.actions.AddDataflowInputAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
import org.apache.taverna.scufl2.api.core.Workflow;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/AddWFOutputAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/AddWFOutputAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/AddWFOutputAction.java
index 1196de2..72dfc61 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/AddWFOutputAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/AddWFOutputAction.java
@@ -29,11 +29,11 @@ import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
-import net.sf.taverna.t2.ui.menu.DesignOnlyAction;
-import net.sf.taverna.t2.workbench.design.actions.AddDataflowOutputAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.icons.WorkbenchIcons;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
+import org.apache.taverna.ui.menu.DesignOnlyAction;
+import org.apache.taverna.workbench.design.actions.AddDataflowOutputAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.icons.WorkbenchIcons;
+import org.apache.taverna.workbench.selection.SelectionManager;
import org.apache.taverna.scufl2.api.core.Workflow;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/DeleteGraphComponentAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/DeleteGraphComponentAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/DeleteGraphComponentAction.java
index 9ad8e72..3d2736d 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/DeleteGraphComponentAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/DeleteGraphComponentAction.java
@@ -22,7 +22,7 @@ package net.sf.taverna.t2.workbench.views.graph.actions;
import static java.awt.event.KeyEvent.VK_DELETE;
import static javax.swing.KeyStroke.getKeyStroke;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.deleteIcon;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.deleteIcon;
import java.awt.event.ActionEvent;
import java.util.Set;
@@ -32,18 +32,18 @@ import javax.swing.AbstractAction;
import org.apache.taverna.lang.observer.Observable;
import org.apache.taverna.lang.observer.Observer;
import org.apache.taverna.lang.observer.SwingAwareObserver;
-import net.sf.taverna.t2.ui.menu.DesignOnlyAction;
-import net.sf.taverna.t2.workbench.design.actions.RemoveConditionAction;
-import net.sf.taverna.t2.workbench.design.actions.RemoveDataflowInputPortAction;
-import net.sf.taverna.t2.workbench.design.actions.RemoveDataflowOutputPortAction;
-import net.sf.taverna.t2.workbench.design.actions.RemoveDatalinkAction;
-import net.sf.taverna.t2.workbench.design.actions.RemoveProcessorAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.DataflowSelectionModel;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.selection.events.DataflowSelectionMessage;
-import net.sf.taverna.t2.workbench.selection.events.SelectionManagerEvent;
-import net.sf.taverna.t2.workbench.selection.events.WorkflowBundleSelectionEvent;
+import org.apache.taverna.ui.menu.DesignOnlyAction;
+import org.apache.taverna.workbench.design.actions.RemoveConditionAction;
+import org.apache.taverna.workbench.design.actions.RemoveDataflowInputPortAction;
+import org.apache.taverna.workbench.design.actions.RemoveDataflowOutputPortAction;
+import org.apache.taverna.workbench.design.actions.RemoveDatalinkAction;
+import org.apache.taverna.workbench.design.actions.RemoveProcessorAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.DataflowSelectionModel;
+import org.apache.taverna.workbench.selection.SelectionManager;
+import org.apache.taverna.workbench.selection.events.DataflowSelectionMessage;
+import org.apache.taverna.workbench.selection.events.SelectionManagerEvent;
+import org.apache.taverna.workbench.selection.events.WorkflowBundleSelectionEvent;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
import org.apache.taverna.scufl2.api.core.ControlLink;
import org.apache.taverna.scufl2.api.core.DataLink;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/RenameWFInputOutputProcessorAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/RenameWFInputOutputProcessorAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/RenameWFInputOutputProcessorAction.java
index ac3e356..ea7e626 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/RenameWFInputOutputProcessorAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/actions/RenameWFInputOutputProcessorAction.java
@@ -33,17 +33,17 @@ import javax.swing.AbstractAction;
import org.apache.taverna.lang.observer.Observable;
import org.apache.taverna.lang.observer.Observer;
import org.apache.taverna.lang.observer.SwingAwareObserver;
-import net.sf.taverna.t2.ui.menu.DesignOnlyAction;
-import net.sf.taverna.t2.workbench.design.actions.EditDataflowInputPortAction;
-import net.sf.taverna.t2.workbench.design.actions.EditDataflowOutputPortAction;
-import net.sf.taverna.t2.workbench.design.actions.RenameProcessorAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.icons.WorkbenchIcons;
-import net.sf.taverna.t2.workbench.selection.DataflowSelectionModel;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.selection.events.DataflowSelectionMessage;
-import net.sf.taverna.t2.workbench.selection.events.SelectionManagerEvent;
-import net.sf.taverna.t2.workbench.selection.events.WorkflowBundleSelectionEvent;
+import org.apache.taverna.ui.menu.DesignOnlyAction;
+import org.apache.taverna.workbench.design.actions.EditDataflowInputPortAction;
+import org.apache.taverna.workbench.design.actions.EditDataflowOutputPortAction;
+import org.apache.taverna.workbench.design.actions.RenameProcessorAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.icons.WorkbenchIcons;
+import org.apache.taverna.workbench.selection.DataflowSelectionModel;
+import org.apache.taverna.workbench.selection.SelectionManager;
+import org.apache.taverna.workbench.selection.events.DataflowSelectionMessage;
+import org.apache.taverna.workbench.selection.events.SelectionManagerEvent;
+import org.apache.taverna.workbench.selection.events.WorkflowBundleSelectionEvent;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
import org.apache.taverna.scufl2.api.core.Processor;
import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/config/GraphViewConfiguration.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/config/GraphViewConfiguration.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/config/GraphViewConfiguration.java
index b1c3265..1400064 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/config/GraphViewConfiguration.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/config/GraphViewConfiguration.java
@@ -26,8 +26,8 @@ import java.util.Map;
import uk.org.taverna.configuration.AbstractConfigurable;
import uk.org.taverna.configuration.ConfigurationManager;
-import net.sf.taverna.t2.workbench.models.graph.Graph.Alignment;
-import net.sf.taverna.t2.workbench.models.graph.GraphController.PortStyle;
+import org.apache.taverna.workbench.models.graph.Graph.Alignment;
+import org.apache.taverna.workbench.models.graph.GraphController.PortStyle;
/**
* Configuration for the GraphViewComponent.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/config/GraphViewConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/config/GraphViewConfigurationPanel.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/config/GraphViewConfigurationPanel.java
index 397ad1b..ff03ce1 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/config/GraphViewConfigurationPanel.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/config/GraphViewConfigurationPanel.java
@@ -26,12 +26,12 @@ import static java.awt.GridBagConstraints.RELATIVE;
import static java.awt.GridBagConstraints.REMAINDER;
import static java.awt.GridBagConstraints.WEST;
import static javax.swing.SwingConstants.LEFT;
-import static net.sf.taverna.t2.workbench.helper.Helper.showHelp;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.allportIcon;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.blobIcon;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.horizontalIcon;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.noportIcon;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.verticalIcon;
+import static org.apache.taverna.workbench.helper.Helper.showHelp;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.allportIcon;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.blobIcon;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.horizontalIcon;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.noportIcon;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.verticalIcon;
import static net.sf.taverna.t2.workbench.views.graph.config.GraphViewConfiguration.ALIGNMENT;
import static net.sf.taverna.t2.workbench.views.graph.config.GraphViewConfiguration.ANIMATION_ENABLED;
import static net.sf.taverna.t2.workbench.views.graph.config.GraphViewConfiguration.ANIMATION_SPEED;
@@ -57,8 +57,8 @@ import javax.swing.JSlider;
import javax.swing.JTextArea;
import javax.swing.border.EmptyBorder;
-import net.sf.taverna.t2.workbench.models.graph.Graph.Alignment;
-import net.sf.taverna.t2.workbench.models.graph.GraphController.PortStyle;
+import org.apache.taverna.workbench.models.graph.Graph.Alignment;
+import org.apache.taverna.workbench.models.graph.GraphController.PortStyle;
/**
* UI for GraphViewConfiguration.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/AddWFInputMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/AddWFInputMenuAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/AddWFInputMenuAction.java
index 65448c3..41919e2 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/AddWFInputMenuAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/AddWFInputMenuAction.java
@@ -26,9 +26,9 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.views.graph.actions.AddWFInputAction;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/AddWFOutputMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/AddWFOutputMenuAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/AddWFOutputMenuAction.java
index 522c841..b019811 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/AddWFOutputMenuAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/AddWFOutputMenuAction.java
@@ -26,9 +26,9 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.views.graph.actions.AddWFOutputAction;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DeleteGraphComponentMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DeleteGraphComponentMenuAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DeleteGraphComponentMenuAction.java
index 654078f..1cb4a98 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DeleteGraphComponentMenuAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DeleteGraphComponentMenuAction.java
@@ -26,9 +26,9 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.views.graph.actions.DeleteGraphComponentAction;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramMenu.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramMenu.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramMenu.java
index 02c71d8..742042c 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramMenu.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramMenu.java
@@ -22,11 +22,11 @@ package net.sf.taverna.t2.workbench.views.graph.menu;
import static java.awt.event.KeyEvent.VK_V;
import static javax.swing.Action.MNEMONIC_KEY;
-import static net.sf.taverna.t2.ui.menu.DefaultMenuBar.DEFAULT_MENU_BAR;
+import static org.apache.taverna.ui.menu.DefaultMenuBar.DEFAULT_MENU_BAR;
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenu;
+import org.apache.taverna.ui.menu.AbstractMenu;
public class DiagramMenu extends AbstractMenu {
public static final URI DIAGRAM = URI
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramSaveMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramSaveMenuSection.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramSaveMenuSection.java
index 5ebb770..593e7c1 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramSaveMenuSection.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramSaveMenuSection.java
@@ -24,7 +24,7 @@ import static net.sf.taverna.t2.workbench.views.graph.menu.DiagramMenu.DIAGRAM;
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
/**
* @author Alex Nenadic
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramZoomMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramZoomMenuSection.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramZoomMenuSection.java
index 639deee..5330c05 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramZoomMenuSection.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/DiagramZoomMenuSection.java
@@ -24,7 +24,7 @@ import static net.sf.taverna.t2.workbench.views.graph.menu.DiagramMenu.DIAGRAM;
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
/**
* @author Alex Nenadic
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphCopyMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphCopyMenuSection.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphCopyMenuSection.java
index 70cc462..8457bdf 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphCopyMenuSection.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphCopyMenuSection.java
@@ -24,7 +24,7 @@ import static net.sf.taverna.t2.workbench.views.graph.menu.GraphMenuSection.GRAP
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
/**
* ???
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphDeleteMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphDeleteMenuSection.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphDeleteMenuSection.java
index 28d2144..f118ece 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphDeleteMenuSection.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphDeleteMenuSection.java
@@ -24,7 +24,7 @@ import static net.sf.taverna.t2.workbench.views.graph.menu.GraphMenuSection.GRAP
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
/**
* @author Alex Nenadic
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphDetailsMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphDetailsMenuSection.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphDetailsMenuSection.java
index f2b6af1..e14e6d1 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphDetailsMenuSection.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphDetailsMenuSection.java
@@ -24,7 +24,7 @@ import static net.sf.taverna.t2.workbench.views.graph.menu.GraphMenuSection.GRAP
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
/**
* @author Alex Nenadic
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphEditMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphEditMenuSection.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphEditMenuSection.java
index 1a487b1..51eb370 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphEditMenuSection.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphEditMenuSection.java
@@ -24,7 +24,7 @@ import static net.sf.taverna.t2.workbench.views.graph.menu.GraphMenuSection.GRAP
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
/**
* @author Alex Nenadic
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphMenuSection.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphMenuSection.java
index 4030d34..e5e3979 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphMenuSection.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/GraphMenuSection.java
@@ -22,7 +22,7 @@ package net.sf.taverna.t2.workbench.views.graph.menu;
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
/**
* @author Alex Nenadic
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/InsertMenu.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/InsertMenu.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/InsertMenu.java
index 9b498e5..556ee53 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/InsertMenu.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/InsertMenu.java
@@ -5,11 +5,11 @@ package net.sf.taverna.t2.workbench.views.graph.menu;
import static java.awt.event.KeyEvent.VK_I;
import static javax.swing.Action.MNEMONIC_KEY;
-import static net.sf.taverna.t2.ui.menu.DefaultMenuBar.DEFAULT_MENU_BAR;
+import static org.apache.taverna.ui.menu.DefaultMenuBar.DEFAULT_MENU_BAR;
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenu;
+import org.apache.taverna.ui.menu.AbstractMenu;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/RenameWFInputOutputProcessorMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/RenameWFInputOutputProcessorMenuAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/RenameWFInputOutputProcessorMenuAction.java
index 3cf9f66..0e49157 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/RenameWFInputOutputProcessorMenuAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/RenameWFInputOutputProcessorMenuAction.java
@@ -26,9 +26,9 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.views.graph.actions.RenameWFInputOutputProcessorAction;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ResetDiagramAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ResetDiagramAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ResetDiagramAction.java
index 9fbd452..f3b3928 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ResetDiagramAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ResetDiagramAction.java
@@ -23,14 +23,14 @@ package net.sf.taverna.t2.workbench.views.graph.menu;
import static java.awt.Toolkit.getDefaultToolkit;
import static java.awt.event.KeyEvent.VK_0;
import static javax.swing.KeyStroke.getKeyStroke;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.refreshIcon;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.refreshIcon;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.DesignOrResultsAction;
+import org.apache.taverna.ui.menu.DesignOrResultsAction;
@SuppressWarnings("serial")
public class ResetDiagramAction extends AbstractAction implements
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ResetDiagramMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ResetDiagramMenuAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ResetDiagramMenuAction.java
index c4b402e..d99f097 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ResetDiagramMenuAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ResetDiagramMenuAction.java
@@ -26,7 +26,7 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
/**
* An action that zooms a diagram image
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/SaveGraphImageSubMenu.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/SaveGraphImageSubMenu.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/SaveGraphImageSubMenu.java
index 14a8445..360500f 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/SaveGraphImageSubMenu.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/SaveGraphImageSubMenu.java
@@ -47,22 +47,22 @@ import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
-import net.sf.taverna.t2.lang.io.StreamCopier;
-import net.sf.taverna.t2.lang.io.StreamDevourer;
+import org.apache.taverna.lang.io.StreamCopier;
+import org.apache.taverna.lang.io.StreamDevourer;
import org.apache.taverna.lang.observer.Observable;
import org.apache.taverna.lang.observer.SwingAwareObserver;
-import net.sf.taverna.t2.lang.ui.ExtensionFileFilter;
-import net.sf.taverna.t2.ui.menu.AbstractMenuCustom;
-import net.sf.taverna.t2.ui.menu.DesignOnlyAction;
-import net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.icons.WorkbenchIcons;
-import net.sf.taverna.t2.workbench.models.graph.DotWriter;
-import net.sf.taverna.t2.workbench.models.graph.GraphController;
-import net.sf.taverna.t2.workbench.models.graph.svg.SVGUtil;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.selection.events.PerspectiveSelectionEvent;
-import net.sf.taverna.t2.workbench.selection.events.SelectionManagerEvent;
+import org.apache.taverna.lang.ui.ExtensionFileFilter;
+import org.apache.taverna.ui.menu.AbstractMenuCustom;
+import org.apache.taverna.ui.menu.DesignOnlyAction;
+import org.apache.taverna.workbench.configuration.workbench.WorkbenchConfiguration;
+import org.apache.taverna.workbench.file.FileManager;
+import org.apache.taverna.workbench.icons.WorkbenchIcons;
+import org.apache.taverna.workbench.models.graph.DotWriter;
+import org.apache.taverna.workbench.models.graph.GraphController;
+import org.apache.taverna.workbench.models.graph.svg.SVGUtil;
+import org.apache.taverna.workbench.selection.SelectionManager;
+import org.apache.taverna.workbench.selection.events.PerspectiveSelectionEvent;
+import org.apache.taverna.workbench.selection.events.SelectionManagerEvent;
import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomInAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomInAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomInAction.java
index b8735c9..55ee8ff 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomInAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomInAction.java
@@ -23,14 +23,14 @@ package net.sf.taverna.t2.workbench.views.graph.menu;
import static java.awt.Toolkit.getDefaultToolkit;
import static java.awt.event.KeyEvent.VK_EQUALS;
import static javax.swing.KeyStroke.getKeyStroke;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.zoomInIcon;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.zoomInIcon;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.DesignOrResultsAction;
+import org.apache.taverna.ui.menu.DesignOrResultsAction;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomInMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomInMenuAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomInMenuAction.java
index 89eea7d..82ab39b 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomInMenuAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomInMenuAction.java
@@ -26,7 +26,7 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
/**
* An action that zooms a diagram image
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomOutAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomOutAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomOutAction.java
index bd2a2b9..4dd769e 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomOutAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomOutAction.java
@@ -29,8 +29,8 @@ import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.DesignOrResultsAction;
-import net.sf.taverna.t2.workbench.icons.WorkbenchIcons;
+import org.apache.taverna.ui.menu.DesignOrResultsAction;
+import org.apache.taverna.workbench.icons.WorkbenchIcons;
@SuppressWarnings("serial")
public class ZoomOutAction extends AbstractAction implements
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomOutMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomOutMenuAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomOutMenuAction.java
index bc34252..1b68a1d 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomOutMenuAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/menu/ZoomOutMenuAction.java
@@ -26,7 +26,7 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
/**
* An action that zooms a diagram image
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/AddWFInputToolbarAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/AddWFInputToolbarAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/AddWFInputToolbarAction.java
index 736ba8d..d408bbd 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/AddWFInputToolbarAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/AddWFInputToolbarAction.java
@@ -26,9 +26,9 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.views.graph.actions.AddWFInputAction;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/AddWFOutputToolbarAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/AddWFOutputToolbarAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/AddWFOutputToolbarAction.java
index ae7d5d0..09f94d3 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/AddWFOutputToolbarAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/AddWFOutputToolbarAction.java
@@ -26,9 +26,9 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.views.graph.actions.AddWFOutputAction;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/DeleteGraphComponentToolbarAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/DeleteGraphComponentToolbarAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/DeleteGraphComponentToolbarAction.java
index 068c530..9fc472e 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/DeleteGraphComponentToolbarAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/DeleteGraphComponentToolbarAction.java
@@ -26,9 +26,9 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.views.graph.actions.DeleteGraphComponentAction;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/GraphDeleteToolbarSection.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/GraphDeleteToolbarSection.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/GraphDeleteToolbarSection.java
index 794cf1f..78d510b 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/GraphDeleteToolbarSection.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/GraphDeleteToolbarSection.java
@@ -20,11 +20,11 @@
******************************************************************************/
package net.sf.taverna.t2.workbench.views.graph.toolbar;
-import static net.sf.taverna.t2.ui.menu.DefaultToolBar.DEFAULT_TOOL_BAR;
+import static org.apache.taverna.ui.menu.DefaultToolBar.DEFAULT_TOOL_BAR;
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
/**
* @author Alex Nenadic
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/GraphEditToolbarSection.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/GraphEditToolbarSection.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/GraphEditToolbarSection.java
index a61259a..7a06acc 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/GraphEditToolbarSection.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/GraphEditToolbarSection.java
@@ -20,11 +20,11 @@
******************************************************************************/
package net.sf.taverna.t2.workbench.views.graph.toolbar;
-import static net.sf.taverna.t2.ui.menu.DefaultToolBar.DEFAULT_TOOL_BAR;
+import static org.apache.taverna.ui.menu.DefaultToolBar.DEFAULT_TOOL_BAR;
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
/**
* @author Alex Nenadic
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/RenameWFInputOutputProcessorToolbarAction.java
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/RenameWFInputOutputProcessorToolbarAction.java b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/RenameWFInputOutputProcessorToolbarAction.java
index 1794e8f..4a55db8 100644
--- a/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/RenameWFInputOutputProcessorToolbarAction.java
+++ b/taverna-graph-view/src/main/java/net/sf/taverna/t2/workbench/views/graph/toolbar/RenameWFInputOutputProcessorToolbarAction.java
@@ -26,9 +26,9 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
import net.sf.taverna.t2.workbench.views.graph.actions.RenameWFInputOutputProcessorAction;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent b/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent
deleted file mode 100644
index 226078d..0000000
--- a/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent
+++ /dev/null
@@ -1,29 +0,0 @@
-net.sf.taverna.t2.workbench.views.graph.toolbar.GraphEditToolbarSection
-net.sf.taverna.t2.workbench.views.graph.toolbar.GraphDeleteToolbarSection
-net.sf.taverna.t2.workbench.views.graph.toolbar.GraphSaveToolbarSection
-net.sf.taverna.t2.workbench.views.graph.toolbar.AddWFInputToolbarAction
-net.sf.taverna.t2.workbench.views.graph.toolbar.AddWFOutputToolbarAction
-net.sf.taverna.t2.workbench.views.graph.toolbar.RenameWFInputOutputProcessorToolbarAction
-net.sf.taverna.t2.workbench.views.graph.toolbar.DeleteGraphComponentToolbarAction
-net.sf.taverna.t2.workbench.views.graph.toolbar.SaveGraphImageToolbarAction
-
-net.sf.taverna.t2.workbench.views.graph.menu.DiagramMenu
-net.sf.taverna.t2.workbench.views.graph.menu.DiagramSaveMenuSection
-net.sf.taverna.t2.workbench.views.graph.menu.DiagramZoomMenuSection
-
-net.sf.taverna.t2.workbench.views.graph.menu.GraphMenuSection
-net.sf.taverna.t2.workbench.views.graph.menu.GraphCopyMenuSection
-net.sf.taverna.t2.workbench.views.graph.menu.GraphEditMenuSection
-net.sf.taverna.t2.workbench.views.graph.menu.GraphDeleteMenuSection
-net.sf.taverna.t2.workbench.views.graph.menu.GraphDetailsMenuSection
-
-net.sf.taverna.t2.workbench.views.graph.menu.InsertMenu
-
-net.sf.taverna.t2.workbench.views.graph.menu.AddWFInputMenuAction
-net.sf.taverna.t2.workbench.views.graph.menu.AddWFOutputMenuAction
-net.sf.taverna.t2.workbench.views.graph.menu.RenameWFInputOutputProcessorMenuAction
-net.sf.taverna.t2.workbench.views.graph.menu.DeleteGraphComponentMenuAction
-net.sf.taverna.t2.workbench.views.graph.menu.SaveGraphImageSubMenu
-net.sf.taverna.t2.workbench.views.graph.menu.ZoomInMenuAction
-net.sf.taverna.t2.workbench.views.graph.menu.ZoomOutMenuAction
-net.sf.taverna.t2.workbench.views.graph.menu.ResetDiagramMenuAction
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.configuration.ConfigurationUIFactory
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.configuration.ConfigurationUIFactory b/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.configuration.ConfigurationUIFactory
deleted file mode 100644
index 70830ec..0000000
--- a/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.configuration.ConfigurationUIFactory
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.taverna.t2.workbench.views.graph.config.GraphViewConfigurationUIFactory
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.zaria.UIComponentFactorySPI
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.zaria.UIComponentFactorySPI b/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.zaria.UIComponentFactorySPI
deleted file mode 100644
index 8086a8d..0000000
--- a/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.zaria.UIComponentFactorySPI
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.taverna.t2.workbench.views.graph.GraphViewComponentFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.zaria.UIComponentSPI
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.zaria.UIComponentSPI b/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.zaria.UIComponentSPI
deleted file mode 100644
index 563c21d..0000000
--- a/taverna-graph-view/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.zaria.UIComponentSPI
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.taverna.t2.workbench.views.graph.GraphViewComponent
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent b/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent
new file mode 100644
index 0000000..226078d
--- /dev/null
+++ b/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent
@@ -0,0 +1,29 @@
+net.sf.taverna.t2.workbench.views.graph.toolbar.GraphEditToolbarSection
+net.sf.taverna.t2.workbench.views.graph.toolbar.GraphDeleteToolbarSection
+net.sf.taverna.t2.workbench.views.graph.toolbar.GraphSaveToolbarSection
+net.sf.taverna.t2.workbench.views.graph.toolbar.AddWFInputToolbarAction
+net.sf.taverna.t2.workbench.views.graph.toolbar.AddWFOutputToolbarAction
+net.sf.taverna.t2.workbench.views.graph.toolbar.RenameWFInputOutputProcessorToolbarAction
+net.sf.taverna.t2.workbench.views.graph.toolbar.DeleteGraphComponentToolbarAction
+net.sf.taverna.t2.workbench.views.graph.toolbar.SaveGraphImageToolbarAction
+
+net.sf.taverna.t2.workbench.views.graph.menu.DiagramMenu
+net.sf.taverna.t2.workbench.views.graph.menu.DiagramSaveMenuSection
+net.sf.taverna.t2.workbench.views.graph.menu.DiagramZoomMenuSection
+
+net.sf.taverna.t2.workbench.views.graph.menu.GraphMenuSection
+net.sf.taverna.t2.workbench.views.graph.menu.GraphCopyMenuSection
+net.sf.taverna.t2.workbench.views.graph.menu.GraphEditMenuSection
+net.sf.taverna.t2.workbench.views.graph.menu.GraphDeleteMenuSection
+net.sf.taverna.t2.workbench.views.graph.menu.GraphDetailsMenuSection
+
+net.sf.taverna.t2.workbench.views.graph.menu.InsertMenu
+
+net.sf.taverna.t2.workbench.views.graph.menu.AddWFInputMenuAction
+net.sf.taverna.t2.workbench.views.graph.menu.AddWFOutputMenuAction
+net.sf.taverna.t2.workbench.views.graph.menu.RenameWFInputOutputProcessorMenuAction
+net.sf.taverna.t2.workbench.views.graph.menu.DeleteGraphComponentMenuAction
+net.sf.taverna.t2.workbench.views.graph.menu.SaveGraphImageSubMenu
+net.sf.taverna.t2.workbench.views.graph.menu.ZoomInMenuAction
+net.sf.taverna.t2.workbench.views.graph.menu.ZoomOutMenuAction
+net.sf.taverna.t2.workbench.views.graph.menu.ResetDiagramMenuAction
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.configuration.ConfigurationUIFactory
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.configuration.ConfigurationUIFactory b/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.configuration.ConfigurationUIFactory
new file mode 100644
index 0000000..70830ec
--- /dev/null
+++ b/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.configuration.ConfigurationUIFactory
@@ -0,0 +1 @@
+net.sf.taverna.t2.workbench.views.graph.config.GraphViewConfigurationUIFactory
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.ui.zaria.UIComponentFactorySPI
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.ui.zaria.UIComponentFactorySPI b/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.ui.zaria.UIComponentFactorySPI
new file mode 100644
index 0000000..8086a8d
--- /dev/null
+++ b/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.ui.zaria.UIComponentFactorySPI
@@ -0,0 +1 @@
+net.sf.taverna.t2.workbench.views.graph.GraphViewComponentFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.ui.zaria.UIComponentSPI
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.ui.zaria.UIComponentSPI b/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.ui.zaria.UIComponentSPI
new file mode 100644
index 0000000..563c21d
--- /dev/null
+++ b/taverna-graph-view/src/main/resources/META-INF/services/org.apache.taverna.workbench.ui.zaria.UIComponentSPI
@@ -0,0 +1 @@
+net.sf.taverna.t2.workbench.views.graph.GraphViewComponent
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/resources/META-INF/spring/graph-view-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/resources/META-INF/spring/graph-view-context-osgi.xml b/taverna-graph-view/src/main/resources/META-INF/spring/graph-view-context-osgi.xml
index c7adec0..c6d5620 100644
--- a/taverna-graph-view/src/main/resources/META-INF/spring/graph-view-context-osgi.xml
+++ b/taverna-graph-view/src/main/resources/META-INF/spring/graph-view-context-osgi.xml
@@ -8,7 +8,7 @@
<service ref="GraphViewConfigurationUIFactory" interface="uk.org.taverna.configuration.ConfigurationUIFactory" />
- <service ref="GraphViewComponentFactory" interface="net.sf.taverna.t2.workbench.ui.zaria.UIComponentFactorySPI" />
+ <service ref="GraphViewComponentFactory" interface="org.apache.taverna.workbench.ui.zaria.UIComponentFactorySPI" />
<service ref="GraphEditToolbarSection" auto-export="interfaces" />
<service ref="GraphDeleteToolbarSection" auto-export="interfaces" />
@@ -34,12 +34,12 @@
<service ref="ZoomOutMenuAction" auto-export="interfaces" />
<service ref="ResetDiagramMenuAction" auto-export="interfaces" />
- <reference id="editManager" interface="net.sf.taverna.t2.workbench.edits.EditManager" />
- <reference id="fileManager" interface="net.sf.taverna.t2.workbench.file.FileManager" />
- <reference id="menuManager" interface="net.sf.taverna.t2.ui.menu.MenuManager" />
- <reference id="selectionManager" interface="net.sf.taverna.t2.workbench.selection.SelectionManager" />
- <reference id="colourManager" interface="net.sf.taverna.t2.workbench.configuration.colour.ColourManager" />
- <reference id="workbenchConfiguration" interface="net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration" />
+ <reference id="editManager" interface="org.apache.taverna.workbench.edits.EditManager" />
+ <reference id="fileManager" interface="org.apache.taverna.workbench.file.FileManager" />
+ <reference id="menuManager" interface="org.apache.taverna.ui.menu.MenuManager" />
+ <reference id="selectionManager" interface="org.apache.taverna.workbench.selection.SelectionManager" />
+ <reference id="colourManager" interface="org.apache.taverna.workbench.configuration.colour.ColourManager" />
+ <reference id="workbenchConfiguration" interface="org.apache.taverna.workbench.configuration.workbench.WorkbenchConfiguration" />
<reference id="configurationManager" interface="uk.org.taverna.configuration.ConfigurationManager" />
<reference id="serviceRegistry" interface="uk.org.taverna.commons.services.ServiceRegistry" />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-view/src/main/resources/META-INF/spring/graph-view-context.xml
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/main/resources/META-INF/spring/graph-view-context.xml b/taverna-graph-view/src/main/resources/META-INF/spring/graph-view-context.xml
index 9968805..aaca21b 100644
--- a/taverna-graph-view/src/main/resources/META-INF/spring/graph-view-context.xml
+++ b/taverna-graph-view/src/main/resources/META-INF/spring/graph-view-context.xml
@@ -5,18 +5,18 @@
http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="graphViewConfiguration"
- class="net.sf.taverna.t2.workbench.views.graph.config.GraphViewConfiguration">
+ class="org.apache.taverna.workbench.views.graph.config.GraphViewConfiguration">
<constructor-arg name="configurationManager" ref="configurationManager" />
</bean>
<bean id="GraphViewConfigurationUIFactory"
- class="net.sf.taverna.t2.workbench.views.graph.config.GraphViewConfigurationUIFactory">
+ class="org.apache.taverna.workbench.views.graph.config.GraphViewConfigurationUIFactory">
<property name="graphViewConfiguration">
<ref local="graphViewConfiguration" />
</property>
</bean>
- <bean id="GraphViewComponentFactory" class="net.sf.taverna.t2.workbench.views.graph.GraphViewComponentFactory">
+ <bean id="GraphViewComponentFactory" class="org.apache.taverna.workbench.views.graph.GraphViewComponentFactory">
<property name="colourManager" ref="colourManager" />
<property name="editManager" ref="editManager" />
<property name="menuManager" ref="menuManager" />
@@ -30,78 +30,78 @@
</bean>
<bean id="GraphEditToolbarSection"
- class="net.sf.taverna.t2.workbench.views.graph.toolbar.GraphEditToolbarSection" />
+ class="org.apache.taverna.workbench.views.graph.toolbar.GraphEditToolbarSection" />
<bean id="GraphDeleteToolbarSection"
- class="net.sf.taverna.t2.workbench.views.graph.toolbar.GraphDeleteToolbarSection" />
+ class="org.apache.taverna.workbench.views.graph.toolbar.GraphDeleteToolbarSection" />
<bean id="AddWFInputToolbarAction"
- class="net.sf.taverna.t2.workbench.views.graph.toolbar.AddWFInputToolbarAction">
+ class="org.apache.taverna.workbench.views.graph.toolbar.AddWFInputToolbarAction">
<property name="editManager" ref="editManager" />
<property name="selectionManager" ref="selectionManager" />
</bean>
<bean id="AddWFOutputToolbarAction"
- class="net.sf.taverna.t2.workbench.views.graph.toolbar.AddWFOutputToolbarAction">
+ class="org.apache.taverna.workbench.views.graph.toolbar.AddWFOutputToolbarAction">
<property name="editManager" ref="editManager" />
<property name="selectionManager" ref="selectionManager" />
</bean>
<bean id="RenameWFInputOutputProcessorToolbarAction"
- class="net.sf.taverna.t2.workbench.views.graph.toolbar.RenameWFInputOutputProcessorToolbarAction">
+ class="org.apache.taverna.workbench.views.graph.toolbar.RenameWFInputOutputProcessorToolbarAction">
<property name="editManager" ref="editManager" />
<property name="selectionManager" ref="selectionManager" />
</bean>
<bean id="DeleteGraphComponentToolbarAction"
- class="net.sf.taverna.t2.workbench.views.graph.toolbar.DeleteGraphComponentToolbarAction">
+ class="org.apache.taverna.workbench.views.graph.toolbar.DeleteGraphComponentToolbarAction">
<property name="editManager" ref="editManager" />
<property name="selectionManager" ref="selectionManager" />
</bean>
<bean id="DiagramMenu"
- class="net.sf.taverna.t2.workbench.views.graph.menu.DiagramMenu" />
+ class="org.apache.taverna.workbench.views.graph.menu.DiagramMenu" />
<bean id="DiagramSaveMenuSection"
- class="net.sf.taverna.t2.workbench.views.graph.menu.DiagramSaveMenuSection" />
+ class="org.apache.taverna.workbench.views.graph.menu.DiagramSaveMenuSection" />
<bean id="DiagramZoomMenuSection"
- class="net.sf.taverna.t2.workbench.views.graph.menu.DiagramZoomMenuSection" />
+ class="org.apache.taverna.workbench.views.graph.menu.DiagramZoomMenuSection" />
<bean id="GraphMenuSection"
- class="net.sf.taverna.t2.workbench.views.graph.menu.GraphMenuSection" />
+ class="org.apache.taverna.workbench.views.graph.menu.GraphMenuSection" />
<bean id="GraphCopyMenuSection"
- class="net.sf.taverna.t2.workbench.views.graph.menu.GraphCopyMenuSection" />
+ class="org.apache.taverna.workbench.views.graph.menu.GraphCopyMenuSection" />
<bean id="GraphEditMenuSection"
- class="net.sf.taverna.t2.workbench.views.graph.menu.GraphEditMenuSection" />
+ class="org.apache.taverna.workbench.views.graph.menu.GraphEditMenuSection" />
<bean id="GraphDeleteMenuSection"
- class="net.sf.taverna.t2.workbench.views.graph.menu.GraphDeleteMenuSection" />
+ class="org.apache.taverna.workbench.views.graph.menu.GraphDeleteMenuSection" />
<bean id="GraphDetailsMenuSection"
- class="net.sf.taverna.t2.workbench.views.graph.menu.GraphDetailsMenuSection" />
- <bean id="InsertMenu" class="net.sf.taverna.t2.workbench.views.graph.menu.InsertMenu" />
+ class="org.apache.taverna.workbench.views.graph.menu.GraphDetailsMenuSection" />
+ <bean id="InsertMenu" class="org.apache.taverna.workbench.views.graph.menu.InsertMenu" />
<bean id="AddWFInputMenuAction"
- class="net.sf.taverna.t2.workbench.views.graph.menu.AddWFInputMenuAction">
+ class="org.apache.taverna.workbench.views.graph.menu.AddWFInputMenuAction">
<property name="editManager" ref="editManager" />
<property name="selectionManager" ref="selectionManager" />
</bean>
<bean id="AddWFOutputMenuAction"
- class="net.sf.taverna.t2.workbench.views.graph.menu.AddWFOutputMenuAction">
+ class="org.apache.taverna.workbench.views.graph.menu.AddWFOutputMenuAction">
<property name="editManager" ref="editManager" />
<property name="selectionManager" ref="selectionManager" />
</bean>
<bean id="RenameWFInputOutputProcessorMenuAction"
- class="net.sf.taverna.t2.workbench.views.graph.menu.RenameWFInputOutputProcessorMenuAction">
+ class="org.apache.taverna.workbench.views.graph.menu.RenameWFInputOutputProcessorMenuAction">
<property name="editManager" ref="editManager" />
<property name="selectionManager" ref="selectionManager" />
</bean>
<bean id="DeleteGraphComponentMenuAction"
- class="net.sf.taverna.t2.workbench.views.graph.menu.DeleteGraphComponentMenuAction">
+ class="org.apache.taverna.workbench.views.graph.menu.DeleteGraphComponentMenuAction">
<property name="editManager" ref="editManager" />
<property name="selectionManager" ref="selectionManager" />
</bean>
<!-- <bean id="SaveGraphImageSubMenu"
- class="net.sf.taverna.t2.workbench.views.graph.menu.SaveGraphImageSubMenu">
+ class="org.apache.taverna.workbench.views.graph.menu.SaveGraphImageSubMenu">
<property name="fileManager" ref="fileManager" />
<property name="workbenchConfiguration" ref="workbenchConfiguration" />
<property name="selectionManager" ref="selectionManager" />
<property name="graphViewComponent" ref="GraphViewComponent" />
</bean> -->
<bean id="ZoomInMenuAction"
- class="net.sf.taverna.t2.workbench.views.graph.menu.ZoomInMenuAction" />
+ class="org.apache.taverna.workbench.views.graph.menu.ZoomInMenuAction" />
<bean id="ZoomOutMenuAction"
- class="net.sf.taverna.t2.workbench.views.graph.menu.ZoomOutMenuAction" />
+ class="org.apache.taverna.workbench.views.graph.menu.ZoomOutMenuAction" />
<bean id="ResetDiagramMenuAction"
- class="net.sf.taverna.t2.workbench.views.graph.menu.ResetDiagramMenuAction" />
+ class="org.apache.taverna.workbench.views.graph.menu.ResetDiagramMenuAction" />
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/HelpCollator.java
----------------------------------------------------------------------
diff --git a/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/HelpCollator.java b/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/HelpCollator.java
deleted file mode 100644
index 8b19b69..0000000
--- a/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/HelpCollator.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package net.sf.taverna.t2.workbench.helper;
-
-import java.awt.Component;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.help.BadIDException;
-import javax.help.HelpSet;
-import javax.help.HelpSetException;
-import javax.help.Map.ID;
-import javax.help.TryMap;
-import javax.swing.JTree;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreePath;
-
-import org.apache.log4j.Logger;
-
-/**
- * This class loads the {@link HelpSet} and also deals with the registration of
- * ids and the decoding from a {@link Component} to the corresponding id. These
- * two sets of functionality should possibly be separated.
- *
- * @author alanrw
- */
-// TODO Convert to a bean
-public final class HelpCollator {
- private static Logger logger = Logger.getLogger(HelpCollator.class);
- /**
- * The HelpSet that is being used.
- */
- private static HelpSet hs = null;
- /**
- * The mapping from components to ids. This is used because of problems with
- * CSH throwing exceptions because it tried to use ids that were not in the
- * map.
- */
- private static Map<Component, String> idMap;
- /**
- * Indicates whether the HelpCollator has been initialized.
- */
- private static boolean initialized = false;
- /**
- * A Pattern for normalizing the ids.
- */
- private static Pattern nonAlphanumeric;
- /**
- * The emptyHelp is set if the HelpCollator was unable to read the
- */
- private static boolean emptyHelp = true;
- private static int TIMEOUT = 5000;
-
- private static String externalHelpSetURL = "http://www.mygrid.org.uk/taverna/helpset/"
- + version() + "/helpset.hs";
-
- // private static Profile profile = ProfileFactory.getInstance().getProfile();
- private static String version() {
- return "NO-VERSION";//profile.getVersion();
- // TODO find a better way to find the version
- }
-
- /**
- * Attempt to read the up-to-date HelpSet from the web
- */
- private static void readExternalHelpSet() {
- try {
- URL url = new URL(externalHelpSetURL);
- checkConnection(url);
- hs = new HelpSet(null, url);
- if (hs.getLocalMap() == null) {
- hs = null;
- logger.error("Helpset from " + externalHelpSetURL
- + " local map was null");
- } else
- logger.info("Read external help set from " + externalHelpSetURL);
- } catch (MissingResourceException e) {
- logger.error("No external HelpSet URL specified", e);
- } catch (MalformedURLException e) {
- logger.error("External HelpSet URL is malformed", e);
- } catch (HelpSetException e) {
- logger.error("External HelpSet could not be read", e);
- } catch (IOException e) {
- logger.error("IOException reading External HelpSet", e);
- }
- }
-
- private static void checkConnection(URL url) throws IOException {
- if (!url.getProtocol().startsWith("http"))
- return;
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setReadTimeout(TIMEOUT);
- connection.setConnectTimeout(TIMEOUT);
- connection.setRequestMethod("HEAD");
- connection.getInputStream().close();
- connection.disconnect();
- }
-
- /**
- * This methods creates a HelpSet based upon, in priority, the external
- * HelpSet, then a newly created empty HelpSet.
- */
- private static void initialize() {
- if (initialized)
- return;
- readExternalHelpSet();
- if (hs == null) {
- hs = new HelpSet();
- hs.setLocalMap(new TryMap());
- } else {
- logger.trace("EmptyHelp set to false");
- emptyHelp = false;
- }
- idMap = new HashMap<>();
- nonAlphanumeric = Pattern.compile("[^a-z0-9\\.]");
- initialized = true;
- }
-
- /**
- * Indicates if an empty HelpSet is being used
- *
- * @return
- */
- public static boolean isEmptyHelp() {
- return emptyHelp;
- }
-
- public static URL getURLFromID(String id) throws BadIDException,
- MalformedURLException {
- initialize();
- logger.trace("Looking for id: " + id);
- ID theId = ID.create(id, hs);
- if (theId == null)
- return null;
- return hs.getCombinedMap().getURLFromID(theId);
- }
-
- /**
- * Register a component under the specified id. The method checks that the
- * id is known to the HelpSet's map.
- *
- * @param component
- * @param id
- */
- public static void registerComponent(Component component, String id) {
- logger.trace("Attempting to register " + id);
- initialize();
- String normalizedId = normalizeString(id.toLowerCase());
- if (idMap.containsKey(component)) {
- logger.info("Registered " + normalizedId);
- return;
- }
-
- /*
- * If Workbench is started up while there is no network connection -
- * hs.getLocalMap() is null for some reason
- */
- if (hs != null && hs.getLocalMap() != null
- && hs.getLocalMap().isValidID(normalizedId, hs)) {
- idMap.put(component, normalizedId);
- logger.info("Registered " + normalizedId);
- } else
- logger.warn("Refused to register component as " + normalizedId
- + " not in map");
- }
-
- /**
- * Register a component. Since no id is specified, the HelpCollator takes
- * the canonical name of the component's class. This is useful when an
- * explicit hierarchy-based approach has been taken.
- *
- * @param component
- */
- public static void registerComponent(Component component) {
- String canonicalName = component.getClass().getCanonicalName();
- if (canonicalName != null)
- registerComponent(component, canonicalName);
- }
-
- /**
- * Register a component based upon its parent's class and a suffix
- * indicating the component's purpose in the parent.
- *
- * @param component
- * @param parent
- * @param suffix
- */
- public static void registerComponent(Component component, Object parent,
- String suffix) {
- String canonicalName = parent.getClass().getCanonicalName();
- if (canonicalName != null)
- registerComponent(component, canonicalName + "-" + suffix);
- }
-
- /**
- * Try to find an id for the Component. This code should be re-written when
- * we have more experience in how to couple the UI and HelpSets.
- *
- * @param c
- * @return
- */
- static String getHelpID(Component c) {
- initialize();
- boolean found = false;
- String result = null;
- if (c instanceof JTree) {
- String idInTree = getHelpIDInTree((JTree) c);
- if (idInTree != null) {
- found = true;
- result = idInTree;
- }
- }
- Component working = c;
- if (c != null)
- logger.trace("Starting at a " + working.getClass());
- while (!found && (working != null)) {
- if (idMap.containsKey(working)) {
- result = idMap.get(working);
- found = true;
- logger.trace("Found component id " + result);
- } else {
- String className = working.getClass().getCanonicalName();
- if (hs.getLocalMap().isValidID(className, hs)) {
- result = className;
- found = true;
- logger.trace("Found class name " + result);
- }
- }
- if (!found) {
- working = working.getParent();
- if (working != null)
- logger.trace("Moved up to a " + working.getClass());
- }
- }
- return result;
- }
-
- /**
- * Change the input String into an id that contains only alphanumeric
- * characters or hyphens.
- *
- * @param input
- * @return
- */
- private static String normalizeString(String input) {
- Matcher m = nonAlphanumeric.matcher(input);
- return m.replaceAll("-");
- }
-
- /**
- * If help is sought on part of a JTree, then this method attempts to find a
- * node of the tree that can be mapped to an id. The possibilities are ad
- * hoc and should be re-examined when more experience is gained.
- *
- * @param c
- * @return
- */
- private static String getHelpIDInTree(JTree c) {
- initialize();
-
- TreePath tp = c.getSelectionPath();
- if (tp == null)
- return null;
-
- Object o = tp.getLastPathComponent();
- if (o == null)
- return null;
-
- if (o instanceof DefaultMutableTreeNode) {
- DefaultMutableTreeNode dmtn = (DefaultMutableTreeNode) o;
- if (dmtn.getUserObject() != null)
- o = dmtn.getUserObject();
- }
-
- String className = o.getClass().getCanonicalName();
-
- logger.trace("Tree node as a string is " + o);
-
- String possibility = normalizeString(o.toString().toLowerCase());
-
- logger.trace("Normalized is " + possibility);
- logger.trace("Tree node class name is " + className);
-
- possibility = className + "-" + possibility;
-
- logger.trace("Possibility is " + possibility);
-
- String result;
- if (hs.getLocalMap().isValidID(possibility, hs)) {
- result = possibility;
- logger.trace("Accepted tree node " + result);
- } else if (hs.getLocalMap().isValidID(className, hs)) {
- result = className;
- logger.trace("Found tree node class name " + result);
- } else {
- result = null;
- }
-
- logger.debug("Tree node is a " + o.getClass());
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/HelpEnabledDialog.java
----------------------------------------------------------------------
diff --git a/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/HelpEnabledDialog.java b/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/HelpEnabledDialog.java
deleted file mode 100644
index ec17171..0000000
--- a/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/HelpEnabledDialog.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- *
- */
-package net.sf.taverna.t2.workbench.helper;
-
-import static net.sf.taverna.t2.workbench.MainWindow.getMainWindow;
-import static net.sf.taverna.t2.workbench.helper.HelpCollator.registerComponent;
-import static net.sf.taverna.t2.workbench.helper.Helper.setKeyCatcher;
-
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.awt.HeadlessException;
-
-import javax.swing.JDialog;
-
-/**
- * This class extends JDialog to register the dialog and also attach a key
- * catcher so that F1 is interpreted as help
- *
- * @author alanrw
- */
-public class HelpEnabledDialog extends JDialog {
- private static final long serialVersionUID = -5068807887477419800L;
-
- /**
- * Create a HelpEnabledDialog, register it (if possible) with the
- * HelpCollator and attach a keycatcher.
- *
- * @param owner
- * @param title
- * @param modal
- * @param id
- * @throws HeadlessException
- */
- public HelpEnabledDialog(Frame owner, String title, boolean modal, String id)
- throws HeadlessException {
- super(owner == null ? getMainWindow() : owner, title, modal);
-
- if (id != null)
- registerComponent(this, id);
- else if (owner != null)
- registerComponent(this, owner.getClass().getCanonicalName()
- + "-dialog");
- else if (title != null && !title.isEmpty())
- registerComponent(this, title);
- setKeyCatcher(this);
- }
-
- /**
- * Create a HelpEnabledDialog, register it (if possible) with the
- * HelpCollator and attach a keycatcher.
- *
- * @param owner
- * @param title
- * @param modal
- * @param id
- * @throws HeadlessException
- */
- public HelpEnabledDialog(Dialog owner, String title, boolean modal,
- String id) throws HeadlessException {
- super(owner, title, modal);
- if (id != null)
- registerComponent(this, id);
- else if (owner != null)
- registerComponent(this, owner.getClass().getCanonicalName()
- + "-dialog");
- setKeyCatcher(this);
- }
-
- /**
- * Create a HelpEnabledDialog, register it (if possible) with the
- * HelpCollator and attach a keycatcher.
- *
- * @param owner
- * @param title
- * @param modal
- * @throws HeadlessException
- */
- public HelpEnabledDialog(Frame parent, String title, boolean modal) {
- this(parent, title, modal, null);
- }
-
- /**
- * Create a HelpEnabledDialog, register it (if possible) with the
- * HelpCollator and attach a keycatcher.
- *
- * @param owner
- * @param title
- * @param modal
- * @throws HeadlessException
- */
- public HelpEnabledDialog(Dialog parent, String title, boolean modal) {
- this(parent, title, modal, null);
- }
-
- @Override
- public void setVisible(boolean b) {
- setLocationRelativeTo(getParent());
- super.setVisible(b);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/Helper.java
----------------------------------------------------------------------
diff --git a/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/Helper.java b/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/Helper.java
deleted file mode 100644
index 21b0f75..0000000
--- a/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/Helper.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- *
- */
-package net.sf.taverna.t2.workbench.helper;
-
-import static java.awt.Desktop.getDesktop;
-import static java.awt.MouseInfo.getPointerInfo;
-import static javax.swing.JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT;
-import static javax.swing.KeyStroke.getKeyStroke;
-import static net.sf.taverna.t2.workbench.helper.HelpCollator.getHelpID;
-import static net.sf.taverna.t2.workbench.helper.HelpCollator.getURLFromID;
-
-import java.awt.AWTEvent;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-
-import javax.help.BadIDException;
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.InputMap;
-import javax.swing.JComponent;
-import javax.swing.JRootPane;
-import javax.swing.RootPaneContainer;
-
-import org.apache.log4j.Logger;
-
-/**
- * This class creates the dialogs for the presentation of the HelpSet held by
- * the HelpCollator.
- *
- * @author alanrw
- */
-public final class Helper {
- private static Helper instance;
- private static Logger logger = Logger.getLogger(Helper.class);
-
- /**
- * Create a Helper and initialize the static variables.
- */
- private Helper() {
- }
-
- /**
- * Get the singleton instance of Helper. In theory there could be more than
- * one.
- *
- * @return
- */
- private static Helper getInstance() {
- if (instance == null)
- instance = new Helper();
- return instance;
- }
-
- /**
- * Show in the current dialog the entry (if any) corresponding to the
- * specified id.
- *
- * @param id
- */
- private static void showID(String id) {
- getInstance();
- try {
- URL result = getURLFromID(id);
- if (result == null)
- result = getURLFromID("home");
- getDesktop().browse(result.toURI());
- } catch (BadIDException | IOException | URISyntaxException e) {
- logger.error(e);
- }
- }
-
- /**
- * Show the most suitable help for the specified component.
- *
- * @param c
- */
- public static void showHelp(Component c) {
- showID(getHelpID(c));
- }
-
- /**
- * Display the default home page help.
- *
- * @param e
- */
- public static void displayDefaultHelp(AWTEvent e) {
- showID("home");
- }
-
- public static void displayFieldLevelHelp(ActionEvent e) {
- //
- }
-
- private static final String HELP_KEY = "F1";
-
- /**
- * Associated the specified action with key presses in the specified
- * component.
- *
- * @param component
- * @param theAction
- */
- public static void setKeyCatcher(final JComponent component,
- final AbstractAction theAction) {
- InputMap oldInputMap = component
- .getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
- InputMap newInputMap = new InputMap();
- newInputMap.setParent(oldInputMap);
- newInputMap.put(getKeyStroke(HELP_KEY), "doSomething");
- component.setInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, newInputMap);
- ActionMap oldActionMap = component.getActionMap();
- ActionMap newActionMap = new ActionMap();
- newActionMap.setParent(oldActionMap);
- newActionMap.put("doSomething", theAction);
- component.setActionMap(newActionMap);
- }
-
- /**
- * Set up a key-press catcher for the specified component such that when F1
- * is pressed it should help for the component where the cursor is.
- *
- * @param rootpanecontainer
- */
- public static void setKeyCatcher(final RootPaneContainer rootpanecontainer) {
- @SuppressWarnings("serial")
- AbstractAction theAction = new AbstractAction() {
- @Override
- public void actionPerformed(ActionEvent evt) {
- Component component = (Component) rootpanecontainer;
- Container container = (Container) rootpanecontainer;
- logger.info("frame action F1 pressed with source "
- + evt.getSource().getClass().getName());
- Point mousePosition = getPointerInfo().getLocation();
- Point framePosition = component.getLocation();
- Point relativePosition = (Point) mousePosition.clone();
- relativePosition.translate(-framePosition.x, -framePosition.y);
- Component c = container.findComponentAt(relativePosition);
- if (c != null)
- logger.info("F1 pressed in a " + c.getClass().getName());
- showHelpWithinContainer(rootpanecontainer, c);
- }
- };
-
- JRootPane pane = rootpanecontainer.getRootPane();
- setKeyCatcher(pane, theAction);
- }
-
- /**
- * Show the help most associated with the specific component within the container.
- *
- * @param root
- * @param c
- */
- static void showHelpWithinContainer(RootPaneContainer root, Component c) {
- getInstance();
- showHelp(c);
- }
-
- /**
- * Register a component with the {@link HelpCollator} under the specified
- * id.
- *
- * @param component
- * @param id
- */
- public static void registerComponent(Component component, final String id) {
- HelpCollator.registerComponent(component, id);
- }
-
- /**
- * Register a component with the {@link HelpCollator}.
- *
- * @param component
- * @param parent
- * @param suffix
- */
- public static void registerComponent(Component component, Object parent,
- String suffix) {
- HelpCollator.registerComponent(component, parent, suffix);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/NonBlockedHelpEnabledDialog.java
----------------------------------------------------------------------
diff --git a/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/NonBlockedHelpEnabledDialog.java b/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/NonBlockedHelpEnabledDialog.java
deleted file mode 100644
index 67e6bc5..0000000
--- a/taverna-helper-api/src/main/java/net/sf/taverna/t2/workbench/helper/NonBlockedHelpEnabledDialog.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- *
- */
-package net.sf.taverna.t2.workbench.helper;
-
-import static java.awt.Dialog.ModalExclusionType.APPLICATION_EXCLUDE;
-
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.awt.HeadlessException;
-
-/**
- * @author alanrw
- */
-public class NonBlockedHelpEnabledDialog extends HelpEnabledDialog {
- private static final long serialVersionUID = -2455471377333940417L;
-
- public NonBlockedHelpEnabledDialog(Dialog owner, String title,
- boolean modal, String id) throws HeadlessException {
- super(owner, title, modal, id);
- this.setModalExclusionType(APPLICATION_EXCLUDE);
- }
-
- public NonBlockedHelpEnabledDialog(Frame owner, String title,
- boolean modal, String id) throws HeadlessException {
- super(owner, title, modal, id);
- this.setModalExclusionType(APPLICATION_EXCLUDE);
- }
-
- public NonBlockedHelpEnabledDialog(Frame parent, String title, boolean modal) {
- super(parent, title, modal, null);
- this.setModalExclusionType(APPLICATION_EXCLUDE);
- }
-
- public NonBlockedHelpEnabledDialog(Dialog parent, String title,
- boolean modal) {
- super(parent, title, modal, null);
- this.setModalExclusionType(APPLICATION_EXCLUDE);
- }
-}