http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentMenu.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentMenu.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentMenu.java index f9fa643..c499ccf 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentMenu.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentMenu.java @@ -1,13 +1,27 @@ -/** - * - */ -package org.apache.taverna.component.ui.menu; +/* +* 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. +*/ -import static net.sf.taverna.t2.ui.menu.DefaultMenuBar.DEFAULT_MENU_BAR; +package org.apache.taverna.component.ui.menu; import java.net.URI; - -import net.sf.taverna.t2.ui.menu.AbstractMenu; +import org.apache.taverna.ui.menu.AbstractMenu; +import static org.apache.taverna.ui.menu.DefaultMenuBar.DEFAULT_MENU_BAR; /** * @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentSection.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentSection.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentSection.java index efeadb0..851de06 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentSection.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ComponentSection.java @@ -1,11 +1,26 @@ -/** - * - */ +/* +* 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.component.ui.menu; import java.net.URI; - -import net.sf.taverna.t2.ui.menu.AbstractMenuSection; +import org.apache.taverna.ui.menu.AbstractMenuSection; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreationDialog.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreationDialog.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreationDialog.java index 16cb8d1..cff2964 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreationDialog.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreationDialog.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu; import static java.awt.BorderLayout.CENTER; @@ -44,28 +60,30 @@ import javax.swing.JScrollPane; import javax.swing.JTextField; import javax.swing.ListCellRenderer; -import net.sf.taverna.t2.lang.ui.DeselectingButton; -import net.sf.taverna.t2.workbench.edits.CompoundEdit; -import net.sf.taverna.t2.workbench.edits.Edit; -import net.sf.taverna.t2.workbench.edits.EditException; -import net.sf.taverna.t2.workbench.edits.EditManager; -import net.sf.taverna.t2.workbench.helper.HelpEnabledDialog; -import net.sf.taverna.t2.workbench.models.graph.GraphController; -import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent; -import net.sf.taverna.t2.workflow.edits.AddActivityEdit; -import net.sf.taverna.t2.workflow.edits.AddActivityInputPortMappingEdit; -import net.sf.taverna.t2.workflow.edits.AddActivityOutputPortMappingEdit; -import net.sf.taverna.t2.workflow.edits.AddChildEdit; -import net.sf.taverna.t2.workflow.edits.AddDataLinkEdit; -import net.sf.taverna.t2.workflow.edits.AddProcessorInputPortEdit; -import net.sf.taverna.t2.workflow.edits.AddProcessorOutputPortEdit; -import net.sf.taverna.t2.workflow.edits.AddWorkflowInputPortEdit; -import net.sf.taverna.t2.workflow.edits.AddWorkflowOutputPortEdit; -import net.sf.taverna.t2.workflow.edits.RemoveChildEdit; -import net.sf.taverna.t2.workflow.edits.RemoveDataLinkEdit; -import net.sf.taverna.t2.workflow.edits.SetIterationStrategyStackEdit; +//import net.sf.taverna.t2.lang.ui.DeselectingButton; +//import net.sf.taverna.t2.workbench.edits.CompoundEdit; +//import net.sf.taverna.t2.workbench.edits.Edit; +//import net.sf.taverna.t2.workbench.edits.EditException; +//import net.sf.taverna.t2.workbench.edits.EditManager; +//import net.sf.taverna.t2.workbench.helper.HelpEnabledDialog; +//import net.sf.taverna.t2.workbench.models.graph.GraphController; +//import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent; +//import net.sf.taverna.t2.workflow.edits.AddActivityEdit; +//import net.sf.taverna.t2.workflow.edits.AddActivityInputPortMappingEdit; +//import net.sf.taverna.t2.workflow.edits.AddActivityOutputPortMappingEdit; +//import net.sf.taverna.t2.workflow.edits.AddChildEdit; +//import net.sf.taverna.t2.workflow.edits.AddDataLinkEdit; +//import net.sf.taverna.t2.workflow.edits.AddProcessorInputPortEdit; +//import net.sf.taverna.t2.workflow.edits.AddProcessorOutputPortEdit; +//import net.sf.taverna.t2.workflow.edits.AddWorkflowInputPortEdit; +//import net.sf.taverna.t2.workflow.edits.AddWorkflowOutputPortEdit; +//import net.sf.taverna.t2.workflow.edits.RemoveChildEdit; +//import net.sf.taverna.t2.workflow.edits.RemoveDataLinkEdit; +//import net.sf.taverna.t2.workflow.edits.SetIterationStrategyStackEdit; import org.apache.log4j.Logger; +import org.apache.taverna.annotation.annotationbeans.DescriptiveTitle; +import org.apache.taverna.lang.ui.DeselectingButton; import org.apache.taverna.scufl2.api.activity.Activity; import org.apache.taverna.scufl2.api.annotation.Annotation; @@ -88,6 +106,26 @@ import org.apache.taverna.scufl2.api.port.ProcessorPort; import org.apache.taverna.scufl2.api.port.ReceiverPort; import org.apache.taverna.scufl2.api.port.SenderPort; import org.apache.taverna.scufl2.api.profiles.Profile; +import org.apache.taverna.workbench.edits.CompoundEdit; +import org.apache.taverna.workbench.edits.Edit; +import org.apache.taverna.workbench.edits.EditException; +import org.apache.taverna.workbench.edits.EditManager; +import org.apache.taverna.workbench.helper.HelpEnabledDialog; +import org.apache.taverna.workbench.models.graph.GraphController; +import org.apache.taverna.workbench.views.graph.GraphViewComponent; +import org.apache.taverna.workflow.edits.AddActivityEdit; +import org.apache.taverna.workflow.edits.AddActivityInputPortMappingEdit; +import org.apache.taverna.workflow.edits.AddActivityOutputPortMappingEdit; +import org.apache.taverna.workflow.edits.AddChildEdit; +import org.apache.taverna.workflow.edits.AddDataLinkEdit; +import org.apache.taverna.workflow.edits.AddProcessorInputPortEdit; +import org.apache.taverna.workflow.edits.AddProcessorOutputPortEdit; +import org.apache.taverna.workflow.edits.AddWorkflowInputPortEdit; +import org.apache.taverna.workflow.edits.AddWorkflowOutputPortEdit; +import org.apache.taverna.workflow.edits.RemoveChildEdit; +import org.apache.taverna.workflow.edits.RemoveDataLinkEdit; +import org.apache.taverna.workflow.edits.SetIterationStrategyStackEdit; +import org.apache.taverna.workflowmodel.utils.AnnotationTools; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreatorMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreatorMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreatorMenuAction.java index 7e281f3..6a503df 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreatorMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/NestedWorkflowCreatorMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu; import java.awt.Dialog; @@ -9,14 +25,14 @@ import java.net.URI; import javax.swing.AbstractAction; import javax.swing.Action; +import org.apache.taverna.activities.dataflow.servicedescriptions.DataflowActivityIcon; -import net.sf.taverna.t2.activities.dataflow.servicedescriptions.DataflowActivityIcon; -import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction; -import net.sf.taverna.t2.workbench.edits.EditManager; -import net.sf.taverna.t2.workbench.selection.SelectionManager; -import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent; import org.apache.taverna.scufl2.api.core.Processor; import org.apache.taverna.scufl2.api.core.Workflow; +import org.apache.taverna.ui.menu.AbstractContextualMenuAction; +import org.apache.taverna.workbench.edits.EditManager; +import org.apache.taverna.workbench.selection.SelectionManager; +import org.apache.taverna.workbench.views.graph.GraphViewComponent; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityAction.java index c6685d6..481f2a0 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu; import static org.apache.log4j.Logger.getLogger; @@ -8,11 +24,6 @@ import static org.apache.log4j.Logger.getLogger; import java.awt.event.ActionEvent; import java.net.MalformedURLException; -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.FileType; -import net.sf.taverna.t2.workbench.file.exceptions.OpenException; -import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.ComponentFactory; import org.apache.taverna.component.api.Version; @@ -22,6 +33,10 @@ import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.scufl2.api.activity.Activity; import org.apache.taverna.scufl2.api.container.WorkflowBundle; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.file.FileType; +import org.apache.taverna.workbench.file.exceptions.OpenException; +import org.apache.taverna.workbench.views.graph.GraphViewComponent; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java index 26eaf91..eb63f96 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/OpenComponentFromComponentActivityMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu; import java.net.URI; @@ -12,11 +28,11 @@ import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.scufl2.api.activity.Activity; import org.apache.taverna.scufl2.api.core.Processor; -import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction; -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.FileType; -import net.sf.taverna.t2.workbench.selection.SelectionManager; -import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent; +import org.apache.taverna.ui.menu.AbstractContextualMenuAction; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.file.FileType; +import org.apache.taverna.workbench.selection.SelectionManager; +import org.apache.taverna.workbench.views.graph.GraphViewComponent; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentAction.java index 7cc713e..06e04ce 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu; import static java.awt.BorderLayout.CENTER; @@ -38,18 +54,6 @@ import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.component.ui.util.Utils; -import net.sf.taverna.t2.workbench.edits.CompoundEdit; -import net.sf.taverna.t2.workbench.edits.Edit; -import net.sf.taverna.t2.workbench.edits.EditException; -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.workflow.edits.AddActivityEdit; -import net.sf.taverna.t2.workflow.edits.AddActivityInputPortMappingEdit; -import net.sf.taverna.t2.workflow.edits.AddActivityOutputPortMappingEdit; -import net.sf.taverna.t2.workflow.edits.RemoveActivityEdit; -import net.sf.taverna.t2.workflow.edits.RenameEdit; -//import net.sf.taverna.t2.workflowmodel.utils.Tools; import org.apache.taverna.scufl2.api.activity.Activity; import org.apache.taverna.scufl2.api.common.Scufl2Tools; import org.apache.taverna.scufl2.api.core.Processor; @@ -58,6 +62,16 @@ import org.apache.taverna.scufl2.api.port.InputActivityPort; import org.apache.taverna.scufl2.api.port.InputProcessorPort; import org.apache.taverna.scufl2.api.port.OutputActivityPort; import org.apache.taverna.scufl2.api.port.OutputProcessorPort; +import org.apache.taverna.workbench.edits.CompoundEdit; +import org.apache.taverna.workbench.edits.Edit; +import org.apache.taverna.workbench.edits.EditException; +import org.apache.taverna.workbench.edits.EditManager; +import org.apache.taverna.workbench.selection.SelectionManager; +import org.apache.taverna.workflow.edits.AddActivityEdit; +import org.apache.taverna.workflow.edits.AddActivityInputPortMappingEdit; +import org.apache.taverna.workflow.edits.AddActivityOutputPortMappingEdit; +import org.apache.taverna.workflow.edits.RemoveActivityEdit; +import org.apache.taverna.workflow.edits.RenameEdit; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentMenuAction.java index de6c62c..674867e 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/ReplaceByComponentMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu; import java.net.URI; @@ -11,10 +27,10 @@ import org.apache.taverna.component.api.ComponentFactory; import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; -import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction; -import net.sf.taverna.t2.workbench.edits.EditManager; -import net.sf.taverna.t2.workbench.selection.SelectionManager; import org.apache.taverna.scufl2.api.core.Processor; +import org.apache.taverna.ui.menu.AbstractContextualMenuAction; +import org.apache.taverna.workbench.edits.EditManager; +import org.apache.taverna.workbench.selection.SelectionManager; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/AbstractComponentMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/AbstractComponentMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/AbstractComponentMenuAction.java index ed1a650..8239e46 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/AbstractComponentMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/AbstractComponentMenuAction.java @@ -1,10 +1,28 @@ +/* +* 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.component.ui.menu.component; import static org.apache.taverna.component.ui.menu.component.ComponentMenuSection.COMPONENT_SECTION; import java.net.URI; - -import net.sf.taverna.t2.ui.menu.AbstractMenuAction; +import org.apache.taverna.ui.menu.AbstractMenuAction; abstract class AbstractComponentMenuAction extends AbstractMenuAction { public AbstractComponentMenuAction(int positionHint, URI id) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseAction.java index 857f9e8..2f3c220 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import static org.apache.log4j.Logger.getLogger; @@ -10,14 +26,13 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import net.sf.taverna.t2.lang.observer.Observable; -import net.sf.taverna.t2.lang.observer.Observer; -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.events.FileManagerEvent; - import org.apache.log4j.Logger; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.component.ui.util.Utils; +import org.apache.taverna.lang.observer.Observable; +import org.apache.taverna.lang.observer.Observer; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.file.events.FileManagerEvent; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseMenuAction.java index f1e6c3b..7b99200 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCloseMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import java.net.URI; @@ -9,8 +25,7 @@ import javax.swing.Action; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.component.ui.util.Utils; - -import net.sf.taverna.t2.workbench.file.FileManager; +import org.apache.taverna.workbench.file.FileManager; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyAction.java index 0a37c21..370064c 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import static java.awt.GridBagConstraints.BOTH; @@ -21,9 +37,6 @@ import javax.swing.AbstractAction; import javax.swing.JPanel; import javax.swing.border.TitledBorder; -import net.sf.taverna.t2.lang.observer.Observable; -import net.sf.taverna.t2.lang.observer.Observer; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.Component; import org.apache.taverna.component.api.ComponentException; @@ -38,6 +51,8 @@ import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceProviderConfig; import org.apache.taverna.component.ui.util.Utils; +import org.apache.taverna.lang.observer.Observable; +import org.apache.taverna.lang.observer.Observer; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyMenuAction.java index c034810..1fb5d49 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCopyMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import java.net.URI; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCreatorSupport.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCreatorSupport.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCreatorSupport.java index 2748317..55b66c2 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCreatorSupport.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentCreatorSupport.java @@ -1,3 +1,22 @@ +/* +* 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.component.ui.menu.component; import static javax.swing.JOptionPane.ERROR_MESSAGE; @@ -6,7 +25,6 @@ import static javax.swing.JOptionPane.OK_OPTION; import static javax.swing.JOptionPane.showConfirmDialog; import static javax.swing.JOptionPane.showMessageDialog; import static org.apache.log4j.Logger.getLogger; -import static org.apache.taverna.component.ui.util.Utils.refreshComponentServiceProvider; import java.io.IOException; import java.util.ArrayList; @@ -23,9 +41,7 @@ import org.apache.taverna.component.ui.ComponentActivityConfigurationBean; import org.apache.taverna.component.ui.panel.RegistryAndFamilyChooserComponentEntryPanel; import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceProviderConfig; -import org.apache.taverna.component.ui.util.ComponentFileType; -import org.jdom.Element; -import org.jdom.JDOMException; +import org.apache.taverna.component.ui.util.Utils; import org.apache.taverna.scufl2.api.activity.Activity; import org.apache.taverna.scufl2.api.container.WorkflowBundle; @@ -36,25 +52,25 @@ import org.apache.taverna.scufl2.api.port.InputProcessorPort; import org.apache.taverna.scufl2.api.port.InputWorkflowPort; import org.apache.taverna.scufl2.api.port.OutputProcessorPort; import org.apache.taverna.scufl2.api.port.OutputWorkflowPort; -import net.sf.taverna.t2.workbench.edits.CompoundEdit; -import net.sf.taverna.t2.workbench.edits.Edit; -import net.sf.taverna.t2.workbench.edits.EditException; -import net.sf.taverna.t2.workbench.edits.EditManager; -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.FileType; -import net.sf.taverna.t2.workbench.file.exceptions.OverwriteException; -import net.sf.taverna.t2.workbench.file.exceptions.SaveException; -import net.sf.taverna.t2.workbench.selection.SelectionManager; -import net.sf.taverna.t2.workflow.edits.AddActivityEdit; -import net.sf.taverna.t2.workflow.edits.AddActivityInputPortMappingEdit; -import net.sf.taverna.t2.workflow.edits.AddActivityOutputPortMappingEdit; -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 net.sf.taverna.t2.workflow.edits.RemoveActivityEdit; -import net.sf.taverna.t2.workflow.edits.RenameEdit; -import static net.sf.taverna.t2.workflowmodel.utils.Tools; +import org.apache.taverna.workbench.edits.CompoundEdit; +import org.apache.taverna.workbench.edits.Edit; +import org.apache.taverna.workbench.edits.EditException; +import org.apache.taverna.workbench.edits.EditManager; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.file.FileType; +import org.apache.taverna.workbench.file.exceptions.SaveException; +import org.apache.taverna.workbench.selection.SelectionManager; +import org.apache.taverna.workflow.edits.AddActivityEdit; +import org.apache.taverna.workflow.edits.AddActivityInputPortMappingEdit; +import org.apache.taverna.workflow.edits.AddActivityOutputPortMappingEdit; +import org.apache.taverna.workflow.edits.AddDataLinkEdit; +import org.apache.taverna.workflow.edits.AddProcessorEdit; +import org.apache.taverna.workflow.edits.AddWorkflowInputPortEdit; +import org.apache.taverna.workflow.edits.AddWorkflowOutputPortEdit; +import org.apache.taverna.workflow.edits.RemoveActivityEdit; +import org.apache.taverna.workflow.edits.RenameEdit; +import org.apache.taverna.workflowmodel.processor.activity.NestedDataflow; +import org.apache.taverna.workflowmodel.utils.Tools; public class ComponentCreatorSupport { private static final Logger logger = getLogger(ComponentCreatorSupport.class); @@ -136,7 +152,7 @@ public class ComponentCreatorSupport { createInitialComponent(d, ident); - refreshComponentServiceProvider(new ComponentServiceProviderConfig( + Utils.refreshComponentServiceProvider(new ComponentServiceProviderConfig( ident)); return new ComponentActivityConfigurationBean(ident, factory); } @@ -210,7 +226,7 @@ public class ComponentCreatorSupport { public Processor pasteProcessor(CopiedProcessor copy, Workflow d) throws ClassNotFoundException, InstantiationException, - IllegalAccessException { + IllegalAccessException, EditException { Processor result = ProcessorXMLDeserializer.getInstance() .deserializeProcessor(copy.processor, copy.requiredSubworkflows); if (result == null) http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentDeleteAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentDeleteAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentDeleteAction.java index 887362c..7c810b4 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentDeleteAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentDeleteAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import static java.lang.String.format; @@ -19,8 +35,6 @@ import java.util.concurrent.ExecutionException; import javax.swing.AbstractAction; import javax.swing.SwingWorker; -import net.sf.taverna.t2.workbench.file.FileManager; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.Component; import org.apache.taverna.component.api.ComponentException; @@ -33,6 +47,7 @@ import org.apache.taverna.component.ui.util.Utils; import org.apache.taverna.scufl2.api.configurations.Configuration; import org.apache.taverna.scufl2.api.container.WorkflowBundle; +import org.apache.taverna.workbench.file.FileManager; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentDeleteMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentDeleteMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentDeleteMenuAction.java index 99f0db9..db9b4b2 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentDeleteMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentDeleteMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import java.net.URI; @@ -10,8 +26,7 @@ import javax.swing.Action; import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.component.ui.util.Utils; - -import net.sf.taverna.t2.workbench.file.FileManager; +import org.apache.taverna.workbench.file.FileManager; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMenuAction.java index 2c0c339..8c5b489 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMenuAction.java @@ -1,3 +1,22 @@ +/* +* 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.component.ui.menu.component; import static org.apache.taverna.component.ui.menu.component.ComponentMenuSection.COMPONENT_SECTION; @@ -5,8 +24,7 @@ import static org.apache.taverna.component.ui.menu.component.ComponentMenuSectio import java.net.URI; import javax.swing.Action; - -import net.sf.taverna.t2.ui.menu.AbstractMenuAction; +import org.apache.taverna.ui.menu.AbstractMenuAction; /** * Basis for all menu actions. Intended to be configured by Spring. http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMenuSection.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMenuSection.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMenuSection.java index 7168219..784513e 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMenuSection.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMenuSection.java @@ -1,13 +1,28 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import static org.apache.taverna.component.ui.menu.ComponentMenu.COMPONENT; import java.net.URI; - -import net.sf.taverna.t2.ui.menu.AbstractMenuSection; +import org.apache.taverna.ui.menu.AbstractMenuSection; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMergeAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMergeAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMergeAction.java index e320399..1819b05 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMergeAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMergeAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import static java.awt.GridBagConstraints.BOTH; @@ -21,9 +37,6 @@ import javax.swing.AbstractAction; import javax.swing.JPanel; import javax.swing.border.TitledBorder; -import net.sf.taverna.t2.lang.observer.Observable; -import net.sf.taverna.t2.lang.observer.Observer; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.Component; import org.apache.taverna.component.api.ComponentException; @@ -33,6 +46,8 @@ import org.apache.taverna.component.ui.panel.ComponentChooserPanel; import org.apache.taverna.component.ui.panel.ProfileChoiceMessage; import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; +import org.apache.taverna.lang.observer.Observable; +import org.apache.taverna.lang.observer.Observer; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMergeMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMergeMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMergeMenuAction.java index 483c121..45419e7 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMergeMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentMergeMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import java.net.URI; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSaveAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSaveAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSaveAction.java index ac89d3c..29eae9d 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSaveAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSaveAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import static org.apache.log4j.Logger.getLogger; @@ -10,14 +26,13 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import net.sf.taverna.t2.lang.observer.Observable; -import net.sf.taverna.t2.lang.observer.Observer; -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.events.FileManagerEvent; - import org.apache.log4j.Logger; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.component.ui.util.Utils; +import org.apache.taverna.lang.observer.Observable; +import org.apache.taverna.lang.observer.Observer; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.file.events.FileManagerEvent; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSaveMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSaveMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSaveMenuAction.java index 82351f8..01a344b 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSaveMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSaveMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import java.net.URI; @@ -9,8 +25,7 @@ import javax.swing.Action; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.component.ui.util.Utils; - -import net.sf.taverna.t2.workbench.file.FileManager; +import org.apache.taverna.workbench.file.FileManager; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSearchAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSearchAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSearchAction.java index 57c72e2..83cd128 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSearchAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSearchAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import static java.awt.GridBagConstraints.BOTH; @@ -12,7 +28,6 @@ import static javax.swing.JOptionPane.QUESTION_MESSAGE; import static javax.swing.JOptionPane.showConfirmDialog; import static javax.swing.JOptionPane.showMessageDialog; import static javax.swing.JOptionPane.showOptionDialog; -import static net.sf.taverna.t2.workbench.ui.workflowview.WorkflowView.importServiceDescription; import static org.apache.log4j.Logger.getLogger; import java.awt.GridBagConstraints; @@ -26,10 +41,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; -import net.sf.taverna.t2.ui.menu.MenuManager; -import net.sf.taverna.t2.workbench.edits.EditManager; -import net.sf.taverna.t2.workbench.selection.SelectionManager; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.ComponentFactory; import org.apache.taverna.component.api.Registry; @@ -42,8 +53,11 @@ import org.apache.taverna.component.ui.panel.SearchChoicePanel; import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceDesc; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; - -import uk.org.taverna.commons.services.ServiceRegistry; +import org.apache.taverna.services.ServiceRegistry; +import org.apache.taverna.ui.menu.MenuManager; +import org.apache.taverna.workbench.edits.EditManager; +import org.apache.taverna.workbench.selection.SelectionManager; +import org.apache.taverna.workbench.ui.workflowview.WorkflowView; /** * @author alanrw @@ -142,7 +156,7 @@ public class ComponentSearchAction extends AbstractAction { if (answer == OK_OPTION) { Version.ID ident = searchChoicePanel.getVersionIdentification(); if (ident != null) - importServiceDescription(new ComponentServiceDesc(prefs, + WorkflowView.importServiceDescription(new ComponentServiceDesc(prefs, factory, icon, ident), false, em, mm, sm, sr); } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSearchMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSearchMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSearchMenuAction.java index 772d5ce..c7f7848 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSearchMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentSearchMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import java.net.URI; @@ -10,11 +26,10 @@ import javax.swing.Action; import org.apache.taverna.component.api.ComponentFactory; import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; - -import uk.org.taverna.commons.services.ServiceRegistry; -import net.sf.taverna.t2.ui.menu.MenuManager; -import net.sf.taverna.t2.workbench.edits.EditManager; -import net.sf.taverna.t2.workbench.selection.SelectionManager; +import org.apache.taverna.services.ServiceRegistry; +import org.apache.taverna.ui.menu.MenuManager; +import org.apache.taverna.workbench.edits.EditManager; +import org.apache.taverna.workbench.selection.SelectionManager; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentServiceCreatorAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentServiceCreatorAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentServiceCreatorAction.java index 97209c6..8e8eb94 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentServiceCreatorAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentServiceCreatorAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import static javax.swing.JOptionPane.ERROR_MESSAGE; @@ -12,8 +28,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; -import net.sf.taverna.t2.workbench.selection.SelectionManager; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.Version; import org.apache.taverna.component.ui.menu.component.ComponentCreatorSupport.CopiedProcessor; @@ -25,6 +39,7 @@ import org.apache.taverna.scufl2.api.activity.Activity; import org.apache.taverna.scufl2.api.core.Processor; import org.apache.taverna.scufl2.api.core.Workflow; import org.apache.taverna.scufl2.api.profiles.Profile; +import org.apache.taverna.workbench.selection.SelectionManager; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentServiceCreatorMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentServiceCreatorMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentServiceCreatorMenuAction.java index 0f4aa5d..12dac6e 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentServiceCreatorMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentServiceCreatorMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import java.net.URI; @@ -12,7 +28,7 @@ import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.scufl2.api.activity.Activity; import org.apache.taverna.scufl2.api.core.Processor; -import net.sf.taverna.t2.workbench.selection.SelectionManager; +import org.apache.taverna.workbench.selection.SelectionManager; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentWorkflowCreatorAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentWorkflowCreatorAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentWorkflowCreatorAction.java index d96578c..4863513 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentWorkflowCreatorAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentWorkflowCreatorAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import static javax.swing.JOptionPane.ERROR_MESSAGE; @@ -9,19 +25,18 @@ import static org.apache.log4j.Logger.getLogger; import java.awt.event.ActionEvent; -import net.sf.taverna.t2.lang.observer.Observable; -import net.sf.taverna.t2.lang.observer.Observer; -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.events.FileManagerEvent; -import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.Version; import org.apache.taverna.component.ui.ComponentAction; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.component.ui.util.Utils; +import org.apache.taverna.lang.observer.Observable; +import org.apache.taverna.lang.observer.Observer; import org.apache.taverna.scufl2.api.container.WorkflowBundle; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.file.events.FileManagerEvent; +import org.apache.taverna.workbench.views.graph.GraphViewComponent; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentWorkflowCreatorMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentWorkflowCreatorMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentWorkflowCreatorMenuAction.java index be5606d..2b64f87 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentWorkflowCreatorMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/ComponentWorkflowCreatorMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import java.net.URI; @@ -9,9 +25,8 @@ import javax.swing.Action; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.component.ui.util.Utils; - -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.views.graph.GraphViewComponent; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/FileOpenFromComponentMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/FileOpenFromComponentMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/FileOpenFromComponentMenuAction.java index c2bf615..efa1356 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/FileOpenFromComponentMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/FileOpenFromComponentMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import java.net.URI; @@ -9,10 +25,9 @@ import javax.swing.Action; import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; - -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.FileType; -import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.file.FileType; +import org.apache.taverna.workbench.views.graph.GraphViewComponent; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/OpenWorkflowFromComponentAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/OpenWorkflowFromComponentAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/OpenWorkflowFromComponentAction.java index fbda434..4d0d761 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/OpenWorkflowFromComponentAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/component/OpenWorkflowFromComponentAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.component; import static javax.swing.JOptionPane.CANCEL_OPTION; @@ -17,13 +33,6 @@ import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JOptionPane; -import net.sf.taverna.t2.lang.observer.Observable; -import net.sf.taverna.t2.lang.observer.Observer; -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.FileType; -import net.sf.taverna.t2.workbench.file.exceptions.OpenException; -import net.sf.taverna.t2.workbench.views.graph.GraphViewComponent; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.Component; import org.apache.taverna.component.api.Family; @@ -34,8 +43,14 @@ import org.apache.taverna.component.ui.panel.ComponentChoiceMessage; import org.apache.taverna.component.ui.panel.ComponentVersionChooserPanel; import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; +import org.apache.taverna.lang.observer.Observable; +import org.apache.taverna.lang.observer.Observer; import org.apache.taverna.scufl2.api.container.WorkflowBundle; +import org.apache.taverna.workbench.file.FileManager; +import org.apache.taverna.workbench.file.FileType; +import org.apache.taverna.workbench.file.exceptions.OpenException; +import org.apache.taverna.workbench.views.graph.GraphViewComponent; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyCreateAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyCreateAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyCreateAction.java index 33dbbd3..a72d1b9 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyCreateAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyCreateAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.family; import static java.awt.GridBagConstraints.BOTH; http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyCreateMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyCreateMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyCreateMenuAction.java index b0cb699..5ca568b 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyCreateMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyCreateMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.family; import static org.apache.taverna.component.ui.menu.family.ComponentFamilyMenuSection.COMPONENT_FAMILY_SECTION; @@ -11,8 +27,7 @@ import javax.swing.Action; import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; - -import net.sf.taverna.t2.ui.menu.AbstractMenuAction; +import org.apache.taverna.ui.menu.AbstractMenuAction; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyDeleteAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyDeleteAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyDeleteAction.java index 4e3c561..af40c92 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyDeleteAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyDeleteAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.family; import static java.awt.GridBagConstraints.BOTH; @@ -25,8 +41,6 @@ import javax.swing.AbstractAction; import javax.swing.JPanel; import javax.swing.SwingWorker; -import net.sf.taverna.t2.workbench.file.FileManager; - import org.apache.log4j.Logger; import org.apache.taverna.component.api.ComponentException; import org.apache.taverna.component.api.Family; @@ -41,6 +55,7 @@ import org.apache.taverna.component.ui.util.Utils; import org.apache.taverna.scufl2.api.configurations.Configuration; import org.apache.taverna.scufl2.api.container.WorkflowBundle; +import org.apache.taverna.workbench.file.FileManager; /** * @author alanrw http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4208425f/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyDeleteMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyDeleteMenuAction.java b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyDeleteMenuAction.java index 3e63cac..9db4066 100644 --- a/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyDeleteMenuAction.java +++ b/taverna-component-activity-ui/src/main/java/org/apache/taverna/component/ui/menu/family/ComponentFamilyDeleteMenuAction.java @@ -1,6 +1,22 @@ -/** - * - */ +/* +* 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.component.ui.menu.family; import java.net.URI; @@ -10,9 +26,8 @@ import javax.swing.Action; import org.apache.taverna.component.ui.preference.ComponentPreference; import org.apache.taverna.component.ui.serviceprovider.ComponentServiceIcon; import org.apache.taverna.component.ui.util.Utils; - -import net.sf.taverna.t2.ui.menu.AbstractMenuAction; -import net.sf.taverna.t2.workbench.file.FileManager; +import org.apache.taverna.ui.menu.AbstractMenuAction; +import org.apache.taverna.workbench.file.FileManager; /** * @author alanrw
