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:19 UTC
[30/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-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/toolbar/CredentialManagerToolbarSection.java
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/toolbar/CredentialManagerToolbarSection.java b/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/toolbar/CredentialManagerToolbarSection.java
new file mode 100644
index 0000000..4ed2c67
--- /dev/null
+++ b/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/toolbar/CredentialManagerToolbarSection.java
@@ -0,0 +1,37 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+package org.apache.taverna.workbench.ui.credentialmanager.toolbar;
+
+import static org.apache.taverna.ui.menu.DefaultToolBar.DEFAULT_TOOL_BAR;
+
+import java.net.URI;
+
+import org.apache.taverna.ui.menu.AbstractMenuSection;
+
+public class CredentialManagerToolbarSection extends AbstractMenuSection {
+ private static final String ENTRY_URI = "http://taverna.sf.net/2008/t2workbench/toolbar#credentialManagerSection";
+ /** {@value #ENTRY_URI} */
+ public static URI CREDENTIAL_MANAGER_TOOLBAR_SECTION = URI
+ .create(ENTRY_URI);
+
+ public CredentialManagerToolbarSection() {
+ super(DEFAULT_TOOL_BAR, 300, CREDENTIAL_MANAGER_TOOLBAR_SECTION);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.security.credentialmanager.CredentialProviderSPI
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.security.credentialmanager.CredentialProviderSPI b/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.security.credentialmanager.CredentialProviderSPI
deleted file mode 100644
index 725aa11..0000000
--- a/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.security.credentialmanager.CredentialProviderSPI
+++ /dev/null
@@ -1,3 +0,0 @@
-net.sf.taverna.t2.workbench.ui.credentialmanager.password.UIUsernamePasswordProvider
-net.sf.taverna.t2.workbench.ui.credentialmanager.password.UIMasterPasswordProvider
-net.sf.taverna.t2.workbench.ui.credentialmanager.ConfirmTrustedCertificateUI
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent b/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent
deleted file mode 100644
index 3743c2f..0000000
--- a/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent
+++ /dev/null
@@ -1,3 +0,0 @@
-net.sf.taverna.t2.workbench.ui.credentialmanager.menu.CredentialManagerMenu
-#net.sf.taverna.t2.workbench.ui.credentialmanager.toolbar.CredentialManagerToolbarAction
-#net.sf.taverna.t2.workbench.ui.credentialmanager.toolbar.CredentialManagerToolbarSection
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.StartupSPI
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.StartupSPI b/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.StartupSPI
deleted file mode 100644
index b43772c..0000000
--- a/taverna-credential-manager-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.StartupSPI
+++ /dev/null
@@ -1,2 +0,0 @@
-net.sf.taverna.t2.workbench.ui.credentialmanager.startup.InitialiseSSLStartupHook
-net.sf.taverna.t2.workbench.ui.credentialmanager.startup.SetCredManAuthenticatorStartupHook
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.security.credentialmanager.CredentialProviderSPI
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.security.credentialmanager.CredentialProviderSPI b/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.security.credentialmanager.CredentialProviderSPI
new file mode 100644
index 0000000..22eb8b3
--- /dev/null
+++ b/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.security.credentialmanager.CredentialProviderSPI
@@ -0,0 +1,3 @@
+org.apache.taverna.workbench.ui.credentialmanager.password.UIUsernamePasswordProvider
+org.apache.taverna.workbench.ui.credentialmanager.password.UIMasterPasswordProvider
+org.apache.taverna.workbench.ui.credentialmanager.ConfirmTrustedCertificateUI
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent b/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent
new file mode 100644
index 0000000..fb49d25
--- /dev/null
+++ b/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.ui.menu.MenuComponent
@@ -0,0 +1,3 @@
+org.apache.taverna.workbench.ui.credentialmanager.menu.CredentialManagerMenu
+#net.sf.taverna.t2.workbench.ui.credentialmanager.toolbar.CredentialManagerToolbarAction
+#net.sf.taverna.t2.workbench.ui.credentialmanager.toolbar.CredentialManagerToolbarSection
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.workbench.StartupSPI
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.workbench.StartupSPI b/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.workbench.StartupSPI
new file mode 100644
index 0000000..7bf38ac
--- /dev/null
+++ b/taverna-credential-manager-ui/src/main/resources/META-INF/services/org.apache.taverna.workbench.StartupSPI
@@ -0,0 +1,2 @@
+org.apache.taverna.workbench.ui.credentialmanager.startup.InitialiseSSLStartupHook
+org.apache.taverna.workbench.ui.credentialmanager.startup.SetCredManAuthenticatorStartupHook
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-credential-manager-ui/src/main/resources/META-INF/spring/credential-manager-ui-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/resources/META-INF/spring/credential-manager-ui-context-osgi.xml b/taverna-credential-manager-ui/src/main/resources/META-INF/spring/credential-manager-ui-context-osgi.xml
index f595eda..c4628a7 100644
--- a/taverna-credential-manager-ui/src/main/resources/META-INF/spring/credential-manager-ui-context-osgi.xml
+++ b/taverna-credential-manager-ui/src/main/resources/META-INF/spring/credential-manager-ui-context-osgi.xml
@@ -6,15 +6,15 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="askUserMasterPasswordProvider" interface="net.sf.taverna.t2.security.credentialmanager.MasterPasswordProvider" />
+ <service ref="askUserMasterPasswordProvider" interface="org.apache.taverna.security.credentialmanager.MasterPasswordProvider" />
- <service ref="simpleMasterPasswordProvider" interface="net.sf.taverna.t2.security.credentialmanager.MasterPasswordProvider" />
+ <service ref="simpleMasterPasswordProvider" interface="org.apache.taverna.security.credentialmanager.MasterPasswordProvider" />
- <service ref="askUserJavaTruststorePasswordProvider" interface="net.sf.taverna.t2.security.credentialmanager.JavaTruststorePasswordProvider" />
+ <service ref="askUserJavaTruststorePasswordProvider" interface="org.apache.taverna.security.credentialmanager.JavaTruststorePasswordProvider" />
- <service ref="askUserServiceUsernameAndPasswordProvider" interface="net.sf.taverna.t2.security.credentialmanager.ServiceUsernameAndPasswordProvider" />
+ <service ref="askUserServiceUsernameAndPasswordProvider" interface="org.apache.taverna.security.credentialmanager.ServiceUsernameAndPasswordProvider" />
- <service ref="askUserTrustConfirmationProvider" interface="net.sf.taverna.t2.security.credentialmanager.TrustConfirmationProvider" />
+ <service ref="askUserTrustConfirmationProvider" interface="org.apache.taverna.security.credentialmanager.TrustConfirmationProvider" />
<service ref="UIUsernamePasswordProvider" auto-export="interfaces" />
@@ -22,15 +22,15 @@
<service ref="ConfirmTrustedCertificateUI" auto-export="interfaces" />
- <service ref="InitialiseSSLStartupHook" interface="net.sf.taverna.t2.workbench.StartupSPI" />
+ <service ref="InitialiseSSLStartupHook" interface="org.apache.taverna.workbench.StartupSPI" />
- <service ref="SetCredManAuthenticatorStartupHook" interface="net.sf.taverna.t2.workbench.StartupSPI" />
+ <service ref="SetCredManAuthenticatorStartupHook" interface="org.apache.taverna.workbench.StartupSPI" />
<service ref="CredentialManagerMenu" auto-export="interfaces" />
- <reference id="CredentialManager" interface="net.sf.taverna.t2.security.credentialmanager.CredentialManager" />
+ <reference id="CredentialManager" interface="org.apache.taverna.security.credentialmanager.CredentialManager" />
- <reference id="distinguishedNameParser" interface="net.sf.taverna.t2.security.credentialmanager.DistinguishedNameParser" />
+ <reference id="distinguishedNameParser" interface="org.apache.taverna.security.credentialmanager.DistinguishedNameParser" />
<reference id="ApplicationConfiguration" interface="uk.org.taverna.configuration.app.ApplicationConfiguration" />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-credential-manager-ui/src/main/resources/META-INF/spring/credential-manager-ui-context.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/resources/META-INF/spring/credential-manager-ui-context.xml b/taverna-credential-manager-ui/src/main/resources/META-INF/spring/credential-manager-ui-context.xml
index 0e54c93..1689dcd 100644
--- a/taverna-credential-manager-ui/src/main/resources/META-INF/spring/credential-manager-ui-context.xml
+++ b/taverna-credential-manager-ui/src/main/resources/META-INF/spring/credential-manager-ui-context.xml
@@ -3,40 +3,40 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="askUserMasterPasswordProvider" class="net.sf.taverna.t2.workbench.ui.credentialmanager.password.AskUserMasterPasswordProvider" />
+ <bean id="askUserMasterPasswordProvider" class="org.apache.taverna.workbench.ui.credentialmanager.password.AskUserMasterPasswordProvider" />
- <bean id="simpleMasterPasswordProvider" class="net.sf.taverna.t2.workbench.ui.credentialmanager.password.SimpleMasterPasswordProvider" />
+ <bean id="simpleMasterPasswordProvider" class="org.apache.taverna.workbench.ui.credentialmanager.password.SimpleMasterPasswordProvider" />
- <bean id="askUserJavaTruststorePasswordProvider" class="net.sf.taverna.t2.workbench.ui.credentialmanager.password.AskUserJavaTruststorePasswordProvider" />
+ <bean id="askUserJavaTruststorePasswordProvider" class="org.apache.taverna.workbench.ui.credentialmanager.password.AskUserJavaTruststorePasswordProvider" />
- <bean id="askUserServiceUsernameAndPasswordProvider" class="net.sf.taverna.t2.workbench.ui.credentialmanager.password.AskUserServiceUsernameAndPasswordProvider" />
+ <bean id="askUserServiceUsernameAndPasswordProvider" class="org.apache.taverna.workbench.ui.credentialmanager.password.AskUserServiceUsernameAndPasswordProvider" />
- <bean id="askUserTrustConfirmationProvider" class="net.sf.taverna.t2.workbench.ui.credentialmanager.password.AskUserTrustConfirmationProvider" />
+ <bean id="askUserTrustConfirmationProvider" class="org.apache.taverna.workbench.ui.credentialmanager.password.AskUserTrustConfirmationProvider" />
- <bean id="MasterPasswordProviderComparator" class="net.sf.taverna.t2.security.credentialmanager.MasterPasswordProvider$ProviderComparator" />
+ <bean id="MasterPasswordProviderComparator" class="org.apache.taverna.security.credentialmanager.MasterPasswordProvider$ProviderComparator" />
- <bean id="UIUsernamePasswordProvider" class="net.sf.taverna.t2.workbench.ui.credentialmanager.password.UIUsernamePasswordProvider" >
+ <bean id="UIUsernamePasswordProvider" class="org.apache.taverna.workbench.ui.credentialmanager.password.UIUsernamePasswordProvider" >
<property name="distinguishedNameParser" ref="distinguishedNameParser" />
</bean>
- <bean id="UIMasterPasswordProvider" class="net.sf.taverna.t2.workbench.ui.credentialmanager.password.UIMasterPasswordProvider">
+ <bean id="UIMasterPasswordProvider" class="org.apache.taverna.workbench.ui.credentialmanager.password.UIMasterPasswordProvider">
<property name="applicationConfiguration" ref="ApplicationConfiguration" />
<property name="distinguishedNameParser" ref="distinguishedNameParser" />
</bean>
- <bean id="ConfirmTrustedCertificateUI" class="net.sf.taverna.t2.workbench.ui.credentialmanager.ConfirmTrustedCertificateUI">
+ <bean id="ConfirmTrustedCertificateUI" class="org.apache.taverna.workbench.ui.credentialmanager.ConfirmTrustedCertificateUI">
<property name="distinguishedNameParser" ref="distinguishedNameParser" />
</bean>
- <bean id="InitialiseSSLStartupHook" class="net.sf.taverna.t2.workbench.ui.credentialmanager.startup.InitialiseSSLStartupHook">
+ <bean id="InitialiseSSLStartupHook" class="org.apache.taverna.workbench.ui.credentialmanager.startup.InitialiseSSLStartupHook">
<property name="credentialManager" ref="CredentialManager" />
</bean>
- <bean id="SetCredManAuthenticatorStartupHook" class="net.sf.taverna.t2.workbench.ui.credentialmanager.startup.SetCredManAuthenticatorStartupHook" >
+ <bean id="SetCredManAuthenticatorStartupHook" class="org.apache.taverna.workbench.ui.credentialmanager.startup.SetCredManAuthenticatorStartupHook" >
<property name="credentialManager" ref="CredentialManager" />
</bean>
- <bean id="CredentialManagerMenu" class="net.sf.taverna.t2.workbench.ui.credentialmanager.menu.CredentialManagerMenu" >
+ <bean id="CredentialManagerMenu" class="org.apache.taverna.workbench.ui.credentialmanager.menu.CredentialManagerMenu" >
<property name="credentialManager" ref="CredentialManager" />
<property name="distinguishedNameParser" ref="distinguishedNameParser" />
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-data-management-config-ui/src/main/java/net/sf/taverna/t2/workbench/reference/config/DataManagementConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-data-management-config-ui/src/main/java/net/sf/taverna/t2/workbench/reference/config/DataManagementConfigurationPanel.java b/taverna-data-management-config-ui/src/main/java/net/sf/taverna/t2/workbench/reference/config/DataManagementConfigurationPanel.java
deleted file mode 100644
index 1b880d8..0000000
--- a/taverna-data-management-config-ui/src/main/java/net/sf/taverna/t2/workbench/reference/config/DataManagementConfigurationPanel.java
+++ /dev/null
@@ -1,304 +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.reference.config;
-
-import static java.awt.Color.RED;
-import static java.awt.Font.PLAIN;
-import static java.awt.GridBagConstraints.BOTH;
-import static java.awt.GridBagConstraints.HORIZONTAL;
-import static java.awt.GridBagConstraints.NONE;
-import static java.awt.GridBagConstraints.RELATIVE;
-import static java.awt.GridBagConstraints.WEST;
-import static net.sf.taverna.t2.workbench.helper.Helper.showHelp;
-
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.sql.Connection;
-
-import javax.swing.AbstractAction;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JTextArea;
-import javax.swing.border.EmptyBorder;
-
-import net.sf.taverna.t2.lang.ui.DialogTextArea;
-import org.apache.taverna.configuration.database.DatabaseConfiguration;
-import org.apache.taverna.configuration.database.DatabaseManager;
-
-@SuppressWarnings("serial")
-public class DataManagementConfigurationPanel extends JPanel {
- private DatabaseConfiguration configuration;
- private DatabaseManager databaseManager;
-
- private JCheckBox enableProvenance;
- private JCheckBox enableInMemory;
- private JButton helpButton;
- private JButton resetButton;
- private JButton applyButton;
- private JTextArea storageText;
- private JTextArea exposeDatanatureText;
- private JCheckBox exposeDatanatureBox;
- private DialogTextArea enableInMemoryTextDisabled;
-
- public DataManagementConfigurationPanel(DatabaseConfiguration configuration, DatabaseManager databaseManager) {
- this.configuration = configuration;
- this.databaseManager = databaseManager;
-
- setLayout(generateLayout());
- resetFields();
- }
-
- private static final boolean ADD_WARNING_LISTENERS = false;
-
- private GridBagLayout generateLayout() {
- GridBagLayout gridbag = new GridBagLayout();
- GridBagConstraints c = new GridBagConstraints();
-
- enableProvenance = new JCheckBox("Enable provenance capture");
- DialogTextArea enableProvenanceText = new DialogTextArea(
- "Disabling provenance will prevent you from being able to view intermediate results, but does give a performance benefit.");
- Font plain = enableProvenanceText.getFont().deriveFont(PLAIN, 11);
- enableProvenanceText.setLineWrap(true);
- enableProvenanceText.setWrapStyleWord(true);
- enableProvenanceText.setEditable(false);
- enableProvenanceText.setFocusable(false);
- enableProvenanceText.setOpaque(false);
- enableProvenanceText.setFont(plain);
-
- enableInMemory = new JCheckBox("In-memory storage");
- DialogTextArea enableInMemoryText = new DialogTextArea(
- "Data will not be stored between workbench sessions. If you run workflows passing larger amounts of data, try disabling in-memory storage, which can reduce execution performance, but also Taverna's memory consumption. ");
- enableInMemoryText.setLineWrap(true);
- enableInMemoryText.setWrapStyleWord(true);
- enableInMemoryText.setEditable(false);
- enableInMemoryText.setFocusable(false);
- enableInMemoryText.setOpaque(false);
- enableInMemoryText.setFont(plain);
-
- enableInMemoryTextDisabled = new DialogTextArea(
- "If you enable in-memory storage of data when provenance collection is turned on then provenance will not be available after you shutdown Taverna as the in-memory data will be lost.");
- enableInMemoryTextDisabled.setLineWrap(true);
- enableInMemoryTextDisabled.setWrapStyleWord(true);
- enableInMemoryTextDisabled.setEditable(false);
- enableInMemoryTextDisabled.setFocusable(false);
- enableInMemoryTextDisabled.setOpaque(false);
- enableInMemoryTextDisabled.setFont(plain);
- enableInMemoryTextDisabled.setForeground(RED);
- enableInMemoryTextDisabled.setVisible(false);
-
- // Disable warning as inMemory is default
- // To re-enable - also see resetFields()
-
- if (ADD_WARNING_LISTENERS) {
- enableInMemory.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- enableInMemoryTextDisabled.setVisible(enableProvenance
- .isSelected() && enableInMemory.isSelected());
- }
- });
- enableProvenance.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- enableInMemoryTextDisabled.setVisible(enableProvenance
- .isSelected() && enableInMemory.isSelected());
- }
- });
- }
-
- storageText = new JTextArea(
- "Select how Taverna stores the data and provenance produced when a workflow is run. This includes workflow results and intermediate results.");
- storageText.setLineWrap(true);
- storageText.setWrapStyleWord(true);
- storageText.setEditable(false);
- storageText.setFocusable(false);
- storageText.setBorder(new EmptyBorder(10, 10, 10, 10));
- storageText.setFont(plain);
-
- JComponent portPanel = createDerbyServerStatusComponent();
-
- c.anchor = WEST;
- c.insets = new Insets(0, 0, 10, 0);
- c.gridx = 0;
- c.gridy = RELATIVE;
- c.weightx = 0.0;
- c.weighty = 0.0;
- c.fill = HORIZONTAL;
- gridbag.setConstraints(storageText, c);
- add(storageText);
-
- c.ipady = 0;
- c.insets = new Insets(0, 0, 5, 0);
- c.fill = NONE;
- gridbag.setConstraints(enableProvenance, c);
- add(enableProvenance);
-
- c.insets = new Insets(0, 20, 15, 20);
- c.fill = HORIZONTAL;
- gridbag.setConstraints(enableProvenanceText, c);
- add(enableProvenanceText);
-
- c.insets = new Insets(0, 0, 5, 0);
- c.fill = GridBagConstraints.NONE;
- gridbag.setConstraints(enableInMemory, c);
- add(enableInMemory);
-
- c.insets = new Insets(0, 20, 15, 20);
- c.fill = HORIZONTAL;
- gridbag.setConstraints(enableInMemoryText, c);
- add(enableInMemoryText);
-
- c.insets = new Insets(0, 20, 15, 20);
- c.fill = HORIZONTAL;
- gridbag.setConstraints(enableInMemoryTextDisabled, c);
- add(enableInMemoryTextDisabled);
-
- c.insets = new Insets(0, 20, 15, 20);
- gridbag.setConstraints(portPanel, c);
- add(portPanel);
-
- c.insets = new Insets(0, 0, 5, 0);
- c.fill = NONE;
- exposeDatanatureBox = new JCheckBox(
- "Allow setting of input data encoding");
- gridbag.setConstraints(exposeDatanatureBox, c);
- add(exposeDatanatureBox);
-
- exposeDatanatureText = new JTextArea(
- "Select if you want to control how Taverna handles files read as input data");
- exposeDatanatureText.setLineWrap(true);
- exposeDatanatureText.setWrapStyleWord(true);
- exposeDatanatureText.setEditable(false);
- exposeDatanatureText.setFocusable(false);
- exposeDatanatureText.setOpaque(false);
- exposeDatanatureText.setFont(plain);
-
- c.insets = new Insets(0, 20, 15, 20);
- c.fill = HORIZONTAL;
- gridbag.setConstraints(exposeDatanatureText, c);
- add(exposeDatanatureText);
-
- JPanel buttonPanel = createButtonPanel();
- c.weightx = 1.0;
- c.weighty = 1.0;
- c.fill = BOTH;
- c.insets = new Insets(0, 0, 5, 0);
- gridbag.setConstraints(buttonPanel, c);
- add(buttonPanel);
- return gridbag;
- }
-
- private JComponent createDerbyServerStatusComponent() {
- DialogTextArea textArea = new DialogTextArea();
- boolean running;
-
- try (Connection connection = databaseManager.getConnection()) {
- running = databaseManager.isRunning();
- } catch (Exception e) {
- running = false;
- }
-
- if (running)
- textArea.setText("The database is currently running on port: "
- + configuration.getCurrentPort() + ".");
- else
- textArea.setText("Unable to retrieve a database connection - "
- + "the database is not available.");
-
- textArea.setLineWrap(true);
- textArea.setWrapStyleWord(true);
- textArea.setEditable(false);
- textArea.setFocusable(false);
- textArea.setOpaque(false);
- textArea.setAlignmentX(CENTER_ALIGNMENT);
- textArea.setFont(textArea.getFont().deriveFont(PLAIN, 11));
- textArea.setVisible(configuration.getStartInternalDerbyServer());
- return textArea;
- }
-
- // for testing only
-// public static void main(String[] args) {
-// JDialog dialog = new JDialog();
-// dialog.add(new DataManagementConfigurationPanel());
-// dialog.setModal(true);
-// dialog.setSize(500, 300);
-// dialog.setVisible(true);
-// System.exit(0);
-// }
-
- public void resetFields() {
- enableInMemory.setSelected(configuration.isInMemory());
- enableProvenance.setSelected(configuration.isProvenanceEnabled());
- exposeDatanatureBox.setSelected(configuration.isExposeDatanature());
-
- if (ADD_WARNING_LISTENERS) {
- enableInMemoryTextDisabled.setVisible(enableProvenance.isSelected()
- && enableInMemory.isSelected());
- }
- }
-
- /*private boolean workflowInstances() {
- return DataflowRunsComponent.getInstance().getRunListCount()>0;
- }*/
-
- private void applySettings() {
- configuration.setProvenanceEnabled(enableProvenance.isSelected());
- configuration.setInMemory(enableInMemory.isSelected());
- configuration.setExposeDatanature(exposeDatanatureBox.isSelected());
- }
-
- private JPanel createButtonPanel() {
- final JPanel panel = new JPanel();
-
- helpButton = new JButton(new AbstractAction("Help") {
- @Override
- public void actionPerformed(ActionEvent arg0) {
- showHelp(panel);
- }
- });
- panel.add(helpButton);
-
- resetButton = new JButton(new AbstractAction("Reset") {
- @Override
- public void actionPerformed(ActionEvent arg0) {
- resetFields();
- }
- });
- panel.add(resetButton);
-
- applyButton = new JButton(new AbstractAction("Apply") {
- @Override
- public void actionPerformed(ActionEvent arg0) {
- applySettings();
- resetFields();
- }
- });
- panel.add(applyButton);
-
- return panel;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-data-management-config-ui/src/main/java/net/sf/taverna/t2/workbench/reference/config/DataManagementConfigurationUIFactory.java
----------------------------------------------------------------------
diff --git a/taverna-data-management-config-ui/src/main/java/net/sf/taverna/t2/workbench/reference/config/DataManagementConfigurationUIFactory.java b/taverna-data-management-config-ui/src/main/java/net/sf/taverna/t2/workbench/reference/config/DataManagementConfigurationUIFactory.java
deleted file mode 100644
index efdc019..0000000
--- a/taverna-data-management-config-ui/src/main/java/net/sf/taverna/t2/workbench/reference/config/DataManagementConfigurationUIFactory.java
+++ /dev/null
@@ -1,64 +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.reference.config;
-
-import javax.swing.JPanel;
-
-import uk.org.taverna.configuration.Configurable;
-import uk.org.taverna.configuration.ConfigurationUIFactory;
-import org.apache.taverna.configuration.database.DatabaseConfiguration;
-import org.apache.taverna.configuration.database.DatabaseManager;
-
-public class DataManagementConfigurationUIFactory implements
- ConfigurationUIFactory {
- private DatabaseConfiguration databaseConfiguration;
- private DatabaseManager databaseManager;
-
- private DataManagementConfigurationPanel configPanel;
-
- @Override
- public boolean canHandle(String uuid) {
- return uuid.equals(getConfigurable().getUUID());
- }
-
- @Override
- public JPanel getConfigurationPanel() {
- if (configPanel == null)
- configPanel = new DataManagementConfigurationPanel(
- databaseConfiguration, databaseManager);
- configPanel.resetFields();
- return configPanel;
- }
-
- @Override
- public Configurable getConfigurable() {
- return databaseConfiguration;
- }
-
- public void setDatabaseConfiguration(
- DatabaseConfiguration databaseConfiguration) {
- this.databaseConfiguration = databaseConfiguration;
- }
-
- public void setDatabaseManager(DatabaseManager databaseManager) {
- this.databaseManager = databaseManager;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-data-management-config-ui/src/main/java/org/apache/taverna/workbench/reference/config/DataManagementConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-data-management-config-ui/src/main/java/org/apache/taverna/workbench/reference/config/DataManagementConfigurationPanel.java b/taverna-data-management-config-ui/src/main/java/org/apache/taverna/workbench/reference/config/DataManagementConfigurationPanel.java
new file mode 100644
index 0000000..d17bb16
--- /dev/null
+++ b/taverna-data-management-config-ui/src/main/java/org/apache/taverna/workbench/reference/config/DataManagementConfigurationPanel.java
@@ -0,0 +1,303 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+package org.apache.taverna.workbench.reference.config;
+
+import static java.awt.Color.RED;
+import static java.awt.Font.PLAIN;
+import static java.awt.GridBagConstraints.BOTH;
+import static java.awt.GridBagConstraints.HORIZONTAL;
+import static java.awt.GridBagConstraints.NONE;
+import static java.awt.GridBagConstraints.RELATIVE;
+import static java.awt.GridBagConstraints.WEST;
+import static org.apache.taverna.workbench.helper.Helper.showHelp;
+
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.sql.Connection;
+
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.border.EmptyBorder;
+
+import org.apache.taverna.lang.ui.DialogTextArea;
+import org.apache.taverna.configuration.database.DatabaseConfiguration;
+import org.apache.taverna.configuration.database.DatabaseManager;
+
+@SuppressWarnings("serial")
+public class DataManagementConfigurationPanel extends JPanel {
+ private DatabaseConfiguration configuration;
+ private DatabaseManager databaseManager;
+
+ private JCheckBox enableProvenance;
+ private JCheckBox enableInMemory;
+ private JButton helpButton;
+ private JButton resetButton;
+ private JButton applyButton;
+ private JTextArea storageText;
+ private JTextArea exposeDatanatureText;
+ private JCheckBox exposeDatanatureBox;
+ private DialogTextArea enableInMemoryTextDisabled;
+
+ public DataManagementConfigurationPanel(DatabaseConfiguration configuration, DatabaseManager databaseManager) {
+ this.configuration = configuration;
+ this.databaseManager = databaseManager;
+
+ setLayout(generateLayout());
+ resetFields();
+ }
+
+ private static final boolean ADD_WARNING_LISTENERS = false;
+
+ private GridBagLayout generateLayout() {
+ GridBagLayout gridbag = new GridBagLayout();
+ GridBagConstraints c = new GridBagConstraints();
+
+ enableProvenance = new JCheckBox("Enable provenance capture");
+ DialogTextArea enableProvenanceText = new DialogTextArea(
+ "Disabling provenance will prevent you from being able to view intermediate results, but does give a performance benefit.");
+ Font plain = enableProvenanceText.getFont().deriveFont(PLAIN, 11);
+ enableProvenanceText.setLineWrap(true);
+ enableProvenanceText.setWrapStyleWord(true);
+ enableProvenanceText.setEditable(false);
+ enableProvenanceText.setFocusable(false);
+ enableProvenanceText.setOpaque(false);
+ enableProvenanceText.setFont(plain);
+
+ enableInMemory = new JCheckBox("In-memory storage");
+ DialogTextArea enableInMemoryText = new DialogTextArea(
+ "Data will not be stored between workbench sessions. If you run workflows passing larger amounts of data, try disabling in-memory storage, which can reduce execution performance, but also Taverna's memory consumption. ");
+ enableInMemoryText.setLineWrap(true);
+ enableInMemoryText.setWrapStyleWord(true);
+ enableInMemoryText.setEditable(false);
+ enableInMemoryText.setFocusable(false);
+ enableInMemoryText.setOpaque(false);
+ enableInMemoryText.setFont(plain);
+
+ enableInMemoryTextDisabled = new DialogTextArea(
+ "If you enable in-memory storage of data when provenance collection is turned on then provenance will not be available after you shutdown Taverna as the in-memory data will be lost.");
+ enableInMemoryTextDisabled.setLineWrap(true);
+ enableInMemoryTextDisabled.setWrapStyleWord(true);
+ enableInMemoryTextDisabled.setEditable(false);
+ enableInMemoryTextDisabled.setFocusable(false);
+ enableInMemoryTextDisabled.setOpaque(false);
+ enableInMemoryTextDisabled.setFont(plain);
+ enableInMemoryTextDisabled.setForeground(RED);
+ enableInMemoryTextDisabled.setVisible(false);
+
+ // Disable warning as inMemory is default
+ // To re-enable - also see resetFields()
+
+ if (ADD_WARNING_LISTENERS) {
+ enableInMemory.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ enableInMemoryTextDisabled.setVisible(enableProvenance
+ .isSelected() && enableInMemory.isSelected());
+ }
+ });
+ enableProvenance.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ enableInMemoryTextDisabled.setVisible(enableProvenance
+ .isSelected() && enableInMemory.isSelected());
+ }
+ });
+ }
+
+ storageText = new JTextArea(
+ "Select how Taverna stores the data and provenance produced when a workflow is run. This includes workflow results and intermediate results.");
+ storageText.setLineWrap(true);
+ storageText.setWrapStyleWord(true);
+ storageText.setEditable(false);
+ storageText.setFocusable(false);
+ storageText.setBorder(new EmptyBorder(10, 10, 10, 10));
+ storageText.setFont(plain);
+
+ JComponent portPanel = createDerbyServerStatusComponent();
+
+ c.anchor = WEST;
+ c.insets = new Insets(0, 0, 10, 0);
+ c.gridx = 0;
+ c.gridy = RELATIVE;
+ c.weightx = 0.0;
+ c.weighty = 0.0;
+ c.fill = HORIZONTAL;
+ gridbag.setConstraints(storageText, c);
+ add(storageText);
+
+ c.ipady = 0;
+ c.insets = new Insets(0, 0, 5, 0);
+ c.fill = NONE;
+ gridbag.setConstraints(enableProvenance, c);
+ add(enableProvenance);
+
+ c.insets = new Insets(0, 20, 15, 20);
+ c.fill = HORIZONTAL;
+ gridbag.setConstraints(enableProvenanceText, c);
+ add(enableProvenanceText);
+
+ c.insets = new Insets(0, 0, 5, 0);
+ c.fill = GridBagConstraints.NONE;
+ gridbag.setConstraints(enableInMemory, c);
+ add(enableInMemory);
+
+ c.insets = new Insets(0, 20, 15, 20);
+ c.fill = HORIZONTAL;
+ gridbag.setConstraints(enableInMemoryText, c);
+ add(enableInMemoryText);
+
+ c.insets = new Insets(0, 20, 15, 20);
+ c.fill = HORIZONTAL;
+ gridbag.setConstraints(enableInMemoryTextDisabled, c);
+ add(enableInMemoryTextDisabled);
+
+ c.insets = new Insets(0, 20, 15, 20);
+ gridbag.setConstraints(portPanel, c);
+ add(portPanel);
+
+ c.insets = new Insets(0, 0, 5, 0);
+ c.fill = NONE;
+ exposeDatanatureBox = new JCheckBox(
+ "Allow setting of input data encoding");
+ gridbag.setConstraints(exposeDatanatureBox, c);
+ add(exposeDatanatureBox);
+
+ exposeDatanatureText = new JTextArea(
+ "Select if you want to control how Taverna handles files read as input data");
+ exposeDatanatureText.setLineWrap(true);
+ exposeDatanatureText.setWrapStyleWord(true);
+ exposeDatanatureText.setEditable(false);
+ exposeDatanatureText.setFocusable(false);
+ exposeDatanatureText.setOpaque(false);
+ exposeDatanatureText.setFont(plain);
+
+ c.insets = new Insets(0, 20, 15, 20);
+ c.fill = HORIZONTAL;
+ gridbag.setConstraints(exposeDatanatureText, c);
+ add(exposeDatanatureText);
+
+ JPanel buttonPanel = createButtonPanel();
+ c.weightx = 1.0;
+ c.weighty = 1.0;
+ c.fill = BOTH;
+ c.insets = new Insets(0, 0, 5, 0);
+ gridbag.setConstraints(buttonPanel, c);
+ add(buttonPanel);
+ return gridbag;
+ }
+
+ private JComponent createDerbyServerStatusComponent() {
+ DialogTextArea textArea = new DialogTextArea();
+ boolean running;
+
+ try (Connection connection = databaseManager.getConnection()) {
+ running = databaseManager.isRunning();
+ } catch (Exception e) {
+ running = false;
+ }
+
+ if (running)
+ textArea.setText("The database is currently running on port: "
+ + configuration.getCurrentPort() + ".");
+ else
+ textArea.setText("Unable to retrieve a database connection - "
+ + "the database is not available.");
+
+ textArea.setLineWrap(true);
+ textArea.setWrapStyleWord(true);
+ textArea.setEditable(false);
+ textArea.setFocusable(false);
+ textArea.setOpaque(false);
+ textArea.setAlignmentX(CENTER_ALIGNMENT);
+ textArea.setFont(textArea.getFont().deriveFont(PLAIN, 11));
+ textArea.setVisible(configuration.getStartInternalDerbyServer());
+ return textArea;
+ }
+
+ // for testing only
+// public static void main(String[] args) {
+// JDialog dialog = new JDialog();
+// dialog.add(new DataManagementConfigurationPanel());
+// dialog.setModal(true);
+// dialog.setSize(500, 300);
+// dialog.setVisible(true);
+// System.exit(0);
+// }
+
+ public void resetFields() {
+ enableInMemory.setSelected(configuration.isInMemory());
+ enableProvenance.setSelected(configuration.isProvenanceEnabled());
+ exposeDatanatureBox.setSelected(configuration.isExposeDatanature());
+
+ if (ADD_WARNING_LISTENERS) {
+ enableInMemoryTextDisabled.setVisible(enableProvenance.isSelected()
+ && enableInMemory.isSelected());
+ }
+ }
+
+ /*private boolean workflowInstances() {
+ return DataflowRunsComponent.getInstance().getRunListCount()>0;
+ }*/
+
+ private void applySettings() {
+ configuration.setProvenanceEnabled(enableProvenance.isSelected());
+ configuration.setInMemory(enableInMemory.isSelected());
+ configuration.setExposeDatanature(exposeDatanatureBox.isSelected());
+ }
+
+ private JPanel createButtonPanel() {
+ final JPanel panel = new JPanel();
+
+ helpButton = new JButton(new AbstractAction("Help") {
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ showHelp(panel);
+ }
+ });
+ panel.add(helpButton);
+
+ resetButton = new JButton(new AbstractAction("Reset") {
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ resetFields();
+ }
+ });
+ panel.add(resetButton);
+
+ applyButton = new JButton(new AbstractAction("Apply") {
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ applySettings();
+ resetFields();
+ }
+ });
+ panel.add(applyButton);
+
+ return panel;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-data-management-config-ui/src/main/java/org/apache/taverna/workbench/reference/config/DataManagementConfigurationUIFactory.java
----------------------------------------------------------------------
diff --git a/taverna-data-management-config-ui/src/main/java/org/apache/taverna/workbench/reference/config/DataManagementConfigurationUIFactory.java b/taverna-data-management-config-ui/src/main/java/org/apache/taverna/workbench/reference/config/DataManagementConfigurationUIFactory.java
new file mode 100644
index 0000000..df1ce0b
--- /dev/null
+++ b/taverna-data-management-config-ui/src/main/java/org/apache/taverna/workbench/reference/config/DataManagementConfigurationUIFactory.java
@@ -0,0 +1,63 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+package org.apache.taverna.workbench.reference.config;
+
+import javax.swing.JPanel;
+
+import uk.org.taverna.configuration.Configurable;
+import uk.org.taverna.configuration.ConfigurationUIFactory;
+import org.apache.taverna.configuration.database.DatabaseConfiguration;
+import org.apache.taverna.configuration.database.DatabaseManager;
+
+public class DataManagementConfigurationUIFactory implements
+ ConfigurationUIFactory {
+ private DatabaseConfiguration databaseConfiguration;
+ private DatabaseManager databaseManager;
+
+ private DataManagementConfigurationPanel configPanel;
+
+ @Override
+ public boolean canHandle(String uuid) {
+ return uuid.equals(getConfigurable().getUUID());
+ }
+
+ @Override
+ public JPanel getConfigurationPanel() {
+ if (configPanel == null)
+ configPanel = new DataManagementConfigurationPanel(
+ databaseConfiguration, databaseManager);
+ configPanel.resetFields();
+ return configPanel;
+ }
+
+ @Override
+ public Configurable getConfigurable() {
+ return databaseConfiguration;
+ }
+
+ public void setDatabaseConfiguration(
+ DatabaseConfiguration databaseConfiguration) {
+ this.databaseConfiguration = databaseConfiguration;
+ }
+
+ public void setDatabaseManager(DatabaseManager databaseManager) {
+ this.databaseManager = databaseManager;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-data-management-config-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.configuration.ConfigurationUIFactory
----------------------------------------------------------------------
diff --git a/taverna-data-management-config-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.configuration.ConfigurationUIFactory b/taverna-data-management-config-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.configuration.ConfigurationUIFactory
deleted file mode 100644
index 8afa6ca..0000000
--- a/taverna-data-management-config-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.configuration.ConfigurationUIFactory
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.taverna.t2.workbench.reference.config.DataManagementConfigurationUIFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-data-management-config-ui/src/main/resources/META-INF/services/org.apache.taverna.workbench.configuration.ConfigurationUIFactory
----------------------------------------------------------------------
diff --git a/taverna-data-management-config-ui/src/main/resources/META-INF/services/org.apache.taverna.workbench.configuration.ConfigurationUIFactory b/taverna-data-management-config-ui/src/main/resources/META-INF/services/org.apache.taverna.workbench.configuration.ConfigurationUIFactory
new file mode 100644
index 0000000..8afa6ca
--- /dev/null
+++ b/taverna-data-management-config-ui/src/main/resources/META-INF/services/org.apache.taverna.workbench.configuration.ConfigurationUIFactory
@@ -0,0 +1 @@
+net.sf.taverna.t2.workbench.reference.config.DataManagementConfigurationUIFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-data-management-config-ui/src/main/resources/META-INF/spring/data-management-config-ui-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-data-management-config-ui/src/main/resources/META-INF/spring/data-management-config-ui-context-osgi.xml b/taverna-data-management-config-ui/src/main/resources/META-INF/spring/data-management-config-ui-context-osgi.xml
index 89f84a7..b5c5b21 100644
--- a/taverna-data-management-config-ui/src/main/resources/META-INF/spring/data-management-config-ui-context-osgi.xml
+++ b/taverna-data-management-config-ui/src/main/resources/META-INF/spring/data-management-config-ui-context-osgi.xml
@@ -6,7 +6,7 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="DataManagementConfigurationUIFactory" interface="uk.org.taverna.configuration.ConfigurationUIFactory" />
+ <service ref="DataManagementConfigurationUIFactory" interface="org.apache.taverna.configuration.ConfigurationUIFactory" />
<reference id="databaseConfiguration" interface="uk.org.taverna.configuration.database.DatabaseConfiguration" />
<reference id="databaseManager" interface="uk.org.taverna.configuration.database.DatabaseManager" />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-data-management-config-ui/src/main/resources/META-INF/spring/data-management-config-ui-context.xml
----------------------------------------------------------------------
diff --git a/taverna-data-management-config-ui/src/main/resources/META-INF/spring/data-management-config-ui-context.xml b/taverna-data-management-config-ui/src/main/resources/META-INF/spring/data-management-config-ui-context.xml
index f9f40ed..9d20390 100644
--- a/taverna-data-management-config-ui/src/main/resources/META-INF/spring/data-management-config-ui-context.xml
+++ b/taverna-data-management-config-ui/src/main/resources/META-INF/spring/data-management-config-ui-context.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="DataManagementConfigurationUIFactory" class="net.sf.taverna.t2.workbench.reference.config.DataManagementConfigurationUIFactory">
+ <bean id="DataManagementConfigurationUIFactory" class="org.apache.taverna.workbench.reference.config.DataManagementConfigurationUIFactory">
<property name="databaseConfiguration" ref="databaseConfiguration"/>
<property name="databaseManager" ref="databaseManager"/>
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/actions/EditNestedDataflowAction.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/actions/EditNestedDataflowAction.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/actions/EditNestedDataflowAction.java
deleted file mode 100644
index 0642295..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/actions/EditNestedDataflowAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- *
- */
-package net.sf.taverna.t2.activities.dataflow.actions;
-
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-
-import com.fasterxml.jackson.databind.JsonNode;
-
-import net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowTemplateService;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import org.apache.taverna.scufl2.api.activity.Activity;
-import org.apache.taverna.scufl2.api.common.Scufl2Tools;
-import org.apache.taverna.scufl2.api.configurations.Configuration;
-import org.apache.taverna.scufl2.api.core.Workflow;
-
-@SuppressWarnings("serial")
-public class EditNestedDataflowAction extends AbstractAction {
-
- private final Activity activity;
- private final SelectionManager selectionManager;
-
- private Scufl2Tools scufl2Tools = new Scufl2Tools();
-
- public EditNestedDataflowAction(Activity activity, SelectionManager selectionManager) {
- super("Edit nested workflow");
- this.activity = activity;
- this.selectionManager = selectionManager;
- }
-
- public void actionPerformed(ActionEvent e) {
- if (activity.getType().equals(DataflowTemplateService.ACTIVITY_TYPE)) {
- for (Configuration configuration : scufl2Tools.configurationsFor(activity, selectionManager.getSelectedProfile())) {
- JsonNode nested = configuration.getJson().get("nestedWorkflow");
- Workflow nestedWorkflow = selectionManager.getSelectedWorkflowBundle().getWorkflows().getByName(nested.asText());
- if (nestedWorkflow != null) {
- selectionManager.setSelectedWorkflow(nestedWorkflow);
- break;
- }
- }
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/menu/EditNestedDataflowMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/menu/EditNestedDataflowMenuAction.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/menu/EditNestedDataflowMenuAction.java
deleted file mode 100644
index 8bdf0e1..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/menu/EditNestedDataflowMenuAction.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package net.sf.taverna.t2.activities.dataflow.menu;
-
-import javax.swing.Action;
-
-import net.sf.taverna.t2.activities.dataflow.actions.EditNestedDataflowAction;
-import net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowTemplateService;
-import net.sf.taverna.t2.workbench.activitytools.AbstractConfigureActivityMenuAction;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-
-public class EditNestedDataflowMenuAction extends AbstractConfigureActivityMenuAction {
-
- private SelectionManager selectionManager;
-
- public EditNestedDataflowMenuAction() {
- super(DataflowTemplateService.ACTIVITY_TYPE);
- }
-
- @Override
- protected Action createAction() {
- EditNestedDataflowAction configAction = new EditNestedDataflowAction(findActivity(), selectionManager);
- return configAction;
- }
-
- public void setSelectionManager(SelectionManager selectionManager) {
- this.selectionManager = selectionManager;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowActivityIcon.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowActivityIcon.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowActivityIcon.java
deleted file mode 100644
index 6d7e766..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowActivityIcon.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.activities.dataflow.servicedescriptions;
-
-import java.net.URI;
-
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconSPI;
-
-/**
- *
- * @author Alex Nenadic
- * @author alanrw
- *
- */
-public class DataflowActivityIcon implements ActivityIconSPI{
-
- private static Icon icon;
-
- public int canProvideIconScore(URI activityType) {
- if (DataflowTemplateService.ACTIVITY_TYPE.equals(activityType))
- return DEFAULT_ICON + 1;
- else
- return NO_ICON;
- }
-
- public Icon getIcon(URI activityType) {
- return getDataflowIcon();
- }
-
- public static Icon getDataflowIcon() {
- if (icon == null) {
- icon = new ImageIcon(DataflowActivityIcon.class.getResource("/dataflow.png"));
- }
- return icon;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowTemplateService.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowTemplateService.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowTemplateService.java
deleted file mode 100644
index b981816..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/servicedescriptions/DataflowTemplateService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package net.sf.taverna.t2.activities.dataflow.servicedescriptions;
-
-import java.net.URI;
-
-import javax.swing.Icon;
-
-import net.sf.taverna.t2.servicedescriptions.AbstractTemplateService;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescription;
-import org.apache.taverna.scufl2.api.configurations.Configuration;
-
-public class DataflowTemplateService extends AbstractTemplateService {
-
- public static final URI ACTIVITY_TYPE = URI.create("http://ns.taverna.org.uk/2010/activity/nested-workflow");
-
- private static final String A_CONFIGURABLE_NESTED_WORKFLOW = "A service that allows you to have one workflow nested within another";
- private static final String DATAFLOW = "Nested workflow";
-
- private static final URI providerId = URI.create("http://taverna.sf.net/2010/service-provider/dataflow");
-
- @Override
- public URI getActivityType() {
- return ACTIVITY_TYPE;
- }
-
- @Override
- public Configuration getActivityConfiguration() {
- Configuration configuration = new Configuration();
- configuration.setType(ACTIVITY_TYPE.resolve("#Config"));
- return configuration;
- }
-
- @Override
- public Icon getIcon() {
- return DataflowActivityIcon.getDataflowIcon();
- }
-
- public String getName() {
- return DATAFLOW;
- }
-
- public String getDescription() {
- return A_CONFIGURABLE_NESTED_WORKFLOW;
- }
-
- public static ServiceDescription getServiceDescription() {
- DataflowTemplateService dts = new DataflowTemplateService();
- return dts.templateService;
- }
-
- public String getId() {
- return providerId.toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityContextualView.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityContextualView.java
deleted file mode 100644
index a92ea36..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityContextualView.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.activities.dataflow.views;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.Frame;
-
-import javax.swing.Action;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-
-import net.sf.taverna.t2.activities.dataflow.actions.EditNestedDataflowAction;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.importworkflow.actions.ReplaceNestedWorkflowAction;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.actions.activity.HTMLBasedActivityContextualView;
-
-import org.apache.log4j.Logger;
-
-import org.apache.taverna.scufl2.api.activity.Activity;
-
-@SuppressWarnings("serial")
-public class DataflowActivityContextualView extends HTMLBasedActivityContextualView {
-
- static Logger logger = Logger.getLogger(DataflowActivityContextualView.class);
-
- private final EditManager editManager;
- private final FileManager fileManager;
- private final MenuManager menuManager;
- private final ActivityIconManager activityIconManager;
- private final ColourManager colourManager;
- private final WorkbenchConfiguration workbenchConfiguration;
- private final ServiceDescriptionRegistry serviceDescriptionRegistry;
-
- private final SelectionManager selectionManager;
-
- public DataflowActivityContextualView(Activity activity, EditManager editManager,
- FileManager fileManager, MenuManager menuManager,
- ActivityIconManager activityIconManager, ColourManager colourManager,
- ServiceDescriptionRegistry serviceDescriptionRegistry,
- WorkbenchConfiguration workbenchConfiguration, SelectionManager selectionManager) {
- super(activity, colourManager);
- this.editManager = editManager;
- this.fileManager = fileManager;
- this.menuManager = menuManager;
- this.activityIconManager = activityIconManager;
- this.colourManager = colourManager;
- this.serviceDescriptionRegistry = serviceDescriptionRegistry;
- this.workbenchConfiguration = workbenchConfiguration;
- this.selectionManager = selectionManager;
- addEditButtons();
- }
-
- @Override
- public Activity getActivity() {
- return super.getActivity();
- }
-
- public void addEditButtons() {
- JComponent mainFrame = getMainFrame();
- JButton viewWorkflowButton = new JButton("Edit workflow");
- viewWorkflowButton.addActionListener(new EditNestedDataflowAction(getActivity(),
- selectionManager));
- JButton configureButton = new JButton(new ReplaceNestedWorkflowAction(getActivity(),
- editManager, fileManager, menuManager, activityIconManager, colourManager,
- serviceDescriptionRegistry, workbenchConfiguration, selectionManager));
- configureButton.setIcon(null);
- JPanel flowPanel = new JPanel(new FlowLayout());
- flowPanel.add(viewWorkflowButton);
- flowPanel.add(configureButton);
- mainFrame.add(flowPanel, BorderLayout.SOUTH);
- mainFrame.revalidate();
- }
-
-// @Override
-// public JComponent getMainFrame() {
-// JComponent mainFrame = super.getMainFrame();
-// JButton viewWorkflowButton = new JButton("Edit workflow");
-// viewWorkflowButton.addActionListener(new EditNestedDataflowAction(getActivity(),
-// selectionManager));
-// JButton configureButton = new JButton(new ReplaceNestedWorkflowAction(getActivity(),
-// editManager, fileManager, menuManager, activityIconManager, colourManager,
-// serviceDescriptionRegistry, workbenchConfiguration, selectionManager));
-// configureButton.setIcon(null);
-// JPanel flowPanel = new JPanel(new FlowLayout());
-// flowPanel.add(viewWorkflowButton);
-// flowPanel.add(configureButton);
-// mainFrame.add(flowPanel, BorderLayout.SOUTH);
-// return mainFrame;
-// }
-
- @Override
- protected String getRawTableRowsHtml() {
- return ("<tr><td colspan=2>" + getActivity().getName() + "</td></tr>");
- }
-
- @Override
- public String getViewTitle() {
- return "Nested workflow";
- }
-
- @Override
- public Action getConfigureAction(Frame owner) {
- return null;
- // return new OpenNestedDataflowFromFileAction(
- // (DataflowActivity) getActivity(), owner);
- }
-
- @Override
- public int getPreferredPosition() {
- return 100;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityViewFactory.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityViewFactory.java
deleted file mode 100644
index 955c88a..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/activities/dataflow/views/DataflowActivityViewFactory.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.activities.dataflow.views;
-
-import java.util.Arrays;
-import java.util.List;
-
-import net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowTemplateService;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import org.apache.taverna.scufl2.api.activity.Activity;
-
-public class DataflowActivityViewFactory implements ContextualViewFactory<Activity> {
-
- private EditManager editManager;
- private FileManager fileManager;
- private MenuManager menuManager;
- private ColourManager colourManager;
- private ActivityIconManager activityIconManager;
- private WorkbenchConfiguration workbenchConfiguration;
- private ServiceDescriptionRegistry serviceDescriptionRegistry;
- private SelectionManager selectionManager;
-
- public boolean canHandle(Object object) {
- return object instanceof Activity
- && ((Activity) object).getType().equals(DataflowTemplateService.ACTIVITY_TYPE);
- }
-
- public List<ContextualView> getViews(Activity activity) {
- return Arrays.asList(new ContextualView[] { new DataflowActivityContextualView(activity,
- editManager, fileManager, menuManager, activityIconManager, colourManager,
- serviceDescriptionRegistry, workbenchConfiguration, selectionManager) });
- }
-
- public void setEditManager(EditManager editManager) {
- this.editManager = editManager;
- }
-
- public void setFileManager(FileManager fileManager) {
- this.fileManager = fileManager;
- }
-
- public void setMenuManager(MenuManager menuManager) {
- this.menuManager = menuManager;
- }
-
- public void setActivityIconManager(ActivityIconManager activityIconManager) {
- this.activityIconManager = activityIconManager;
- }
-
- public void setColourManager(ColourManager colourManager) {
- this.colourManager = colourManager;
- }
-
- public void setServiceDescriptionRegistry(ServiceDescriptionRegistry serviceDescriptionRegistry) {
- this.serviceDescriptionRegistry = serviceDescriptionRegistry;
- }
-
- public void setWorkbenchConfiguration(WorkbenchConfiguration workbenchConfiguration) {
- this.workbenchConfiguration = workbenchConfiguration;
- }
-
- public void setSelectionManager(SelectionManager selectionManager) {
- this.selectionManager = selectionManager;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/DataflowMerger.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/DataflowMerger.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/DataflowMerger.java
deleted file mode 100644
index f090e50..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/DataflowMerger.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sf.taverna.t2.workbench.edits.CompoundEdit;
-import net.sf.taverna.t2.workbench.edits.Edit;
-import net.sf.taverna.t2.workflow.edits.AddChildEdit;
-import net.sf.taverna.t2.workflow.edits.AddDataLinkEdit;
-import net.sf.taverna.t2.workflow.edits.AddProcessorEdit;
-import net.sf.taverna.t2.workflow.edits.AddWorkflowInputPortEdit;
-import net.sf.taverna.t2.workflow.edits.AddWorkflowOutputPortEdit;
-import org.apache.taverna.scufl2.api.common.AbstractCloneable;
-import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import org.apache.taverna.scufl2.api.core.ControlLink;
-import org.apache.taverna.scufl2.api.core.DataLink;
-import org.apache.taverna.scufl2.api.core.Processor;
-import org.apache.taverna.scufl2.api.core.Workflow;
-import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
-import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
-
-/**
- * A tool that allows merging of two workflow.
- * <p>
- * The merge is performed as a series of edit, inserting a copy of the source
- * workflow into the destination workflow.
- *
- * @author Stian Soiland-Reyes
- * @author David Withers
- */
-public class DataflowMerger {
-
- /**
- * Make a copy of a workflow.
- *
- * @param source
- * workflow to copy
- * @return A copy of the workflow.
- */
- public static Workflow copyWorkflow(Workflow source) {
- WorkflowBundle workflowBundle = AbstractCloneable.cloneWorkflowBean(source.getParent());
- return workflowBundle.getWorkflows().getByName(source.getName());
- }
-
- private final Workflow destinationWorkflow;
-
- /**
- * Construct a {@link DataflowMerger} for the given destination workflow.
- *
- * @param destinationWorkflow
- * Workflow to be merged into
- */
- public DataflowMerger(Workflow destinationWorkflow) {
- this.destinationWorkflow = destinationWorkflow;
- }
-
- /**
- * Make an {@link Edit} that when performed merges the given source dataflow
- * into the destination dataflow.
- * <p>
- * Internally a copy is made of the source dataflow, to avoid modifying the
- * links and processors.
- *
- * @param sourceDataflow
- * Dataflow to merge from
- * @return An edit that can perform and undo the insertion of the components
- * from the source dataflow.
- * @throws MergeException
- * If the merge cannot be performed.
- */
- public CompoundEdit getMergeEdit(Workflow sourceDataflow)
- throws MergeException {
- return getMergeEdit(sourceDataflow, "");
- }
-
- /**
- * Make an {@link Edit} that when performed merges the given source dataflow
- * into the destination dataflow.
- * <p>
- * Internally a copy is made of the source dataflow, to avoid modifying the
- * links and processors.
- *
- * @param sourceWorkflow
- * Dataflow to merge from
- * @param prefix
- * A prefix which will be inserted in front of the names for the
- * merged workflow components.
- * @return An edit that can perform and undo the insertion of the components
- * from the source dataflow.
- * @throws MergeException
- * If the merge cannot be performed.
- */
- public CompoundEdit getMergeEdit(Workflow sourceWorkflow, String prefix)
- throws MergeException {
- List<Edit<?>> compoundEdit = new ArrayList<>();
-
- Workflow workflow = copyWorkflow(sourceWorkflow);
-
- for (InputWorkflowPort input : workflow.getInputPorts()) {
- destinationWorkflow.getInputPorts().addWithUniqueName(input);
- destinationWorkflow.getInputPorts().remove(input);
- compoundEdit.add(new AddWorkflowInputPortEdit(destinationWorkflow, input));
- }
- for (OutputWorkflowPort output : workflow.getOutputPorts()) {
- destinationWorkflow.getOutputPorts().addWithUniqueName(output);
- destinationWorkflow.getOutputPorts().remove(output);
- compoundEdit.add(new AddWorkflowOutputPortEdit(destinationWorkflow, output));
- }
- for (Processor processor : workflow.getProcessors()) {
- processor.setName(prefix + processor.getName());
- compoundEdit.add(new AddProcessorEdit(destinationWorkflow, processor));
- }
- for (DataLink dataLink : workflow.getDataLinks()) {
- compoundEdit.add(new AddDataLinkEdit(destinationWorkflow, dataLink));
- }
- for (ControlLink controlLink : workflow.getControlLinks()) {
- compoundEdit.add(new AddChildEdit<Workflow>(destinationWorkflow, controlLink));
- }
-
- return new CompoundEdit(compoundEdit);
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/MergeException.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/MergeException.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/MergeException.java
deleted file mode 100644
index 3645f91..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/MergeException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow;
-
-public class MergeException extends Exception {
- private static final long serialVersionUID = 6018700359518335402L;
-
- public MergeException() {
- super();
- }
-
- public MergeException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public MergeException(String message) {
- super(message);
- }
-
- public MergeException(Throwable cause) {
- super(cause);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/AddNestedWorkflowAction.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/AddNestedWorkflowAction.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/AddNestedWorkflowAction.java
deleted file mode 100644
index d6f04dd..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/AddNestedWorkflowAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow.actions;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-
-import net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowActivityIcon;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.importworkflow.gui.ImportWorkflowWizard;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.Utils;
-
-/**
- * An action for adding a nested workflow.
- *
- * @author Stian Soiland-Reyes
- *
- */
-public class AddNestedWorkflowAction extends AbstractAction {
- private static final long serialVersionUID = -2242979457902699028L;
- private final EditManager editManager;
- private final FileManager fileManager;
- private final MenuManager menuManager;
- private final ColourManager colourManager;
- private final WorkbenchConfiguration workbenchConfiguration;
- private final SelectionManager selectionManager;
-
- public AddNestedWorkflowAction(EditManager editManager, FileManager fileManager,
- MenuManager menuManager, ColourManager colourManager,
- WorkbenchConfiguration workbenchConfiguration, SelectionManager selectionManager) {
- super("Add nested workflow", DataflowActivityIcon.getDataflowIcon());
- this.editManager = editManager;
- this.fileManager = fileManager;
- this.menuManager = menuManager;
- this.colourManager = colourManager;
- this.workbenchConfiguration = workbenchConfiguration;
- this.selectionManager = selectionManager;
- }
-
- public void actionPerformed(ActionEvent e) {
- final Component parentComponent;
- if (e.getSource() instanceof Component) {
- parentComponent = (Component) e.getSource();
- } else {
- parentComponent = null;
- }
- ImportWorkflowWizard wizard = new ImportWorkflowWizard(
- Utils.getParentFrame(parentComponent), editManager, fileManager, menuManager,
- colourManager, workbenchConfiguration, selectionManager);
- wizard.setMergeEnabled(false);
- wizard.setVisible(true);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ImportWorkflowAction.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ImportWorkflowAction.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ImportWorkflowAction.java
deleted file mode 100644
index 6d9fffb..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/ImportWorkflowAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow.actions;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-
-import net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowActivityIcon;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.importworkflow.gui.ImportWorkflowWizard;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.Utils;
-
-/**
- * A general version of {@link AddNestedWorkflowAction} and {@link MergeWorkflowAction} that allows
- * the user to choose which action to perform.
- *
- * @author Stian Soiland-Reyes
- *
- */
-public class ImportWorkflowAction extends AbstractAction {
- private static final long serialVersionUID = -2242979457902699028L;
- private final EditManager editManager;
- private final FileManager fileManager;
- private final MenuManager menuManager;
- private final ColourManager colourManager;
- private final WorkbenchConfiguration workbenchConfiguration;
- private final SelectionManager selectionManager;
-
- public ImportWorkflowAction(EditManager editManager, FileManager fileManager,
- MenuManager menuManager, ColourManager colourManager,
- WorkbenchConfiguration workbenchConfiguration, SelectionManager selectionManager) {
- super("Import workflow", DataflowActivityIcon.getDataflowIcon());
- this.editManager = editManager;
- this.fileManager = fileManager;
- this.menuManager = menuManager;
- this.colourManager = colourManager;
- this.workbenchConfiguration = workbenchConfiguration;
- this.selectionManager = selectionManager;
- }
-
- public void actionPerformed(ActionEvent e) {
- final Component parentComponent;
- if (e.getSource() instanceof Component) {
- parentComponent = (Component) e.getSource();
- } else {
- parentComponent = null;
- }
- ImportWorkflowWizard wizard = new ImportWorkflowWizard(
- Utils.getParentFrame(parentComponent), editManager, fileManager, menuManager,
- colourManager, workbenchConfiguration, selectionManager);
- wizard.setVisible(true);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/a9a52bd5/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/MergeWorkflowAction.java
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/MergeWorkflowAction.java b/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/MergeWorkflowAction.java
deleted file mode 100644
index d86f97c..0000000
--- a/taverna-dataflow-activity-ui/src/main/java/net/sf/taverna/t2/workbench/file/importworkflow/actions/MergeWorkflowAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package net.sf.taverna.t2.workbench.file.importworkflow.actions;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import net.sf.taverna.t2.workbench.configuration.workbench.WorkbenchConfiguration;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.importworkflow.gui.ImportWorkflowWizard;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.Utils;
-
-/**
- * An action for merging two workflows
- *
- * @author Stian Soiland-Reyes
- *
- */
-public class MergeWorkflowAction extends AbstractAction {
- private static final long serialVersionUID = -2242979457902699028L;
- private final EditManager editManager;
- private final FileManager fileManager;
- private final MenuManager menuManager;
- private final ColourManager colourManager;
- private final WorkbenchConfiguration workbenchConfiguration;
- private final SelectionManager selectionManager;
-
- public MergeWorkflowAction(EditManager editManager, FileManager fileManager,
- MenuManager menuManager, ColourManager colourManager,
- WorkbenchConfiguration workbenchConfiguration, SelectionManager selectionManager) {
- super("Merge workflow");
- this.editManager = editManager;
- this.fileManager = fileManager;
- this.menuManager = menuManager;
- this.colourManager = colourManager;
- this.workbenchConfiguration = workbenchConfiguration;
- this.selectionManager = selectionManager;
- }
-
- public void actionPerformed(ActionEvent e) {
- final Component parentComponent;
- if (e.getSource() instanceof Component) {
- parentComponent = (Component) e.getSource();
- } else {
- parentComponent = null;
- }
- ImportWorkflowWizard wizard = new ImportWorkflowWizard(
- Utils.getParentFrame(parentComponent), editManager, fileManager, menuManager,
- colourManager, workbenchConfiguration, selectionManager);
- wizard.setNestedEnabled(false);
- wizard.setVisible(true);
- }
-
-}