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:07 UTC
[18/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-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/SaveWorkflowAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/SaveWorkflowAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/SaveWorkflowAction.java
index dcb3120..f4291e7 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/SaveWorkflowAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/SaveWorkflowAction.java
@@ -29,7 +29,7 @@ import static javax.swing.JOptionPane.YES_OPTION;
import static javax.swing.JOptionPane.showConfirmDialog;
import static javax.swing.JOptionPane.showMessageDialog;
import static javax.swing.KeyStroke.getKeyStroke;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.saveIcon;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.saveIcon;
import java.awt.Component;
import java.awt.event.ActionEvent;
@@ -38,15 +38,15 @@ import javax.swing.AbstractAction;
import org.apache.taverna.lang.observer.Observable;
import org.apache.taverna.lang.observer.Observer;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.edits.EditManager.AbstractDataflowEditEvent;
-import net.sf.taverna.t2.workbench.edits.EditManager.EditManagerEvent;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.events.FileManagerEvent;
-import net.sf.taverna.t2.workbench.file.events.SavedDataflowEvent;
-import net.sf.taverna.t2.workbench.file.events.SetCurrentDataflowEvent;
-import net.sf.taverna.t2.workbench.file.exceptions.OverwriteException;
-import net.sf.taverna.t2.workbench.file.exceptions.SaveException;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.edits.EditManager.AbstractDataflowEditEvent;
+import org.apache.taverna.workbench.edits.EditManager.EditManagerEvent;
+import org.apache.taverna.workbench.file.FileManager;
+import org.apache.taverna.workbench.file.events.FileManagerEvent;
+import org.apache.taverna.workbench.file.events.SavedDataflowEvent;
+import org.apache.taverna.workbench.file.events.SetCurrentDataflowEvent;
+import org.apache.taverna.workbench.file.exceptions.OverwriteException;
+import org.apache.taverna.workbench.file.exceptions.SaveException;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/SaveWorkflowAsAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/SaveWorkflowAsAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/SaveWorkflowAsAction.java
index 60d5aaa..8833e16 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/SaveWorkflowAsAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/SaveWorkflowAsAction.java
@@ -31,7 +31,7 @@ import static javax.swing.JOptionPane.YES_OPTION;
import static javax.swing.JOptionPane.showConfirmDialog;
import static javax.swing.JOptionPane.showMessageDialog;
import static javax.swing.KeyStroke.getKeyStroke;
-import static net.sf.taverna.t2.workbench.icons.WorkbenchIcons.saveAsIcon;
+import static org.apache.taverna.workbench.icons.WorkbenchIcons.saveAsIcon;
import java.awt.Component;
import java.awt.event.ActionEvent;
@@ -46,12 +46,12 @@ import javax.swing.filechooser.FileFilter;
import org.apache.taverna.lang.observer.Observable;
import org.apache.taverna.lang.observer.Observer;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.FileType;
-import net.sf.taverna.t2.workbench.file.events.FileManagerEvent;
-import net.sf.taverna.t2.workbench.file.events.SetCurrentDataflowEvent;
-import net.sf.taverna.t2.workbench.file.exceptions.OverwriteException;
-import net.sf.taverna.t2.workbench.file.exceptions.SaveException;
+import org.apache.taverna.workbench.file.FileManager;
+import org.apache.taverna.workbench.file.FileType;
+import org.apache.taverna.workbench.file.events.FileManagerEvent;
+import org.apache.taverna.workbench.file.events.SetCurrentDataflowEvent;
+import org.apache.taverna.workbench.file.exceptions.OverwriteException;
+import org.apache.taverna.workbench.file.exceptions.SaveException;
import net.sf.taverna.t2.workbench.file.impl.FileTypeFileFilter;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/hooks/CloseWorkflowsOnShutdown.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/hooks/CloseWorkflowsOnShutdown.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/hooks/CloseWorkflowsOnShutdown.java
index 6c0be19..99d326a 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/hooks/CloseWorkflowsOnShutdown.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/hooks/CloseWorkflowsOnShutdown.java
@@ -20,9 +20,9 @@
******************************************************************************/
package net.sf.taverna.t2.workbench.file.impl.hooks;
-import net.sf.taverna.t2.workbench.ShutdownSPI;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
+import org.apache.taverna.workbench.ShutdownSPI;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.CloseAllWorkflowsAction;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileCloseAllMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileCloseAllMenuAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileCloseAllMenuAction.java
index e8e5252..68aade2 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileCloseAllMenuAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileCloseAllMenuAction.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.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.CloseAllWorkflowsAction;
public class FileCloseAllMenuAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileCloseMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileCloseMenuAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileCloseMenuAction.java
index a97219f..1af3d07 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileCloseMenuAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileCloseMenuAction.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.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.CloseWorkflowAction;
public class FileCloseMenuAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileNewMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileNewMenuAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileNewMenuAction.java
index 3a48e0d..5a3cd2f 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileNewMenuAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileNewMenuAction.java
@@ -26,8 +26,8 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.NewWorkflowAction;
public class FileNewMenuAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenFromURLMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenFromURLMenuAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenFromURLMenuAction.java
index 9af1d6b..7dc3bbc 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenFromURLMenuAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenFromURLMenuAction.java
@@ -26,8 +26,8 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.OpenWorkflowFromURLAction;
public class FileOpenFromURLMenuAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenMenuAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenMenuAction.java
index 4ee4e39..d3c26ed 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenMenuAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenMenuAction.java
@@ -26,8 +26,8 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.OpenWorkflowAction;
public class FileOpenMenuAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenMenuSection.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenMenuSection.java
index 46ef476..73bfa2b 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenMenuSection.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenMenuSection.java
@@ -22,7 +22,7 @@ package net.sf.taverna.t2.workbench.file.impl.menu;
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
public class FileOpenMenuSection extends AbstractMenuSection {
public static final URI FILE_URI = URI
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenRecentMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenRecentMenuAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenRecentMenuAction.java
index a64e538..3c49adf 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenRecentMenuAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileOpenRecentMenuAction.java
@@ -31,15 +31,15 @@ import javax.swing.JMenuItem;
import org.apache.taverna.lang.observer.Observable;
import org.apache.taverna.lang.observer.Observer;
-import net.sf.taverna.t2.ui.menu.AbstractMenuCustom;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.FileType;
-import net.sf.taverna.t2.workbench.file.events.AbstractDataflowEvent;
-import net.sf.taverna.t2.workbench.file.events.ClosedDataflowEvent;
-import net.sf.taverna.t2.workbench.file.events.FileManagerEvent;
-import net.sf.taverna.t2.workbench.file.events.OpenedDataflowEvent;
-import net.sf.taverna.t2.workbench.file.events.SavedDataflowEvent;
-import net.sf.taverna.t2.workbench.file.exceptions.OpenException;
+import org.apache.taverna.ui.menu.AbstractMenuCustom;
+import org.apache.taverna.workbench.file.FileManager;
+import org.apache.taverna.workbench.file.FileType;
+import org.apache.taverna.workbench.file.events.AbstractDataflowEvent;
+import org.apache.taverna.workbench.file.events.ClosedDataflowEvent;
+import org.apache.taverna.workbench.file.events.FileManagerEvent;
+import org.apache.taverna.workbench.file.events.OpenedDataflowEvent;
+import org.apache.taverna.workbench.file.events.SavedDataflowEvent;
+import org.apache.taverna.workbench.file.exceptions.OpenException;
import org.apache.log4j.Logger;
import org.jdom.Document;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveAllMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveAllMenuAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveAllMenuAction.java
index 86edacb..4b1f3b8 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveAllMenuAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveAllMenuAction.java
@@ -24,9 +24,9 @@ import static net.sf.taverna.t2.workbench.file.impl.menu.FileSaveMenuSection.FIL
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.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.SaveAllWorkflowsAction;
public class FileSaveAllMenuAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveAsMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveAsMenuAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveAsMenuAction.java
index 77917c9..2459870 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveAsMenuAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveAsMenuAction.java
@@ -24,8 +24,8 @@ import static net.sf.taverna.t2.workbench.file.impl.menu.FileSaveMenuSection.FIL
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.SaveWorkflowAsAction;
public class FileSaveAsMenuAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveMenuAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveMenuAction.java
index eeaecb3..cb7462e 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveMenuAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveMenuAction.java
@@ -24,9 +24,9 @@ import static net.sf.taverna.t2.workbench.file.impl.menu.FileSaveMenuSection.FIL
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.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.SaveWorkflowAction;
public class FileSaveMenuAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveMenuSection.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveMenuSection.java
index a75a855..7d63a68 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveMenuSection.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/FileSaveMenuSection.java
@@ -22,7 +22,7 @@ package net.sf.taverna.t2.workbench.file.impl.menu;
import java.net.URI;
-import net.sf.taverna.t2.ui.menu.AbstractMenuSection;
+import org.apache.taverna.ui.menu.AbstractMenuSection;
public class FileSaveMenuSection extends AbstractMenuSection {
public static final URI FILE_URI = URI
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/WorkflowsMenu.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/WorkflowsMenu.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/WorkflowsMenu.java
index 9f6f355..1ba6f45 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/WorkflowsMenu.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/menu/WorkflowsMenu.java
@@ -24,7 +24,7 @@ import static java.awt.event.KeyEvent.VK_0;
import static java.awt.event.KeyEvent.VK_W;
import static javax.swing.Action.MNEMONIC_KEY;
import static javax.swing.SwingUtilities.invokeLater;
-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.awt.Component;
import java.awt.event.ActionEvent;
@@ -36,13 +36,13 @@ import javax.swing.JRadioButtonMenuItem;
import org.apache.taverna.lang.observer.Observable;
import org.apache.taverna.lang.observer.Observer;
-import net.sf.taverna.t2.ui.menu.AbstractMenuCustom;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.edits.EditManager.AbstractDataflowEditEvent;
-import net.sf.taverna.t2.workbench.edits.EditManager.EditManagerEvent;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.events.AbstractDataflowEvent;
-import net.sf.taverna.t2.workbench.file.events.FileManagerEvent;
+import org.apache.taverna.ui.menu.AbstractMenuCustom;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.edits.EditManager.AbstractDataflowEditEvent;
+import org.apache.taverna.workbench.edits.EditManager.EditManagerEvent;
+import org.apache.taverna.workbench.file.FileManager;
+import org.apache.taverna.workbench.file.events.AbstractDataflowEvent;
+import org.apache.taverna.workbench.file.events.FileManagerEvent;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
public class WorkflowsMenu extends AbstractMenuCustom {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/CloseToolbarAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/CloseToolbarAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/CloseToolbarAction.java
index 68ef3f9..19f3f59 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/CloseToolbarAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/CloseToolbarAction.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.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.CloseWorkflowAction;
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/FileToolbarMenuSection.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/FileToolbarMenuSection.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/FileToolbarMenuSection.java
index 257d590..26bb7bb 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/FileToolbarMenuSection.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/FileToolbarMenuSection.java
@@ -20,11 +20,11 @@
******************************************************************************/
package net.sf.taverna.t2.workbench.file.impl.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;
public class FileToolbarMenuSection extends AbstractMenuSection {
public static final URI FILE_TOOLBAR_SECTION = URI
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/NewToolbarAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/NewToolbarAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/NewToolbarAction.java
index 2c8e922..b316459 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/NewToolbarAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/NewToolbarAction.java
@@ -26,8 +26,8 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.NewWorkflowAction;
public class NewToolbarAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/OpenToolbarAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/OpenToolbarAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/OpenToolbarAction.java
index ae99509..0605e47 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/OpenToolbarAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/OpenToolbarAction.java
@@ -26,8 +26,8 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.OpenWorkflowAction;
public class OpenToolbarAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/OpenWorkflowFromURLToolbarAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/OpenWorkflowFromURLToolbarAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/OpenWorkflowFromURLToolbarAction.java
index 2554063..df7415e 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/OpenWorkflowFromURLToolbarAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/OpenWorkflowFromURLToolbarAction.java
@@ -26,8 +26,8 @@ import java.net.URI;
import javax.swing.Action;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.workbench.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.OpenWorkflowFromURLAction;
public class OpenWorkflowFromURLToolbarAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/SaveToolbarAction.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/SaveToolbarAction.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/SaveToolbarAction.java
index 53ba720..df3046d 100644
--- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/SaveToolbarAction.java
+++ b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/toolbar/SaveToolbarAction.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.file.FileManager;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.file.FileManager;
import net.sf.taverna.t2.workbench.file.impl.actions.SaveWorkflowAction;
public class SaveToolbarAction extends AbstractMenuAction {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent b/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent
deleted file mode 100644
index 100915c..0000000
--- a/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent
+++ /dev/null
@@ -1,20 +0,0 @@
-net.sf.taverna.t2.workbench.file.impl.menu.FileCloseMenuAction
-net.sf.taverna.t2.workbench.file.impl.menu.FileNewMenuAction
-net.sf.taverna.t2.workbench.file.impl.menu.FileOpenMenuAction
-net.sf.taverna.t2.workbench.file.impl.menu.FileOpenFromURLMenuAction
-net.sf.taverna.t2.workbench.file.impl.menu.FileOpenMenuSection
-net.sf.taverna.t2.workbench.file.impl.menu.FileOpenRecentMenuAction
-net.sf.taverna.t2.workbench.file.impl.menu.FileSaveMenuSection
-net.sf.taverna.t2.workbench.file.impl.menu.FileSaveMenuAction
-net.sf.taverna.t2.workbench.file.impl.menu.FileSaveAllMenuAction
-net.sf.taverna.t2.workbench.file.impl.menu.FileSaveAsMenuAction
-
-net.sf.taverna.t2.workbench.file.impl.menu.WorkflowsMenu
-net.sf.taverna.t2.workbench.file.impl.menu.FileCloseAllMenuAction
-
-net.sf.taverna.t2.workbench.file.impl.toolbar.FileToolbarMenuSection
-net.sf.taverna.t2.workbench.file.impl.toolbar.NewToolbarAction
-net.sf.taverna.t2.workbench.file.impl.toolbar.OpenToolbarAction
-net.sf.taverna.t2.workbench.file.impl.toolbar.OpenWorkflowFromURLToolbarAction
-net.sf.taverna.t2.workbench.file.impl.toolbar.SaveToolbarAction
-net.sf.taverna.t2.workbench.file.impl.toolbar.CloseToolbarAction
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ShutdownSPI
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ShutdownSPI b/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ShutdownSPI
deleted file mode 100644
index cc53d36..0000000
--- a/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ShutdownSPI
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.taverna.t2.workbench.file.impl.hooks.CloseWorkflowsOnShutdown
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler b/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler
deleted file mode 100644
index cfd1c7a..0000000
--- a/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler
+++ /dev/null
@@ -1,2 +0,0 @@
-net.sf.taverna.t2.workbench.file.impl.T2DataflowOpener
-net.sf.taverna.t2.workbench.file.impl.DataflowFromDataflowPersistenceHandler
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.file.FileManager
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.file.FileManager b/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.file.FileManager
deleted file mode 100644
index 656feeb..0000000
--- a/taverna-file-impl/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.file.FileManager
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.taverna.t2.workbench.file.impl.FileManagerImpl
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent b/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent
new file mode 100644
index 0000000..100915c
--- /dev/null
+++ b/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent
@@ -0,0 +1,20 @@
+net.sf.taverna.t2.workbench.file.impl.menu.FileCloseMenuAction
+net.sf.taverna.t2.workbench.file.impl.menu.FileNewMenuAction
+net.sf.taverna.t2.workbench.file.impl.menu.FileOpenMenuAction
+net.sf.taverna.t2.workbench.file.impl.menu.FileOpenFromURLMenuAction
+net.sf.taverna.t2.workbench.file.impl.menu.FileOpenMenuSection
+net.sf.taverna.t2.workbench.file.impl.menu.FileOpenRecentMenuAction
+net.sf.taverna.t2.workbench.file.impl.menu.FileSaveMenuSection
+net.sf.taverna.t2.workbench.file.impl.menu.FileSaveMenuAction
+net.sf.taverna.t2.workbench.file.impl.menu.FileSaveAllMenuAction
+net.sf.taverna.t2.workbench.file.impl.menu.FileSaveAsMenuAction
+
+net.sf.taverna.t2.workbench.file.impl.menu.WorkflowsMenu
+net.sf.taverna.t2.workbench.file.impl.menu.FileCloseAllMenuAction
+
+net.sf.taverna.t2.workbench.file.impl.toolbar.FileToolbarMenuSection
+net.sf.taverna.t2.workbench.file.impl.toolbar.NewToolbarAction
+net.sf.taverna.t2.workbench.file.impl.toolbar.OpenToolbarAction
+net.sf.taverna.t2.workbench.file.impl.toolbar.OpenWorkflowFromURLToolbarAction
+net.sf.taverna.t2.workbench.file.impl.toolbar.SaveToolbarAction
+net.sf.taverna.t2.workbench.file.impl.toolbar.CloseToolbarAction
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.ShutdownSPI
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.ShutdownSPI b/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.ShutdownSPI
new file mode 100644
index 0000000..cc53d36
--- /dev/null
+++ b/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.ShutdownSPI
@@ -0,0 +1 @@
+net.sf.taverna.t2.workbench.file.impl.hooks.CloseWorkflowsOnShutdown
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.file.DataflowPersistenceHandler
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.file.DataflowPersistenceHandler b/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.file.DataflowPersistenceHandler
new file mode 100644
index 0000000..cfd1c7a
--- /dev/null
+++ b/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.file.DataflowPersistenceHandler
@@ -0,0 +1,2 @@
+net.sf.taverna.t2.workbench.file.impl.T2DataflowOpener
+net.sf.taverna.t2.workbench.file.impl.DataflowFromDataflowPersistenceHandler
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.file.FileManager
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.file.FileManager b/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.file.FileManager
new file mode 100644
index 0000000..656feeb
--- /dev/null
+++ b/taverna-file-impl/src/main/resources/META-INF/services/org.apache.taverna.workbench.file.FileManager
@@ -0,0 +1 @@
+net.sf.taverna.t2.workbench.file.impl.FileManagerImpl
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/resources/META-INF/spring/file-impl-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/resources/META-INF/spring/file-impl-context-osgi.xml b/taverna-file-impl/src/main/resources/META-INF/spring/file-impl-context-osgi.xml
index 7c6e290..edecfd6 100644
--- a/taverna-file-impl/src/main/resources/META-INF/spring/file-impl-context-osgi.xml
+++ b/taverna-file-impl/src/main/resources/META-INF/spring/file-impl-context-osgi.xml
@@ -81,20 +81,20 @@
</service-properties>
</service>
- <service ref="T2DataflowOpener" interface="net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler" />
+ <service ref="T2DataflowOpener" interface="org.apache.taverna.workbench.file.DataflowPersistenceHandler" />
- <service ref="WorkflowBundleOpener" interface="net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler" />
- <service ref="WorkflowBundleSaver" interface="net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler" />
+ <service ref="WorkflowBundleOpener" interface="org.apache.taverna.workbench.file.DataflowPersistenceHandler" />
+ <service ref="WorkflowBundleSaver" interface="org.apache.taverna.workbench.file.DataflowPersistenceHandler" />
- <service ref="CloseWorkflowsOnShutdown" interface="net.sf.taverna.t2.workbench.ShutdownSPI" />
+ <service ref="CloseWorkflowsOnShutdown" interface="org.apache.taverna.workbench.ShutdownSPI" />
- <service ref="FileManagerImpl" interface="net.sf.taverna.t2.workbench.file.FileManager" />
+ <service ref="FileManagerImpl" interface="org.apache.taverna.workbench.file.FileManager" />
- <reference id="editManager" interface="net.sf.taverna.t2.workbench.edits.EditManager" />
+ <reference id="editManager" interface="org.apache.taverna.workbench.edits.EditManager" />
<reference id="applicationConfiguration" interface="uk.org.taverna.configuration.app.ApplicationConfiguration" />
<reference id="workflowBundleIO" interface="uk.org.taverna.scufl2.api.io.WorkflowBundleIO" />
- <list id="dataflowPersistenceHandlers" interface="net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler" cardinality="0..N">
+ <list id="dataflowPersistenceHandlers" interface="org.apache.taverna.workbench.file.DataflowPersistenceHandler" cardinality="0..N">
<listener ref="DataflowPersistenceHandlerRegistry" bind-method="update" unbind-method="update" />
</list>
</beans:beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/main/resources/META-INF/spring/file-impl-context.xml
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/main/resources/META-INF/spring/file-impl-context.xml b/taverna-file-impl/src/main/resources/META-INF/spring/file-impl-context.xml
index 493df5f..5b171b4 100644
--- a/taverna-file-impl/src/main/resources/META-INF/spring/file-impl-context.xml
+++ b/taverna-file-impl/src/main/resources/META-INF/spring/file-impl-context.xml
@@ -3,119 +3,119 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="FileCloseMenuAction" class="net.sf.taverna.t2.workbench.file.impl.menu.FileCloseMenuAction">
+ <bean id="FileCloseMenuAction" class="org.apache.taverna.workbench.file.impl.menu.FileCloseMenuAction">
<constructor-arg ref="editManager" />
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="FileNewMenuAction" class="net.sf.taverna.t2.workbench.file.impl.menu.FileNewMenuAction">
+ <bean id="FileNewMenuAction" class="org.apache.taverna.workbench.file.impl.menu.FileNewMenuAction">
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="FileOpenMenuAction" class="net.sf.taverna.t2.workbench.file.impl.menu.FileOpenMenuAction">
+ <bean id="FileOpenMenuAction" class="org.apache.taverna.workbench.file.impl.menu.FileOpenMenuAction">
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="FileOpenFromURLMenuAction" class="net.sf.taverna.t2.workbench.file.impl.menu.FileOpenFromURLMenuAction">
+ <bean id="FileOpenFromURLMenuAction" class="org.apache.taverna.workbench.file.impl.menu.FileOpenFromURLMenuAction">
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="FileOpenMenuSection" class="net.sf.taverna.t2.workbench.file.impl.menu.FileOpenMenuSection" />
- <bean id="FileOpenRecentMenuAction" class="net.sf.taverna.t2.workbench.file.impl.menu.FileOpenRecentMenuAction">
+ <bean id="FileOpenMenuSection" class="org.apache.taverna.workbench.file.impl.menu.FileOpenMenuSection" />
+ <bean id="FileOpenRecentMenuAction" class="org.apache.taverna.workbench.file.impl.menu.FileOpenRecentMenuAction">
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
<property name="applicationConfiguration" ref="applicationConfiguration"/>
</bean>
- <bean id="FileSaveMenuSection" class="net.sf.taverna.t2.workbench.file.impl.menu.FileSaveMenuSection" />
- <bean id="FileSaveMenuAction" class="net.sf.taverna.t2.workbench.file.impl.menu.FileSaveMenuAction">
+ <bean id="FileSaveMenuSection" class="org.apache.taverna.workbench.file.impl.menu.FileSaveMenuSection" />
+ <bean id="FileSaveMenuAction" class="org.apache.taverna.workbench.file.impl.menu.FileSaveMenuAction">
<constructor-arg ref="editManager" />
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="FileSaveAllMenuAction" class="net.sf.taverna.t2.workbench.file.impl.menu.FileSaveAllMenuAction">
+ <bean id="FileSaveAllMenuAction" class="org.apache.taverna.workbench.file.impl.menu.FileSaveAllMenuAction">
<constructor-arg ref="editManager" />
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="FileSaveAsMenuAction" class="net.sf.taverna.t2.workbench.file.impl.menu.FileSaveAsMenuAction">
+ <bean id="FileSaveAsMenuAction" class="org.apache.taverna.workbench.file.impl.menu.FileSaveAsMenuAction">
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="WorkflowsMenu" class="net.sf.taverna.t2.workbench.file.impl.menu.WorkflowsMenu">
+ <bean id="WorkflowsMenu" class="org.apache.taverna.workbench.file.impl.menu.WorkflowsMenu">
<constructor-arg ref="editManager" />
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="FileCloseAllMenuAction" class="net.sf.taverna.t2.workbench.file.impl.menu.FileCloseAllMenuAction">
+ <bean id="FileCloseAllMenuAction" class="org.apache.taverna.workbench.file.impl.menu.FileCloseAllMenuAction">
<constructor-arg ref="editManager" />
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="FileToolbarMenuSection" class="net.sf.taverna.t2.workbench.file.impl.toolbar.FileToolbarMenuSection" />
- <bean id="NewToolbarAction" class="net.sf.taverna.t2.workbench.file.impl.toolbar.NewToolbarAction">
+ <bean id="FileToolbarMenuSection" class="org.apache.taverna.workbench.file.impl.toolbar.FileToolbarMenuSection" />
+ <bean id="NewToolbarAction" class="org.apache.taverna.workbench.file.impl.toolbar.NewToolbarAction">
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="OpenToolbarAction" class="net.sf.taverna.t2.workbench.file.impl.toolbar.OpenToolbarAction">
+ <bean id="OpenToolbarAction" class="org.apache.taverna.workbench.file.impl.toolbar.OpenToolbarAction">
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="OpenWorkflowFromURLToolbarAction" class="net.sf.taverna.t2.workbench.file.impl.toolbar.OpenWorkflowFromURLToolbarAction">
+ <bean id="OpenWorkflowFromURLToolbarAction" class="org.apache.taverna.workbench.file.impl.toolbar.OpenWorkflowFromURLToolbarAction">
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="SaveToolbarAction" class="net.sf.taverna.t2.workbench.file.impl.toolbar.SaveToolbarAction">
+ <bean id="SaveToolbarAction" class="org.apache.taverna.workbench.file.impl.toolbar.SaveToolbarAction">
<constructor-arg ref="editManager" />
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="CloseToolbarAction" class="net.sf.taverna.t2.workbench.file.impl.toolbar.CloseToolbarAction">
+ <bean id="CloseToolbarAction" class="org.apache.taverna.workbench.file.impl.toolbar.CloseToolbarAction">
<constructor-arg ref="editManager" />
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="T2DataflowOpener" class="net.sf.taverna.t2.workbench.file.impl.T2DataflowOpener">
+ <bean id="T2DataflowOpener" class="org.apache.taverna.workbench.file.impl.T2DataflowOpener">
<property name="workflowBundleIO" ref="workflowBundleIO"/>
</bean>
- <bean id="WorkflowBundleOpener" class="net.sf.taverna.t2.workbench.file.impl.WorkflowBundleOpener">
+ <bean id="WorkflowBundleOpener" class="org.apache.taverna.workbench.file.impl.WorkflowBundleOpener">
<property name="workflowBundleIO" ref="workflowBundleIO"/>
</bean>
- <bean id="WorkflowBundleSaver" class="net.sf.taverna.t2.workbench.file.impl.WorkflowBundleSaver">
+ <bean id="WorkflowBundleSaver" class="org.apache.taverna.workbench.file.impl.WorkflowBundleSaver">
<property name="workflowBundleIO" ref="workflowBundleIO"/>
</bean>
- <bean id="CloseWorkflowsOnShutdown" class="net.sf.taverna.t2.workbench.file.impl.hooks.CloseWorkflowsOnShutdown">
+ <bean id="CloseWorkflowsOnShutdown" class="org.apache.taverna.workbench.file.impl.hooks.CloseWorkflowsOnShutdown">
<constructor-arg ref="editManager" />
<constructor-arg>
<ref local="FileManagerImpl" />
</constructor-arg>
</bean>
- <bean id="FileManagerImpl" class="net.sf.taverna.t2.workbench.file.impl.FileManagerImpl">
+ <bean id="FileManagerImpl" class="org.apache.taverna.workbench.file.impl.FileManagerImpl">
<constructor-arg name="editManager" ref="editManager" />
<property name="dataflowPersistenceHandlerRegistry">
<ref local="DataflowPersistenceHandlerRegistry"/>
</property>
</bean>
- <bean id="DataflowPersistenceHandlerRegistry" class="net.sf.taverna.t2.workbench.file.impl.DataflowPersistenceHandlerRegistry">
+ <bean id="DataflowPersistenceHandlerRegistry" class="org.apache.taverna.workbench.file.impl.DataflowPersistenceHandlerRegistry">
<property name="dataflowPersistenceHandlers" ref="dataflowPersistenceHandlers" />
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-file-impl/src/test/java/net/sf/taverna/t2/workbench/file/impl/FileManagerTest.java
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/test/java/net/sf/taverna/t2/workbench/file/impl/FileManagerTest.java b/taverna-file-impl/src/test/java/net/sf/taverna/t2/workbench/file/impl/FileManagerTest.java
index 4683399..d31825a 100644
--- a/taverna-file-impl/src/test/java/net/sf/taverna/t2/workbench/file/impl/FileManagerTest.java
+++ b/taverna-file-impl/src/test/java/net/sf/taverna/t2/workbench/file/impl/FileManagerTest.java
@@ -35,18 +35,18 @@ import java.util.List;
import org.apache.taverna.lang.observer.Observable;
import org.apache.taverna.lang.observer.Observer;
-import net.sf.taverna.t2.workbench.edits.Edit;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.edits.impl.EditManagerImpl;
-import net.sf.taverna.t2.workbench.file.DataflowInfo;
-import net.sf.taverna.t2.workbench.file.DataflowPersistenceHandler;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.events.FileManagerEvent;
-import net.sf.taverna.t2.workbench.file.events.SetCurrentDataflowEvent;
-import net.sf.taverna.t2.workbench.file.exceptions.OpenException;
-import net.sf.taverna.t2.workbench.file.exceptions.OverwriteException;
-import net.sf.taverna.t2.workflow.edits.AddProcessorEdit;
-import net.sf.taverna.t2.workflow.edits.RenameEdit;
+import org.apache.taverna.workbench.edits.Edit;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.edits.impl.EditManagerImpl;
+import org.apache.taverna.workbench.file.DataflowInfo;
+import org.apache.taverna.workbench.file.DataflowPersistenceHandler;
+import org.apache.taverna.workbench.file.FileManager;
+import org.apache.taverna.workbench.file.events.FileManagerEvent;
+import org.apache.taverna.workbench.file.events.SetCurrentDataflowEvent;
+import org.apache.taverna.workbench.file.exceptions.OpenException;
+import org.apache.taverna.workbench.file.exceptions.OverwriteException;
+import org.apache.taverna.workflow.edits.AddProcessorEdit;
+import org.apache.taverna.workflow.edits.RenameEdit;
import org.junit.After;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/DefaultGraphEventManager.java
----------------------------------------------------------------------
diff --git a/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/DefaultGraphEventManager.java b/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/DefaultGraphEventManager.java
deleted file mode 100644
index 8dc4731..0000000
--- a/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/DefaultGraphEventManager.java
+++ /dev/null
@@ -1,271 +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.workbench.models.graph;
-
-import static javax.swing.SwingUtilities.convertPointFromScreen;
-import static javax.swing.SwingUtilities.invokeLater;
-import static net.sf.taverna.t2.workbench.models.graph.GraphController.PortStyle.ALL;
-import static net.sf.taverna.t2.workbench.models.graph.GraphController.PortStyle.NONE;
-
-import java.awt.Component;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.net.URI;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import org.apache.taverna.scufl2.api.activity.Activity;
-import org.apache.taverna.scufl2.api.common.Scufl2Tools;
-import org.apache.taverna.scufl2.api.core.Processor;
-import org.apache.taverna.scufl2.api.profiles.ProcessorBinding;
-
-/**
- * Manager for handling UI events on GraphElements.
- *
- * @author David Withers
- */
-public class DefaultGraphEventManager implements GraphEventManager {
- private static final URI NESTED_WORKFLOW_URI = URI
- .create("http://ns.taverna.org.uk/2010/activity/nested-workflow");
-
- private GraphController graphController;
- private Component component;
- private JPopupMenu menu;
- private MenuManager menuManager;
-
- private Scufl2Tools scufl2Tools = new Scufl2Tools();
-
- /**
- * Constructs a new instance of GraphEventManager.
- *
- * @param graphController
- * @param component
- * component to use when displaying popup menus
- */
- public DefaultGraphEventManager(GraphController graphController, Component component,
- MenuManager menuManager) {
- this.graphController = graphController;
- this.component = component;
- this.menuManager = menuManager;
- }
-
- @Override
- public void mouseClicked(final GraphElement graphElement, short button, boolean altKey,
- boolean ctrlKey, boolean metaKey, final int x, final int y, int screenX, int screenY) {
- Object dataflowObject = graphElement.getWorkflowBean();
-
- // For both left and right click - add to selection model
- if (graphController.getDataflowSelectionModel() != null)
- graphController.getDataflowSelectionModel().addSelection(dataflowObject);
-
- if ((button != 2) && !ctrlKey)return;
-
- // If this was a right click - show a pop-up as well
- if (dataflowObject == null)
- menu = menuManager.createContextMenu(graphController.getWorkflow(),
- graphController.getWorkflow(), component);
- else {
- menu = menuManager.createContextMenu(graphController.getWorkflow(),
- dataflowObject, component);
- if (dataflowObject instanceof Processor) {
- final Processor processor = (Processor) dataflowObject;
- ProcessorBinding processorBinding = scufl2Tools
- .processorBindingForProcessor(processor,
- graphController.getProfile());
- final Activity activity = processorBinding.getBoundActivity();
- if (menu == null)
- menu = new JPopupMenu();
- if (graphElement instanceof GraphNode) {
- defineMenuForGraphElement(graphElement, x, y, processor,
- activity);
- } else if (graphElement instanceof Graph) {
- defineMenuForGraphBackground(activity);
- }
- }
- }
-
- if (menu != null) {
- final Point p = new Point(screenX, screenY);
- convertPointFromScreen(p, component);
- invokeLater(new Runnable() {
- @Override
- public void run() {
- menu.show(component, p.x, p.y);
- }
- });
- }
- }
-
- @SuppressWarnings("serial")
- private void defineMenuForGraphBackground(final Activity activity) {
- if (activity.getType().equals(NESTED_WORKFLOW_URI)) {
- menu.addSeparator();
- menu.add(new JMenuItem(new AbstractAction("Hide nested workflow") {
- @Override
- public void actionPerformed(ActionEvent ev) {
- graphController.setExpandNestedDataflow(activity, false);
- graphController.redraw();
- }
- }));
- }
- }
-
- @SuppressWarnings("serial")
- private void defineMenuForGraphElement(final GraphElement graphElement,
- final int x, final int y, final Processor processor,
- final Activity activity) {
- if (graphController.getPortStyle(processor).equals(NONE)) {
- menu.addSeparator();
- menu.add(new JMenuItem(new AbstractAction("Show ports") {
- @Override
- public void actionPerformed(ActionEvent ev) {
- graphController.setPortStyle(processor, ALL);
- graphController.redraw();
- }
- }));
- } else if (graphController.getPortStyle(processor).equals(ALL)) {
- menu.addSeparator();
- menu.add(new JMenuItem(new AbstractAction("Hide ports") {
- @Override
- public void actionPerformed(ActionEvent arg0) {
- graphController.setPortStyle(processor, NONE);
- graphController.redraw();
- }
- }));
- }
-
- if (activity.getType().equals(NESTED_WORKFLOW_URI)) {
- menu.addSeparator();
- menu.add(new JMenuItem(new AbstractAction("Show nested workflow") {
- @Override
- public void actionPerformed(ActionEvent arg0) {
- graphController.setExpandNestedDataflow(activity, true);
- graphController.redraw();
- }
- }));
- }
-
- menu.addSeparator();
-
- GraphNode graphNode = (GraphNode) graphElement;
-
- List<GraphNode> sourceNodes = graphNode.getSourceNodes();
- if (sourceNodes.size() == 1) {
- final GraphNode sourceNode = sourceNodes.get(0);
- if (sourceNode.getLabel() != null) {
- menu.add(new JMenuItem(new AbstractAction("Link from output '"
- + sourceNode.getLabel() + "'") {
- @Override
- public void actionPerformed(ActionEvent arg0) {
- graphController.startEdgeCreation(sourceNode,
- new Point(x, y));
- }
- }));
- }
- } else if (sourceNodes.size() > 0) {
- JMenu linkMenu = new JMenu("Link from output...");
- menu.add(linkMenu);
- for (final GraphNode sourceNode : sourceNodes) {
- linkMenu.add(new JMenuItem(new AbstractAction(sourceNode
- .getLabel()) {
- @Override
- public void actionPerformed(ActionEvent arg0) {
- graphController.startEdgeCreation(sourceNode,
- new Point(x, y));
- }
- }));
- }
- }
-
- List<GraphNode> sinkNodes = graphNode.getSinkNodes();
- if (sinkNodes.size() == 1) {
- final GraphNode sinkNode = sinkNodes.get(0);
- if (sinkNode.getLabel() != null) {
- menu.add(new JMenuItem(new AbstractAction("Link to input '"
- + sinkNode.getLabel() + "'") {
- @Override
- public void actionPerformed(ActionEvent arg0) {
- graphController.startEdgeCreation(sinkNode, new Point(
- x, y));
- }
- }));
- }
- } else if (sinkNodes.size() > 0) {
- JMenu linkMenu = new JMenu("Link to input...");
- menu.add(linkMenu);
- for (final GraphNode sinkNode : sinkNodes) {
- linkMenu.add(new JMenuItem(new AbstractAction(sinkNode
- .getLabel()) {
- @Override
- public void actionPerformed(ActionEvent arg0) {
- graphController.startEdgeCreation(sinkNode, new Point(
- x, y));
- }
- }));
- }
- }
- }
-
- @Override
- public void mouseDown(GraphElement graphElement, short button,
- boolean altKey, boolean ctrlKey, boolean metaKey, int x, int y,
- int screenX, int screenY) {
- if (button == 0)
- graphController.startEdgeCreation(graphElement, new Point(x, y));
- }
-
- @Override
- public void mouseUp(GraphElement graphElement, short button,
- boolean altKey, boolean ctrlKey, boolean metaKey, final int x,
- final int y, int screenX, int screenY) {
- if (button == 0)
- graphController.stopEdgeCreation(graphElement, new Point(screenX,
- screenY));
- }
-
- @Override
- public void mouseMoved(GraphElement graphElement, short button,
- boolean altKey, boolean ctrlKey, boolean metaKey, int x, int y,
- int screenX, int screenY) {
- graphController.moveEdgeCreationTarget(graphElement, new Point(x, y));
- }
-
- @Override
- public void mouseOver(GraphElement graphElement, short button,
- boolean altKey, boolean ctrlKey, boolean metaKey, int x, int y,
- int screenX, int screenY) {
- if (graphElement.getWorkflowBean() != null)
- graphElement.setActive(true);
- }
-
- @Override
- public void mouseOut(GraphElement graphElement, short button,
- boolean altKey, boolean ctrlKey, boolean metaKey, int x, int y,
- int screenX, int screenY) {
- if (graphElement.getWorkflowBean() != null)
- graphElement.setActive(false);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/DotWriter.java
----------------------------------------------------------------------
diff --git a/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/DotWriter.java b/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/DotWriter.java
deleted file mode 100644
index 07cdbad..0000000
--- a/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/DotWriter.java
+++ /dev/null
@@ -1,253 +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.workbench.models.graph;
-
-import static java.lang.String.format;
-import static net.sf.taverna.t2.workbench.models.graph.Graph.Alignment.HORIZONTAL;
-import static net.sf.taverna.t2.workbench.models.graph.Graph.Alignment.VERTICAL;
-import static net.sf.taverna.t2.workbench.models.graph.GraphElement.LineStyle.NONE;
-import static net.sf.taverna.t2.workbench.models.graph.GraphShapeElement.Shape.RECORD;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.List;
-
-import net.sf.taverna.t2.workbench.models.graph.Graph.Alignment;
-
-/**
- * Writer for creating a graphical representation of a Graph in the DOT language.
- *
- * @author David Withers
- */
-public class DotWriter {
- private static final String EOL = System.getProperty("line.separator");
-
- private Writer writer;
-
- /**
- * Constructs a new instance of DotWriter.
- *
- * @param writer
- */
- public DotWriter(Writer writer) {
- this.writer = writer;
- }
-
- /**
- * Writes a graphical representation of a Graph in the DOT language to a Writer.
- *
- * @param graph
- * @throws IOException
- */
- public void writeGraph(Graph graph) throws IOException {
- writeLine("digraph \"" + graph.getId() + "\" {");
-
- // Overall graph style
- writeLine(" graph [");
- writeLine(" bgcolor=\"" + getHexValue(graph.getFillColor()) + "\"");
- writeLine(" color=\"black\"");
- writeLine(" fontsize=\"10\"");
- writeLine(" labeljust=\"left\"");
- writeLine(" clusterrank=\"local\"");
- writeLine(" ranksep=\"0.22\"");
- writeLine(" nodesep=\"0.05\"");
- // Set left to right view if alignment is horizontal
- if (graph.getAlignment().equals(HORIZONTAL))
- writeLine(" rankdir=\"LR\"");
- writeLine(" ]");
-
- // Overall node style
- writeLine(" node [");
- writeLine(" fontname=\"Helvetica\"");
- writeLine(" fontsize=\"10\"");
- writeLine(" fontcolor=\"black\"");
- writeLine(" shape=\"record\"");
- writeLine(" height=\"0\"");
- writeLine(" width=\"0\"");
- writeLine(" color=\"black\"");
- writeLine(" fillcolor=\"lightgoldenrodyellow\"");
- writeLine(" style=\"filled\"");
- writeLine(" ];");
-
- // Overall edge style
- writeLine(" edge [");
- writeLine(" fontname=\"Helvetica\"");
- writeLine(" fontsize=\"8\"");
- writeLine(" fontcolor=\"black\"");
- writeLine(" color=\"black\"");
- writeLine(" ];");
-
- for (GraphNode node : graph.getNodes()) {
- if (node.isExpanded())
- writeSubGraph(node.getGraph(), " ");
- else
- writeNode(node, graph.getAlignment(), " ");
- }
-
- for (Graph subGraph : graph.getSubgraphs())
- writeSubGraph(subGraph, " ");
-
- for (GraphEdge edge : graph.getEdges())
- writeEdges(edge, graph.getAlignment(), " ");
-
- writeLine("}");
- }
-
- private void writeSubGraph(Graph graph, String indent) throws IOException {
- writeLine(format("%ssubgraph \"cluster_%s\" {", indent, graph.getId()));
- writeLine(format("%s rank=\"same\"", indent));
-
- StringBuilder style = new StringBuilder();
- if (graph.getFillColor() != null) {
- writeLine(format("%s fillcolor=\"%s\"", indent,
- getHexValue(graph.getFillColor())));
- style.append("filled");
- }
- if (graph.getLineStyle() != null) {
- style.append(style.length() == 0 ? "" : ",");
- if (graph.getLineStyle().equals(NONE))
- style.append("invis");
- else
- style.append(graph.getLineStyle().toString().toLowerCase());
- }
- writeLine(format("%s style=\"%s\"", indent, style));
-
- if (graph.getLabel() != null)
- writeLine(format("%s label=\"%s\"", indent, graph.getLabel()));
-
- for(GraphNode node : graph.getNodes()) {
- if (node.isExpanded())
- writeSubGraph(node.getGraph(), indent + " ");
- else
- writeNode(node, graph.getAlignment(), indent + " ");
- }
-
- for (Graph subGraph : graph.getSubgraphs())
- writeSubGraph(subGraph, indent + " ");
-
- for (GraphEdge edge : graph.getEdges())
- writeEdges(edge, graph.getAlignment(), indent + " ");
-
- writeLine(indent + "}");
- }
-
- private void writeEdges(GraphEdge edge, Alignment alignment, String indent) throws IOException {
- GraphNode source = edge.getSource();
- GraphNode sink = edge.getSink();
- String sourceId = "\"" + source.getId() + "\"";
- String sinkId = "\"" + sink.getId() + "\"";
-
- if (source.getParent() instanceof GraphNode) {
- GraphNode parent = (GraphNode) source.getParent();
- sourceId = "\"" + parent.getId() + "\":" + sourceId;
- }
- if (sink.getParent() instanceof GraphNode) {
- GraphNode parent = (GraphNode) sink.getParent();
- sinkId = "\"" + parent.getId() + "\":" + sinkId;
- }
- /*
- * the compass point is required with newer versions of dot (e.g.
- * 2.26.3) but is not compatible with older versions (e.g. 1.3)
- */
- if (alignment.equals(HORIZONTAL)) {
- sourceId = sourceId + ":e";
- sinkId = sinkId + ":w";
- } else {
- sourceId = sourceId + ":s";
- sinkId = sinkId + ":n";
- }
- writeLine(format("%s%s -> %s [", indent, sourceId, sinkId));
- writeLine(format("%s arrowhead=\"%s\"", indent, edge
- .getArrowHeadStyle().toString().toLowerCase()));
- writeLine(format("%s, arrowtail=\"%s\"", indent, edge
- .getArrowTailStyle().toString().toLowerCase()));
- if (edge.getColor() != null)
- writeLine(format("%s color=\"%s\"", indent,
- getHexValue(edge.getColor())));
- writeLine(format("%s]", indent));
- }
-
- private void writeNode(GraphNode node, Alignment alignment, String indent) throws IOException {
- writeLine(format("%s\"%s\" [", indent, node.getId()));
-
- StringBuilder style = new StringBuilder();
- if (node.getFillColor() != null) {
- writeLine(format("%s fillcolor=\"%s\"", indent,
- getHexValue(node.getFillColor())));
- style.append("filled");
- }
- if (node.getLineStyle() != null) {
- style.append(style.length() == 0 ? "" : ",");
- style.append(node.getLineStyle().toString().toLowerCase());
- }
- writeLine(format("%s style=\"%s\"", indent, style));
-
- writeLine(format("%s shape=\"%s\"", indent, node.getShape().toString().toLowerCase()));
- writeLine(format("%s width=\"%s\"", indent, node.getWidth() / 72f));
- writeLine(format("%s height=\"%s\"", indent, node.getHeight() / 72f));
-
- if (node.getShape().equals(RECORD)) {
- StringBuilder labelString = new StringBuilder();
- if (alignment.equals(VERTICAL)) {
- labelString.append("{{");
- addNodeLabels(node.getSinkNodes(), labelString);
- labelString.append("}|").append(node.getLabel()).append("|{");
- addNodeLabels(node.getSourceNodes(), labelString);
- labelString.append("}}");
- } else {
- labelString.append(node.getLabel()).append("|{{");
- addNodeLabels(node.getSinkNodes(), labelString);
- labelString.append("}|{");
- addNodeLabels(node.getSourceNodes(), labelString);
- labelString.append("}}");
- }
- writeLine(format("%s label=\"%s\"", indent, labelString));
- } else {
- writeLine(format("%s label=\"%s\"", indent, node.getLabel()));
- }
-
- writeLine(format("%s];", indent));
- }
-
- private void addNodeLabels(List<GraphNode> nodes, StringBuilder labelString) {
- String sep = "";
- for (GraphNode node : nodes)
- if (node.getLabel() != null) {
- labelString.append(sep);
- labelString.append("<");
- labelString.append(node.getId());
- labelString.append(">");
- labelString.append(node.getLabel());
- sep = "|";
- }
- }
-
- private String getHexValue(Color color) {
- return format("#%02x%02x%02x", color.getRed(), color.getGreen(),
- color.getBlue());
- }
-
- private void writeLine(String line) throws IOException {
- writer.write(line);
- writer.write(EOL);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/Graph.java
----------------------------------------------------------------------
diff --git a/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/Graph.java b/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/Graph.java
deleted file mode 100644
index 0ff3852..0000000
--- a/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/Graph.java
+++ /dev/null
@@ -1,165 +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.workbench.models.graph;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * A graph model of a dataflow.
- *
- * @author David Withers
- */
-public class Graph extends GraphShapeElement {
- public enum Alignment {
- HORIZONTAL, VERTICAL
- }
-
- private List<GraphNode> nodes = new ArrayList<>();
- private Set<GraphEdge> edges = new HashSet<>();
- private Set<Graph> subgraphs = new HashSet<>();
- private Alignment alignment = Alignment.VERTICAL;
-
- /**
- * Constructs a Graph that uses the specified GraphEventManager to handle
- * any user generated events on GraphElements.
- *
- * @param eventManager
- */
- public Graph(GraphController graphController) {
- super(graphController);
- }
-
- /**
- * Adds an edge to the Graph and sets its parent to be this Graph.
- *
- * @param edge
- * the edge to add
- */
- public void addEdge(GraphEdge edge) {
- edge.setParent(this);
- edges.add(edge);
- }
-
- /**
- * Adds a node to the Graph and sets its parent to be this Graph.
- *
- * @param node
- * the node to add
- */
- public void addNode(GraphNode node) {
- node.setParent(this);
- nodes.add(node);
- }
-
- /**
- * Adds a subgraph to the Graph and sets its parent to be this Graph.
- *
- * @param subgraph
- * the subgraph to add
- */
- public void addSubgraph(Graph subgraph) {
- subgraph.setParent(this);
- subgraphs.add(subgraph);
- }
-
- /**
- * Returns the alignment of the Graph.
- *
- * @return the alignment of the Graph
- */
- public Alignment getAlignment() {
- return alignment;
- }
-
- /**
- * Returns the edges contained in the Graph.
- *
- * @return the edges contained in the Graph
- */
- public Set<GraphEdge> getEdges() {
- return Collections.unmodifiableSet(edges);
- }
-
- /**
- * Returns the nodes contained in the Graph.
- *
- * @return the nodes contained in the Graph
- */
- public List<GraphNode> getNodes() {
- return Collections.unmodifiableList(nodes);
- }
-
- /**
- * Returns the subgraphs contained in the Graph.
- *
- * @return the subgraphs contained in the Graph
- */
- public Set<Graph> getSubgraphs() {
- return Collections.unmodifiableSet(subgraphs);
- }
-
- /**
- * Removes an edge from the Graph.
- *
- * @param edge
- * the edge to remove
- * @return true if the edge is removed from the Graph
- */
- public boolean removeEdge(GraphEdge edge) {
- return edges.remove(edge);
- }
-
- /**
- * Removes a node from the Graph.
- *
- * @param node
- * the node to remove
- * @return true if the node is removed from the Graph
- */
- public boolean removeNode(GraphNode node) {
- return nodes.remove(node);
- }
-
- /**
- * Removes a subgraph from the Graph.
- *
- * @param subgraph
- * the subgraph to remove
- * @return true if the subgraph is removed from the Graph
- */
- public boolean removeSubgraph(Graph subgraph) {
- return subgraphs.remove(subgraph);
- }
-
- /**
- * Sets the alignment of the Graph.
- *
- * @param alignment
- * the new alignment
- */
- public void setAlignment(Alignment alignment) {
- this.alignment = alignment;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/GraphColorManager.java
----------------------------------------------------------------------
diff --git a/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/GraphColorManager.java b/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/GraphColorManager.java
deleted file mode 100644
index 603b553..0000000
--- a/taverna-graph-model/src/main/java/net/sf/taverna/t2/workbench/models/graph/GraphColorManager.java
+++ /dev/null
@@ -1,75 +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.workbench.models.graph;
-
-import java.awt.Color;
-import java.lang.reflect.InvocationTargetException;
-
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-
-import org.apache.commons.beanutils.PropertyUtils;
-
-import org.apache.taverna.scufl2.api.activity.Activity;
-
-/**
- * Manages the colour of elements in a graph.
- *
- * @author David Withers
- * @author Start Owen
- */
-public class GraphColorManager {
- private static final String BEANSHELL = "http://ns.taverna.org.uk/2010/activity/beanshell";
- private static final String LOCALWORKER = "http://ns.taverna.org.uk/2010/activity/localworker";
-
- private static Color[] subGraphFillColors = new Color[] {
- Color.decode("#ffffff"), Color.decode("#f0f8ff"),
- Color.decode("#faebd7"), Color.decode("#f5f5dc") };
-
- /**
- * Returns the colour associated with the Activity.
- *
- * For unknown activities Color.WHITE is returned.
- *
- * For {@link LocalworkerActivity} which have been user configured use the
- * BeanshellActivity colour
- *
- * @return the colour associated with the Activity
- */
- public static Color getFillColor(Activity activity, ColourManager colourManager) {
- try {
- if (activity.getType().equals(LOCALWORKER)) {
- // To avoid compile time dependency - read isAltered property as bean
- if (Boolean.TRUE.equals(PropertyUtils.getProperty(activity, "altered"))) {
- Color colour = colourManager.getPreferredColour(BEANSHELL);
- return colour;
- }
- }
- } catch (IllegalAccessException | InvocationTargetException
- | NoSuchMethodException e) {
- }
- Color colour = colourManager.getPreferredColour(activity.getType().toASCIIString());
- return colour;
- }
-
- public static Color getSubGraphFillColor(int depth) {
- return subGraphFillColors[depth % subGraphFillColors.length];
- }
-}