Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/bf8a7ea2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/bf8a7ea2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/bf8a7ea2
Branch: refs/heads/master Commit: bf8a7ea28576c03e8ad7cf06e444a3234f528f17 Parents: a9a52bd Author: Dmitry Repchevsky <[email protected]> Authored: Fri Mar 27 16:33:01 2015 +0100 Committer: Dmitry Repchevsky <[email protected]> Committed: Fri Mar 27 16:33:01 2015 +0100 ---------------------------------------------------------------------- .../ActivityPaletteConfigurationTest.java | 1 - taverna-configuration-impl/pom.xml | 5 + .../menu/AddNestedWorkflowMenuAction.java | 2 +- .../gui/ImportWizardLauncher.java | 2 +- .../DisabledActivityConfigurationAction.java | 2 + .../disabled/views/DisabledConfigView.java | 1 + taverna-edits-api/pom.xml | 18 +- .../AbstractDataflowPersistenceHandler.java | 39 +- .../taverna/workbench/file/DataflowInfo.java | 39 +- .../file/DataflowPersistenceHandler.java | 39 +- .../taverna/workbench/file/FileManager.java | 39 +- .../apache/taverna/workbench/file/FileType.java | 39 +- .../file/events/AbstractDataflowEvent.java | 39 +- .../file/events/ClosedDataflowEvent.java | 39 +- .../file/events/ClosingDataflowEvent.java | 39 +- .../workbench/file/events/FileManagerEvent.java | 39 +- .../file/events/OpenedDataflowEvent.java | 39 +- .../file/events/SavedDataflowEvent.java | 39 +- .../file/events/SetCurrentDataflowEvent.java | 39 +- .../file/exceptions/FileException.java | 39 +- .../file/exceptions/OpenException.java | 39 +- .../file/exceptions/OverwriteException.java | 39 +- .../file/exceptions/SaveException.java | 39 +- .../file/exceptions/UnsavedException.java | 39 +- .../DataflowFromDataflowPersistenceHandler.java | 49 -- .../DataflowPersistenceHandlerRegistry.java | 238 -------- .../workbench/file/impl/FileDataflowInfo.java | 67 --- .../t2/workbench/file/impl/FileManagerImpl.java | 601 ------------------- .../workbench/file/impl/FileTypeFileFilter.java | 55 -- .../workbench/file/impl/MultipleFileTypes.java | 58 -- .../file/impl/OpenDataflowInProgressDialog.java | 88 --- .../workbench/file/impl/OpenDataflowInfo.java | 93 --- .../file/impl/OpenDataflowRunnable.java | 71 --- .../file/impl/OpenDataflowSwingWorker.java | 67 --- .../workbench/file/impl/T2DataflowOpener.java | 144 ----- .../t2/workbench/file/impl/T2FileFilter.java | 40 -- .../t2/workbench/file/impl/T2FlowFileType.java | 42 -- .../file/impl/WorkflowBundleFileFilter.java | 40 -- .../file/impl/WorkflowBundleFileType.java | 42 -- .../file/impl/WorkflowBundleOpener.java | 143 ----- .../file/impl/WorkflowBundleSaver.java | 145 ----- .../impl/actions/CloseAllWorkflowsAction.java | 85 --- .../file/impl/actions/CloseWorkflowAction.java | 107 ---- .../file/impl/actions/NewWorkflowAction.java | 58 -- .../impl/actions/OpenNestedWorkflowAction.java | 76 --- .../file/impl/actions/OpenWorkflowAction.java | 395 ------------ .../impl/actions/OpenWorkflowFromURLAction.java | 139 ----- .../file/impl/actions/PasswordInput.java | 221 ------- .../impl/actions/SaveAllWorkflowsAction.java | 104 ---- .../file/impl/actions/SaveWorkflowAction.java | 175 ------ .../file/impl/actions/SaveWorkflowAsAction.java | 219 ------- .../impl/hooks/CloseWorkflowsOnShutdown.java | 56 -- .../file/impl/menu/FileCloseAllMenuAction.java | 51 -- .../file/impl/menu/FileCloseMenuAction.java | 50 -- .../file/impl/menu/FileNewMenuAction.java | 47 -- .../impl/menu/FileOpenFromURLMenuAction.java | 48 -- .../file/impl/menu/FileOpenMenuAction.java | 47 -- .../file/impl/menu/FileOpenMenuSection.java | 36 -- .../impl/menu/FileOpenRecentMenuAction.java | 418 ------------- .../file/impl/menu/FileSaveAllMenuAction.java | 47 -- .../file/impl/menu/FileSaveAsMenuAction.java | 43 -- .../file/impl/menu/FileSaveMenuAction.java | 46 -- .../file/impl/menu/FileSaveMenuSection.java | 36 -- .../workbench/file/impl/menu/WorkflowsMenu.java | 163 ----- .../file/impl/toolbar/CloseToolbarAction.java | 55 -- .../impl/toolbar/FileToolbarMenuSection.java | 36 -- .../file/impl/toolbar/NewToolbarAction.java | 47 -- .../file/impl/toolbar/OpenToolbarAction.java | 47 -- .../OpenWorkflowFromURLToolbarAction.java | 47 -- .../file/impl/toolbar/SaveToolbarAction.java | 50 -- .../DataflowFromDataflowPersistenceHandler.java | 65 ++ .../DataflowPersistenceHandlerRegistry.java | 237 ++++++++ .../workbench/file/impl/FileDataflowInfo.java | 66 ++ .../workbench/file/impl/FileManagerImpl.java | 600 ++++++++++++++++++ .../workbench/file/impl/FileTypeFileFilter.java | 54 ++ .../workbench/file/impl/MultipleFileTypes.java | 57 ++ .../file/impl/OpenDataflowInProgressDialog.java | 86 +++ .../workbench/file/impl/OpenDataflowInfo.java | 92 +++ .../file/impl/OpenDataflowRunnable.java | 87 +++ .../file/impl/OpenDataflowSwingWorker.java | 66 ++ .../workbench/file/impl/T2DataflowOpener.java | 143 +++++ .../workbench/file/impl/T2FileFilter.java | 36 ++ .../workbench/file/impl/T2FlowFileType.java | 41 ++ .../file/impl/WorkflowBundleFileFilter.java | 36 ++ .../file/impl/WorkflowBundleFileType.java | 41 ++ .../file/impl/WorkflowBundleOpener.java | 142 +++++ .../file/impl/WorkflowBundleSaver.java | 144 +++++ .../impl/actions/CloseAllWorkflowsAction.java | 84 +++ .../file/impl/actions/CloseWorkflowAction.java | 106 ++++ .../file/impl/actions/NewWorkflowAction.java | 57 ++ .../impl/actions/OpenNestedWorkflowAction.java | 75 +++ .../file/impl/actions/OpenWorkflowAction.java | 394 ++++++++++++ .../impl/actions/OpenWorkflowFromURLAction.java | 138 +++++ .../file/impl/actions/PasswordInput.java | 220 +++++++ .../impl/actions/SaveAllWorkflowsAction.java | 103 ++++ .../file/impl/actions/SaveWorkflowAction.java | 174 ++++++ .../file/impl/actions/SaveWorkflowAsAction.java | 218 +++++++ .../impl/hooks/CloseWorkflowsOnShutdown.java | 55 ++ .../file/impl/menu/FileCloseAllMenuAction.java | 50 ++ .../file/impl/menu/FileCloseMenuAction.java | 49 ++ .../file/impl/menu/FileNewMenuAction.java | 46 ++ .../impl/menu/FileOpenFromURLMenuAction.java | 47 ++ .../file/impl/menu/FileOpenMenuAction.java | 46 ++ .../file/impl/menu/FileOpenMenuSection.java | 35 ++ .../impl/menu/FileOpenRecentMenuAction.java | 437 ++++++++++++++ .../file/impl/menu/FileSaveAllMenuAction.java | 46 ++ .../file/impl/menu/FileSaveAsMenuAction.java | 42 ++ .../file/impl/menu/FileSaveMenuAction.java | 45 ++ .../file/impl/menu/FileSaveMenuSection.java | 35 ++ .../workbench/file/impl/menu/WorkflowsMenu.java | 162 +++++ .../file/impl/toolbar/CloseToolbarAction.java | 54 ++ .../impl/toolbar/FileToolbarMenuSection.java | 35 ++ .../file/impl/toolbar/NewToolbarAction.java | 46 ++ .../file/impl/toolbar/OpenToolbarAction.java | 46 ++ .../OpenWorkflowFromURLToolbarAction.java | 46 ++ .../file/impl/toolbar/SaveToolbarAction.java | 49 ++ .../org.apache.taverna.ui.menu.MenuComponent | 36 +- .../org.apache.taverna.workbench.ShutdownSPI | 2 +- ...na.workbench.file.DataflowPersistenceHandler | 4 +- ...rg.apache.taverna.workbench.file.FileManager | 2 +- .../t2/workbench/file/impl/FileManagerTest.java | 385 ------------ .../workbench/file/impl/FileManagerTest.java | 384 ++++++++++++ .../workbench/file/impl/dummy-workflow.t2flow | 157 ----- .../workbench/file/impl/dummy-workflow.t2flow | 157 +++++ taverna-graph-model/pom.xml | 5 - .../views/graph/AutoScrollInteractor.java | 181 ------ .../views/graph/GraphViewComponent.java | 548 ----------------- .../views/graph/GraphViewComponentFactory.java | 100 --- .../views/graph/actions/AddWFInputAction.java | 69 --- .../views/graph/actions/AddWFOutputAction.java | 69 --- .../actions/DeleteGraphComponentAction.java | 180 ------ .../RenameWFInputOutputProcessorAction.java | 184 ------ .../graph/config/GraphViewConfiguration.java | 80 --- .../config/GraphViewConfigurationPanel.java | 360 ----------- .../config/GraphViewConfigurationUIFactory.java | 55 -- .../views/graph/menu/AddWFInputMenuAction.java | 60 -- .../views/graph/menu/AddWFOutputMenuAction.java | 60 -- .../menu/DeleteGraphComponentMenuAction.java | 61 -- .../workbench/views/graph/menu/DiagramMenu.java | 44 -- .../graph/menu/DiagramSaveMenuSection.java | 39 -- .../graph/menu/DiagramZoomMenuSection.java | 40 -- .../views/graph/menu/GraphCopyMenuSection.java | 39 -- .../graph/menu/GraphDeleteMenuSection.java | 39 -- .../graph/menu/GraphDetailsMenuSection.java | 40 -- .../views/graph/menu/GraphEditMenuSection.java | 39 -- .../views/graph/menu/GraphMenuSection.java | 39 -- .../workbench/views/graph/menu/InsertMenu.java | 30 - .../RenameWFInputOutputProcessorMenuAction.java | 62 -- .../views/graph/menu/ResetDiagramAction.java | 64 -- .../graph/menu/ResetDiagramMenuAction.java | 50 -- .../views/graph/menu/SaveGraphImageSubMenu.java | 315 ---------- .../views/graph/menu/ZoomInAction.java | 72 --- .../views/graph/menu/ZoomInMenuAction.java | 50 -- .../views/graph/menu/ZoomOutAction.java | 65 -- .../views/graph/menu/ZoomOutMenuAction.java | 50 -- .../graph/toolbar/AddWFInputToolbarAction.java | 60 -- .../graph/toolbar/AddWFOutputToolbarAction.java | 60 -- .../DeleteGraphComponentToolbarAction.java | 60 -- .../toolbar/GraphDeleteToolbarSection.java | 39 -- .../graph/toolbar/GraphEditToolbarSection.java | 39 -- ...nameWFInputOutputProcessorToolbarAction.java | 63 -- .../views/graph/AutoScrollInteractor.java | 200 ++++++ .../views/graph/GraphViewComponent.java | 547 +++++++++++++++++ .../views/graph/GraphViewComponentFactory.java | 99 +++ .../views/graph/actions/AddWFInputAction.java | 68 +++ .../views/graph/actions/AddWFOutputAction.java | 68 +++ .../actions/DeleteGraphComponentAction.java | 179 ++++++ .../RenameWFInputOutputProcessorAction.java | 183 ++++++ .../graph/config/GraphViewConfiguration.java | 79 +++ .../config/GraphViewConfigurationPanel.java | 359 +++++++++++ .../config/GraphViewConfigurationUIFactory.java | 54 ++ .../views/graph/menu/AddWFInputMenuAction.java | 59 ++ .../views/graph/menu/AddWFOutputMenuAction.java | 59 ++ .../menu/DeleteGraphComponentMenuAction.java | 60 ++ .../workbench/views/graph/menu/DiagramMenu.java | 43 ++ .../graph/menu/DiagramSaveMenuSection.java | 38 ++ .../graph/menu/DiagramZoomMenuSection.java | 39 ++ .../views/graph/menu/GraphCopyMenuSection.java | 38 ++ .../graph/menu/GraphDeleteMenuSection.java | 38 ++ .../graph/menu/GraphDetailsMenuSection.java | 39 ++ .../views/graph/menu/GraphEditMenuSection.java | 38 ++ .../views/graph/menu/GraphMenuSection.java | 38 ++ .../workbench/views/graph/menu/InsertMenu.java | 46 ++ .../RenameWFInputOutputProcessorMenuAction.java | 61 ++ .../views/graph/menu/ResetDiagramAction.java | 63 ++ .../graph/menu/ResetDiagramMenuAction.java | 49 ++ .../views/graph/menu/SaveGraphImageSubMenu.java | 314 ++++++++++ .../views/graph/menu/ZoomInAction.java | 71 +++ .../views/graph/menu/ZoomInMenuAction.java | 49 ++ .../views/graph/menu/ZoomOutAction.java | 64 ++ .../views/graph/menu/ZoomOutMenuAction.java | 49 ++ .../graph/toolbar/AddWFInputToolbarAction.java | 59 ++ .../graph/toolbar/AddWFOutputToolbarAction.java | 59 ++ .../DeleteGraphComponentToolbarAction.java | 59 ++ .../toolbar/GraphDeleteToolbarSection.java | 38 ++ .../graph/toolbar/GraphEditToolbarSection.java | 38 ++ ...nameWFInputOutputProcessorToolbarAction.java | 62 ++ .../org.apache.taverna.ui.menu.MenuComponent | 50 +- ...rkbench.configuration.ConfigurationUIFactory | 2 +- ...rna.workbench.ui.zaria.UIComponentFactorySPI | 2 +- ...he.taverna.workbench.ui.zaria.UIComponentSPI | 2 +- .../src/test/resources/nested_iteration.t2flow | 54 +- taverna-httpproxy-config/pom.xml | 11 +- .../config/HttpProxyConfigurationPanel.java | 2 +- .../config/HttpProxyConfigurationUIFactory.java | 2 +- taverna-loop-ui/pom.xml | 8 +- .../workbench/loop/LoopConfigurationPanel.java | 4 +- .../workbench/loop/LoopConfigureAction.java | 2 + .../workbench/loop/LoopConfigureMenuAction.java | 1 + .../workbench/loop/LoopRemoveMenuAction.java | 1 + .../workbench/loop/ShowContextualView.java | 2 +- taverna-menu-items/pom.xml | 22 +- .../AddInputPortDefaultValueAction.java | 2 +- taverna-monitor-view/pom.xml | 12 +- .../monitor/graph/MonitorGraphComponent.java | 8 +- .../WorkflowRunProgressTreeTable.java | 2 +- taverna-perspective-design/pom.xml | 5 - .../myexperiment/MainComponent.java | 4 +- .../myexperiment/MainComponentShutdownHook.java | 2 +- .../myexperiment/model/Base64$InputStream.class | Bin 2083 -> 0 bytes .../model/Base64$OutputStream.class | Bin 2307 -> 0 bytes .../myexperiment/model/Base64.class | Bin 15458 -> 0 bytes .../perspectives/myexperiment/model/Base64.java | 2 +- .../myexperiment/model/MyExperimentClient.class | Bin 3174 -> 0 bytes .../results/ResultsPerspectiveComponent.java | 8 +- taverna-renderers-exts/pom.xml | 5 + .../apache/taverna/renderers/PDFRenderer.java | 3 - .../taverna/renderers/SeqVistaRenderer.java | 3 - .../report/explainer/BasicExplainer.java | 16 +- .../report/impl/ReportManagerImpl.java | 12 +- .../workbench/ui/impl/WorkbenchImpl.java | 20 +- taverna-workflow-explorer/pom.xml | 6 +- 232 files changed, 9386 insertions(+), 9391 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java ---------------------------------------------------------------------- diff --git a/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java b/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java index 51dcacb..b9d326a 100644 --- a/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java +++ b/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java @@ -20,7 +20,6 @@ ******************************************************************************/ package org.apache.taverna.workbench.ui.activitypalette; -import org.apache.taverna.workbench.ui.activitypalette.ActivityPaletteConfiguration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-configuration-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-configuration-impl/pom.xml b/taverna-configuration-impl/pom.xml index 56b57df..2b19bc4 100644 --- a/taverna-configuration-impl/pom.xml +++ b/taverna-configuration-impl/pom.xml @@ -42,6 +42,11 @@ <artifactId>taverna-configuration-ui-api</artifactId> <version>${project.parent.version}</version> </dependency> + <dependency> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-configuration-ui-impl</artifactId> + <version>${project.parent.version}</version> + </dependency> <dependency> <groupId>org.apache.taverna.osgi</groupId> <artifactId>taverna-configuration-api</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-dataflow-activity-ui/src/main/java/org/apache/taverna/workbench/file/importworkflow/menu/AddNestedWorkflowMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-dataflow-activity-ui/src/main/java/org/apache/taverna/workbench/file/importworkflow/menu/AddNestedWorkflowMenuAction.java b/taverna-dataflow-activity-ui/src/main/java/org/apache/taverna/workbench/file/importworkflow/menu/AddNestedWorkflowMenuAction.java index 759d24a..8b17e23 100644 --- a/taverna-dataflow-activity-ui/src/main/java/org/apache/taverna/workbench/file/importworkflow/menu/AddNestedWorkflowMenuAction.java +++ b/taverna-dataflow-activity-ui/src/main/java/org/apache/taverna/workbench/file/importworkflow/menu/AddNestedWorkflowMenuAction.java @@ -35,7 +35,7 @@ import org.apache.taverna.workbench.edits.EditManager; import org.apache.taverna.workbench.file.FileManager; import org.apache.taverna.workbench.file.importworkflow.actions.AddNestedWorkflowAction; import org.apache.taverna.workbench.selection.SelectionManager; -import net.sf.taverna.t2.workbench.views.graph.menu.InsertMenu; +import org.apache.taverna.workbench.views.graph.menu.InsertMenu; /** * An action to add a nested workflow activity + a wrapping processor to the http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-dataflow-activity-ui/src/test/java/org/apache/taverna/workbench/file/importworkflow/gui/ImportWizardLauncher.java ---------------------------------------------------------------------- diff --git a/taverna-dataflow-activity-ui/src/test/java/org/apache/taverna/workbench/file/importworkflow/gui/ImportWizardLauncher.java b/taverna-dataflow-activity-ui/src/test/java/org/apache/taverna/workbench/file/importworkflow/gui/ImportWizardLauncher.java index 96f67bf..52a04b9 100644 --- a/taverna-dataflow-activity-ui/src/test/java/org/apache/taverna/workbench/file/importworkflow/gui/ImportWizardLauncher.java +++ b/taverna-dataflow-activity-ui/src/test/java/org/apache/taverna/workbench/file/importworkflow/gui/ImportWizardLauncher.java @@ -6,7 +6,7 @@ import javax.swing.UIManager; import org.apache.taverna.workbench.edits.EditManager; import org.apache.taverna.workbench.edits.impl.EditManagerImpl; import org.apache.taverna.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.impl.FileManagerImpl; +import org.apache.taverna.workbench.file.impl.FileManagerImpl; public class ImportWizardLauncher { http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-disabled-activity-ui/src/main/java/org/apache/taverna/activities/disabled/actions/DisabledActivityConfigurationAction.java ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/java/org/apache/taverna/activities/disabled/actions/DisabledActivityConfigurationAction.java b/taverna-disabled-activity-ui/src/main/java/org/apache/taverna/activities/disabled/actions/DisabledActivityConfigurationAction.java index da38c6c..043447f 100644 --- a/taverna-disabled-activity-ui/src/main/java/org/apache/taverna/activities/disabled/actions/DisabledActivityConfigurationAction.java +++ b/taverna-disabled-activity-ui/src/main/java/org/apache/taverna/activities/disabled/actions/DisabledActivityConfigurationAction.java @@ -33,11 +33,13 @@ import org.apache.taverna.scufl2.api.activity.Activity; import org.apache.taverna.activities.disabled.views.DisabledConfigView; import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry; import org.apache.taverna.workbench.activityicons.ActivityIconManager; +import org.apache.taverna.workbench.edits.Edit; import org.apache.taverna.workbench.edits.EditManager; import org.apache.taverna.workbench.file.FileManager; import org.apache.taverna.workbench.report.ReportManager; import org.apache.taverna.workbench.ui.actions.activity.ActivityConfigurationAction; import org.apache.taverna.workbench.ui.views.contextualviews.activity.ActivityConfigurationDialog; +import org.apache.taverna.workflowmodel.Dataflow; @SuppressWarnings("serial") http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-disabled-activity-ui/src/main/java/org/apache/taverna/activities/disabled/views/DisabledConfigView.java ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/java/org/apache/taverna/activities/disabled/views/DisabledConfigView.java b/taverna-disabled-activity-ui/src/main/java/org/apache/taverna/activities/disabled/views/DisabledConfigView.java index b3ec316..2b0abda 100644 --- a/taverna-disabled-activity-ui/src/main/java/org/apache/taverna/activities/disabled/views/DisabledConfigView.java +++ b/taverna-disabled-activity-ui/src/main/java/org/apache/taverna/activities/disabled/views/DisabledConfigView.java @@ -40,6 +40,7 @@ import org.apache.taverna.workbench.ui.views.contextualviews.activity.ActivityCo import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; +import org.apache.taverna.workflowmodel.processor.activity.ActivityAndBeanWrapper; @SuppressWarnings("serial") public class DisabledConfigView extends ActivityConfigurationPanel { http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-edits-api/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-edits-api/pom.xml b/taverna-edits-api/pom.xml index 3ca3a59..8ed6670 100644 --- a/taverna-edits-api/pom.xml +++ b/taverna-edits-api/pom.xml @@ -15,14 +15,16 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.taverna.workbench</groupId> - <artifactId>taverna-workbench</artifactId> - <version>3.1.0-incubating-SNAPSHOT</version> - </parent> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.taverna.workbench</groupId> + <artifactId>taverna-workbench</artifactId> + <version>3.1.0-incubating-SNAPSHOT</version> + </parent> + <artifactId>taverna-edits-api</artifactId> <packaging>bundle</packaging> <name>Apache Edits API</name> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/AbstractDataflowPersistenceHandler.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/AbstractDataflowPersistenceHandler.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/AbstractDataflowPersistenceHandler.java index 71a3c12..3dcec1c 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/AbstractDataflowPersistenceHandler.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/AbstractDataflowPersistenceHandler.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/DataflowInfo.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/DataflowInfo.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/DataflowInfo.java index b841aa9..0b24212 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/DataflowInfo.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/DataflowInfo.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file; import java.util.Date; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/DataflowPersistenceHandler.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/DataflowPersistenceHandler.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/DataflowPersistenceHandler.java index b3cc260..5480c9b 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/DataflowPersistenceHandler.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/DataflowPersistenceHandler.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file; import java.io.File; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/FileManager.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/FileManager.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/FileManager.java index 7626de5..a4ac86a 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/FileManager.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/FileManager.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file; import java.io.File; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/FileType.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/FileType.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/FileType.java index ef2d53c..93fcf99 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/FileType.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/FileType.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file; /** http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/AbstractDataflowEvent.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/AbstractDataflowEvent.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/AbstractDataflowEvent.java index fa97fe0..93ad5f1 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/AbstractDataflowEvent.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/AbstractDataflowEvent.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.events; import org.apache.taverna.scufl2.api.container.WorkflowBundle; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/ClosedDataflowEvent.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/ClosedDataflowEvent.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/ClosedDataflowEvent.java index ac69c89..8b70385 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/ClosedDataflowEvent.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/ClosedDataflowEvent.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.events; import org.apache.taverna.scufl2.api.container.WorkflowBundle; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/ClosingDataflowEvent.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/ClosingDataflowEvent.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/ClosingDataflowEvent.java index 26142b5..baa1176 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/ClosingDataflowEvent.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/ClosingDataflowEvent.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.events; import org.apache.taverna.scufl2.api.container.WorkflowBundle; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/FileManagerEvent.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/FileManagerEvent.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/FileManagerEvent.java index 025ea97..8cd04cb 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/FileManagerEvent.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/FileManagerEvent.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.events; import org.apache.taverna.lang.observer.Observable; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/OpenedDataflowEvent.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/OpenedDataflowEvent.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/OpenedDataflowEvent.java index 31f8222..f72908e 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/OpenedDataflowEvent.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/OpenedDataflowEvent.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.events; import org.apache.taverna.scufl2.api.container.WorkflowBundle; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/SavedDataflowEvent.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/SavedDataflowEvent.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/SavedDataflowEvent.java index 70fc778..0408f16 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/SavedDataflowEvent.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/SavedDataflowEvent.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.events; import org.apache.taverna.scufl2.api.container.WorkflowBundle; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/SetCurrentDataflowEvent.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/SetCurrentDataflowEvent.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/SetCurrentDataflowEvent.java index cd27705..ec286b0 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/SetCurrentDataflowEvent.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/events/SetCurrentDataflowEvent.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.events; import org.apache.taverna.scufl2.api.container.WorkflowBundle; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/FileException.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/FileException.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/FileException.java index 67e17ac..0bfe23a 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/FileException.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/FileException.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.exceptions; import org.apache.taverna.workbench.file.FileManager; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/OpenException.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/OpenException.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/OpenException.java index e687c94..97649d4 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/OpenException.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/OpenException.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.exceptions; /** Indicate that something went wrong during opening a file */ http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/OverwriteException.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/OverwriteException.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/OverwriteException.java index fff8aa0..73ff4e0 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/OverwriteException.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/OverwriteException.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.exceptions; /** Indicate that something could not be overwritten. */ http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/SaveException.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/SaveException.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/SaveException.java index 4d2866f..3b775b3 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/SaveException.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/SaveException.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.exceptions; /** Indicate that a workflow could not be saved. */ http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/UnsavedException.java ---------------------------------------------------------------------- diff --git a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/UnsavedException.java b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/UnsavedException.java index a72606d..e3bab5c 100644 --- a/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/UnsavedException.java +++ b/taverna-file-api/src/main/java/org/apache/taverna/workbench/file/exceptions/UnsavedException.java @@ -1,23 +1,22 @@ -/******************************************************************************* - * 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 - ******************************************************************************/ +/* +* 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.file.exceptions; import org.apache.taverna.scufl2.api.container.WorkflowBundle; http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/DataflowFromDataflowPersistenceHandler.java ---------------------------------------------------------------------- diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/DataflowFromDataflowPersistenceHandler.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/DataflowFromDataflowPersistenceHandler.java deleted file mode 100644 index 0c498bc..0000000 --- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/DataflowFromDataflowPersistenceHandler.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * - */ -package net.sf.taverna.t2.workbench.file.impl; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -import org.apache.taverna.workbench.file.AbstractDataflowPersistenceHandler; -import org.apache.taverna.workbench.file.DataflowInfo; -import org.apache.taverna.workbench.file.DataflowPersistenceHandler; -import org.apache.taverna.workbench.file.FileType; -import org.apache.taverna.workbench.file.exceptions.OpenException; -import org.apache.taverna.scufl2.api.container.WorkflowBundle; -import org.apache.taverna.scufl2.api.core.Workflow; - -/** - * @author alanrw - */ -public class DataflowFromDataflowPersistenceHandler extends - AbstractDataflowPersistenceHandler implements - DataflowPersistenceHandler { - private static final WorkflowBundleFileType WORKFLOW_BUNDLE_FILE_TYPE = new WorkflowBundleFileType(); - - @Override - public DataflowInfo openDataflow(FileType fileType, Object source) - throws OpenException { - if (!getOpenFileTypes().contains(fileType)) - throw new IllegalArgumentException("Unsupported file type " - + fileType); - - WorkflowBundle workflowBundle = (WorkflowBundle) source; - Date lastModified = null; - Object canonicalSource = null; - return new DataflowInfo(WORKFLOW_BUNDLE_FILE_TYPE, canonicalSource, - workflowBundle, lastModified); - } - - @Override - public List<FileType> getOpenFileTypes() { - return Arrays.<FileType> asList(WORKFLOW_BUNDLE_FILE_TYPE); - } - - @Override - public List<Class<?>> getOpenSourceTypes() { - return Arrays.<Class<?>> asList(Workflow.class); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/DataflowPersistenceHandlerRegistry.java ---------------------------------------------------------------------- diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/DataflowPersistenceHandlerRegistry.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/DataflowPersistenceHandlerRegistry.java deleted file mode 100644 index c33119d..0000000 --- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/DataflowPersistenceHandlerRegistry.java +++ /dev/null @@ -1,238 +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.file.impl; - -import static org.apache.commons.collections.map.LazyMap.decorate; -import static org.apache.commons.lang.ClassUtils.getAllInterfaces; -import static org.apache.commons.lang.ClassUtils.getAllSuperclasses; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.taverna.workbench.file.DataflowPersistenceHandler; -import org.apache.taverna.workbench.file.FileType; - -import org.apache.commons.collections.Factory; - -// TODO: Cache lookups / build one massive structure -public class DataflowPersistenceHandlerRegistry { - private static final MapFactory MAP_FACTORY = new MapFactory(); - private static final SetFactory SET_FACTORY = new SetFactory(); - - @SuppressWarnings("unchecked") - protected static List<Class<?>> findAllParentClasses( - final Class<?> sourceClass) { - List<Class<?>> superClasses = new ArrayList<>(); - superClasses.add(sourceClass); - superClasses.addAll(getAllSuperclasses(sourceClass)); - superClasses.addAll(getAllInterfaces(sourceClass)); - return superClasses; - } - - private Map<Class<?>, Set<DataflowPersistenceHandler>> openClassToHandlers; - private Map<Class<?>, Set<FileType>> openClassToTypes; - private Map<FileType, Map<Class<?>, Set<DataflowPersistenceHandler>>> openFileClassToHandler; - private Map<FileType, Set<DataflowPersistenceHandler>> openFileToHandler; - private Map<Class<?>, Set<DataflowPersistenceHandler>> saveClassToHandlers; - private Map<Class<?>, Set<FileType>> saveClassToTypes; - private Map<FileType, Map<Class<?>, Set<DataflowPersistenceHandler>>> saveFileClassToHandler; - private Map<FileType, Set<DataflowPersistenceHandler>> saveFileToHandler; - - private List<DataflowPersistenceHandler> dataflowPersistenceHandlers; - - public DataflowPersistenceHandlerRegistry() { - } - - public Set<FileType> getOpenFileTypes() { - return getOpenFileClassToHandler().keySet(); - } - - public Set<FileType> getOpenFileTypesFor(Class<?> sourceClass) { - Set<FileType> fileTypes = new LinkedHashSet<>(); - for (Class<?> candidateClass : findAllParentClasses(sourceClass)) - fileTypes.addAll(getOpenClassToTypes().get(candidateClass)); - return fileTypes; - } - - public Set<DataflowPersistenceHandler> getOpenHandlersFor( - Class<? extends Object> sourceClass) { - Set<DataflowPersistenceHandler> handlers = new LinkedHashSet<>(); - for (Class<?> candidateClass : findAllParentClasses(sourceClass)) - handlers.addAll(getOpenClassToHandlers().get(candidateClass)); - return handlers; - } - - public Set<DataflowPersistenceHandler> getOpenHandlersFor( - FileType fileType, Class<? extends Object> sourceClass) { - Set<DataflowPersistenceHandler> handlers = new LinkedHashSet<>(); - for (Class<?> candidateClass : findAllParentClasses(sourceClass)) - handlers.addAll(getOpenFileClassToHandler().get(fileType).get( - candidateClass)); - return handlers; - } - - public Set<DataflowPersistenceHandler> getOpenHandlersForType( - FileType fileType) { - return getOpenFileToHandler().get(fileType); - } - - public synchronized Set<DataflowPersistenceHandler> getOpenHandlersForType( - FileType fileType, Class<?> sourceClass) { - Set<DataflowPersistenceHandler> handlers = new LinkedHashSet<>(); - for (Class<?> candidateClass : findAllParentClasses(sourceClass)) - handlers.addAll(getOpenFileClassToHandler().get(fileType).get( - candidateClass)); - return handlers; - } - - public Set<FileType> getSaveFileTypes() { - return getSaveFileClassToHandler().keySet(); - } - - public Set<FileType> getSaveFileTypesFor(Class<?> destinationClass) { - Set<FileType> fileTypes = new LinkedHashSet<>(); - for (Class<?> candidateClass : findAllParentClasses(destinationClass)) - fileTypes.addAll(getSaveClassToTypes().get(candidateClass)); - return fileTypes; - } - - public Set<DataflowPersistenceHandler> getSaveHandlersFor( - Class<? extends Object> destinationClass) { - Set<DataflowPersistenceHandler> handlers = new LinkedHashSet<>(); - for (Class<?> candidateClass : findAllParentClasses(destinationClass)) - handlers.addAll(getSaveClassToHandlers().get(candidateClass)); - return handlers; - } - - public Set<DataflowPersistenceHandler> getSaveHandlersForType( - FileType fileType, Class<?> destinationClass) { - Set<DataflowPersistenceHandler> handlers = new LinkedHashSet<>(); - for (Class<?> candidateClass : findAllParentClasses(destinationClass)) - handlers.addAll(getSaveFileClassToHandler().get(fileType).get( - candidateClass)); - return handlers; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - private synchronized void createCollections() { - openFileClassToHandler = decorate(new HashMap(), MAP_FACTORY); - openFileToHandler = decorate(new HashMap(), SET_FACTORY); - openClassToTypes = decorate(new HashMap(), SET_FACTORY); - openClassToHandlers = decorate(new HashMap(), SET_FACTORY); - - saveFileClassToHandler = decorate(new HashMap(), MAP_FACTORY); - saveFileToHandler = decorate(new HashMap(), SET_FACTORY); - saveClassToTypes = decorate(new HashMap(), SET_FACTORY); - saveClassToHandlers = decorate(new HashMap(), SET_FACTORY); - } - - private Map<Class<?>, Set<DataflowPersistenceHandler>> getOpenClassToHandlers() { - return openClassToHandlers; - } - - private synchronized Map<Class<?>, Set<FileType>> getOpenClassToTypes() { - return openClassToTypes; - } - - private synchronized Map<FileType, Map<Class<?>, Set<DataflowPersistenceHandler>>> getOpenFileClassToHandler() { - return openFileClassToHandler; - } - - private Map<FileType, Set<DataflowPersistenceHandler>> getOpenFileToHandler() { - return openFileToHandler; - } - - private Map<Class<?>, Set<DataflowPersistenceHandler>> getSaveClassToHandlers() { - return saveClassToHandlers; - } - - private synchronized Map<Class<?>, Set<FileType>> getSaveClassToTypes() { - return saveClassToTypes; - } - - private synchronized Map<FileType, Map<Class<?>, Set<DataflowPersistenceHandler>>> getSaveFileClassToHandler() { - return saveFileClassToHandler; - } - - /** - * Bind method for SpringDM. - * - * @param service - * @param properties - */ - public void update(Object service, Map<?, ?> properties) { - if (dataflowPersistenceHandlers != null) - updateColletions(); - } - - public synchronized void updateColletions() { - createCollections(); - for (DataflowPersistenceHandler handler : dataflowPersistenceHandlers) { - for (FileType openFileType : handler.getOpenFileTypes()) { - Set<DataflowPersistenceHandler> set = openFileToHandler - .get(openFileType); - set.add(handler); - for (Class<?> openClass : handler.getOpenSourceTypes()) { - openFileClassToHandler.get(openFileType).get(openClass) - .add(handler); - openClassToTypes.get(openClass).add(openFileType); - } - } - for (Class<?> openClass : handler.getOpenSourceTypes()) - openClassToHandlers.get(openClass).add(handler); - - for (FileType saveFileType : handler.getSaveFileTypes()) { - saveFileToHandler.get(saveFileType).add(handler); - for (Class<?> saveClass : handler.getSaveDestinationTypes()) { - saveFileClassToHandler.get(saveFileType).get(saveClass) - .add(handler); - saveClassToTypes.get(saveClass).add(saveFileType); - } - } - for (Class<?> openClass : handler.getSaveDestinationTypes()) - saveClassToHandlers.get(openClass).add(handler); - } - } - - public void setDataflowPersistenceHandlers( - List<DataflowPersistenceHandler> dataflowPersistenceHandlers) { - this.dataflowPersistenceHandlers = dataflowPersistenceHandlers; - } - - private static class MapFactory implements Factory { - @Override - @SuppressWarnings("rawtypes") - public Object create() { - return decorate(new HashMap(), SET_FACTORY); - } - } - - private static class SetFactory implements Factory { - @Override - public Object create() { - return new LinkedHashSet<Object>(); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/bf8a7ea2/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/FileDataflowInfo.java ---------------------------------------------------------------------- diff --git a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/FileDataflowInfo.java b/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/FileDataflowInfo.java deleted file mode 100644 index b7377e9..0000000 --- a/taverna-file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/FileDataflowInfo.java +++ /dev/null @@ -1,67 +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.file.impl; - -import java.io.File; -import java.io.IOException; -import java.util.Date; - -import org.apache.taverna.workbench.file.DataflowInfo; -import org.apache.taverna.workbench.file.FileManager; -import org.apache.taverna.workbench.file.FileType; - -import org.apache.log4j.Logger; - -import org.apache.taverna.scufl2.api.container.WorkflowBundle; - -/** - * Information about an open dataflow that was opened from or saved to a - * {@link File}. - * - * @see DataflowInfo - * @see FileManager - * @author Stian Soiland-Reyes - */ -public class FileDataflowInfo extends DataflowInfo { - private static Logger logger = Logger.getLogger(FileDataflowInfo.class); - - public FileDataflowInfo(FileType fileType, File source, - WorkflowBundle workflowBundle) { - super(fileType, canonicalFile(source), workflowBundle, - lastModifiedFile(source)); - } - - protected static Date lastModifiedFile(File file) { - long lastModifiedLong = file.lastModified(); - if (lastModifiedLong == 0) - return null; - return new Date(lastModifiedLong); - } - - public static File canonicalFile(File file) { - try { - return file.getCanonicalFile(); - } catch (IOException e) { - logger.warn("Could not find canonical file for " + file); - return file; - } - } -}
