You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by re...@apache.org on 2015/03/27 17:22:36 UTC
[23/23] incubator-taverna-workbench-common-activities git commit:
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/commit/163747de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/tree/163747de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/diff/163747de
Branch: refs/heads/master
Commit: 163747de9d4a22b06511164afa748a0ebaf4c3b2
Parents: 9e37ea3
Author: Dmitry Repchevsky <re...@list.ru>
Authored: Fri Mar 27 17:21:40 2015 +0100
Committer: Dmitry Repchevsky <re...@list.ru>
Committed: Fri Mar 27 17:21:40 2015 +0100
----------------------------------------------------------------------
.gitignore | 4 +-
.../BeanshellActivityConfigurationAction.java | 71 --
.../menu/AddBeanshellTemplateAction.java | 113 --
.../menu/AddBeanshellTemplateMenuAction.java | 121 --
.../menu/ConfigureBeanshellMenuAction.java | 67 -
.../BeanshellActivityIcon.java | 58 -
.../BeanshellTemplateService.java | 63 -
.../views/BeanshellActivityViewFactory.java | 84 --
.../views/BeanshellConfigurationPanel.java | 231 ----
.../views/BeanshellContextualView.java | 104 --
.../BeanshellActivityConfigurationAction.java | 70 +
.../menu/AddBeanshellTemplateAction.java | 112 ++
.../menu/AddBeanshellTemplateMenuAction.java | 120 ++
.../menu/ConfigureBeanshellMenuAction.java | 86 ++
.../BeanshellActivityIcon.java | 57 +
.../BeanshellTemplateService.java | 82 ++
.../views/BeanshellActivityViewFactory.java | 83 ++
.../views/BeanshellConfigurationPanel.java | 230 ++++
.../views/BeanshellContextualView.java | 103 ++
...rvicedescriptions.ServiceDescriptionProvider | 1 -
.../net.sf.taverna.t2.ui.menu.MenuComponent | 3 -
...a.t2.workbench.activityicons.ActivityIconSPI | 1 -
...ntextualviews.activity.ContextualViewFactory | 1 -
...rvicedescriptions.ServiceDescriptionProvider | 1 +
.../org.apache.taverna.ui.menu.MenuComponent | 3 +
...erna.workbench.activityicons.ActivityIconSPI | 1 +
...ntextualviews.activity.ContextualViewFactory | 1 +
.../beanshell-activity-ui-context-osgi.xml | 20 +-
.../spring/beanshell-activity-ui-context.xml | 12 +-
.../t2/activities/beanshell/views/keys.txt | 90 --
.../taverna/activities/beanshell/views/keys.txt | 90 ++
taverna-external-tool-activity-ui/pom.xml | 18 +
.../ExternalToolActivityConfigureAction.java | 83 --
.../ToolInvocationConfiguration.java | 57 -
.../externaltool/manager/GroupPanel.java | 113 --
.../InvocationGroupManagerShutdownHook.java | 34 -
.../InvocationGroupManagerStartupHook.java | 47 -
.../manager/InvocationMechanismEditor.java | 28 -
.../externaltool/manager/MechanismPanel.java | 121 --
.../ToolInvocationConfigurationPanel.java | 379 ------
.../ToolInvocationConfigurationUIFactory.java | 54 -
.../local/LocalInvocationMechanismEditor.java | 122 --
.../manager/ssh/ExternalToolSshNodeViewer.java | 110 --
.../ssh/SshInvocationMechanismEditor.java | 234 ----
.../AddExternalToolContextualMenuAction.java | 110 --
.../menu/AddExternalToolMenuAction.java | 111 --
.../menu/ConfigureExternalToolMenuAction.java | 69 -
.../externaltool/menu/FeedbackMenuAction.java | 82 --
.../AddExternalToolServiceDialog.java | 189 ---
.../ExternalToolActivityIcon.java | 73 --
.../ExternalToolServiceDescription.java | 147 ---
.../ExternalToolServiceProvider.java | 132 --
.../ExternalToolServiceProviderConfig.java | 56 -
.../ExternalToolTemplateServiceDescription.java | 77 --
.../t2/activities/externaltool/utils/Tools.java | 129 --
.../externaltool/views/AnnotationPanel.java | 41 -
.../externaltool/views/EditablePanel.java | 76 --
.../ExternalToolActivityContextualView.java | 181 ---
.../views/ExternalToolActivityViewFactory.java | 76 --
.../views/ExternalToolConfigView.java | 868 -------------
.../views/ExternalToolFileViewer.java | 103 --
.../ExternalToolRuntimeEnvironmentViewer.java | 56 -
.../views/ExternalToolStaticStringViewer.java | 53 -
.../views/ExternalToolStaticUrlViewer.java | 56 -
.../ExternalToolStringReplacementViewer.java | 97 --
.../externaltool/views/FilePanel.java | 119 --
.../externaltool/views/InvocationPanel.java | 396 ------
.../views/LoadDescriptionAction.java | 89 --
.../views/SaveDescriptionAction.java | 124 --
.../externaltool/views/ScriptPanel.java | 148 ---
.../externaltool/views/StaticStringPanel.java | 106 --
.../externaltool/views/StaticUrlPanel.java | 108 --
.../views/StringReplacementPanel.java | 134 --
.../externaltool/views/ToolXMLPanel.java | 33 -
.../ExternalToolActivityConfigureAction.java | 83 ++
.../ToolInvocationConfiguration.java | 57 +
.../externaltool/manager/GroupPanel.java | 115 ++
.../InvocationGroupManagerShutdownHook.java | 34 +
.../InvocationGroupManagerStartupHook.java | 47 +
.../manager/InvocationMechanismEditor.java | 28 +
.../externaltool/manager/MechanismPanel.java | 121 ++
.../ToolInvocationConfigurationPanel.java | 383 ++++++
.../ToolInvocationConfigurationUIFactory.java | 55 +
.../local/LocalInvocationMechanismEditor.java | 122 ++
.../manager/ssh/ExternalToolSshNodeViewer.java | 110 ++
.../ssh/SshInvocationMechanismEditor.java | 234 ++++
.../AddExternalToolContextualMenuAction.java | 110 ++
.../menu/AddExternalToolMenuAction.java | 111 ++
.../menu/ConfigureExternalToolMenuAction.java | 69 +
.../externaltool/menu/FeedbackMenuAction.java | 82 ++
.../AddExternalToolServiceDialog.java | 189 +++
.../ExternalToolActivityIcon.java | 73 ++
.../ExternalToolServiceDescription.java | 147 +++
.../ExternalToolServiceProvider.java | 132 ++
.../ExternalToolServiceProviderConfig.java | 56 +
.../ExternalToolTemplateServiceDescription.java | 77 ++
.../activities/externaltool/utils/Tools.java | 129 ++
.../externaltool/views/AnnotationPanel.java | 41 +
.../externaltool/views/EditablePanel.java | 72 ++
.../ExternalToolActivityContextualView.java | 181 +++
.../views/ExternalToolActivityViewFactory.java | 76 ++
.../views/ExternalToolConfigView.java | 868 +++++++++++++
.../views/ExternalToolFileViewer.java | 103 ++
.../ExternalToolRuntimeEnvironmentViewer.java | 56 +
.../views/ExternalToolStaticStringViewer.java | 53 +
.../views/ExternalToolStaticUrlViewer.java | 56 +
.../ExternalToolStringReplacementViewer.java | 97 ++
.../externaltool/views/FilePanel.java | 119 ++
.../externaltool/views/InvocationPanel.java | 394 ++++++
.../views/LoadDescriptionAction.java | 89 ++
.../views/SaveDescriptionAction.java | 124 ++
.../externaltool/views/ScriptPanel.java | 148 +++
.../externaltool/views/StaticStringPanel.java | 104 ++
.../externaltool/views/StaticUrlPanel.java | 106 ++
.../views/StringReplacementPanel.java | 130 ++
.../externaltool/views/ToolXMLPanel.java | 33 +
...ternaltool.manager.InvocationMechanismEditor | 2 -
...rvicedescriptions.ServiceDescriptionProvider | 2 -
.../net.sf.taverna.t2.ui.menu.MenuComponent | 4 -
.../net.sf.taverna.t2.workbench.ShutdownSPI | 1 -
.../net.sf.taverna.t2.workbench.StartupSPI | 1 -
...a.t2.workbench.activityicons.ActivityIconSPI | 1 -
...rkbench.configuration.ConfigurationUIFactory | 1 -
...ntextualviews.activity.ContextualViewFactory | 1 -
...ternaltool.manager.InvocationMechanismEditor | 2 +
...rvicedescriptions.ServiceDescriptionProvider | 2 +
.../org.apache.taverna.ui.menu.MenuComponent | 4 +
.../org.apache.taverna.workbench.ShutdownSPI | 1 +
.../org.apache.taverna.workbench.StartupSPI | 1 +
...erna.workbench.activityicons.ActivityIconSPI | 1 +
...rkbench.configuration.ConfigurationUIFactory | 1 +
...ntextualviews.activity.ContextualViewFactory | 1 +
.../external-tool-activity-ui-context-osgi.xml | 32 +-
.../external-tool-activity-ui-context.xml | 24 +-
.../LocalworkerActivityConfigurationAction.java | 117 --
.../menu/ConfigureLocalworkerMenuAction.java | 62 -
.../LocalworkerActivityIcon.java | 58 -
.../LocalworkerServiceDescription.java | 105 --
.../LocalworkerServiceProvider.java | 302 -----
.../views/LocalworkerActivityConfigView.java | 42 -
.../LocalworkerActivityContextualView.java | 115 --
.../views/LocalworkerActivityViewFactory.java | 82 --
.../LocalworkerActivityConfigurationAction.java | 117 ++
.../menu/ConfigureLocalworkerMenuAction.java | 62 +
.../LocalworkerActivityIcon.java | 58 +
.../LocalworkerServiceDescription.java | 105 ++
.../LocalworkerServiceProvider.java | 302 +++++
.../views/LocalworkerActivityConfigView.java | 42 +
.../LocalworkerActivityContextualView.java | 115 ++
.../views/LocalworkerActivityViewFactory.java | 82 ++
...rvicedescriptions.ServiceDescriptionProvider | 1 -
.../net.sf.taverna.t2.ui.menu.MenuComponent | 1 -
...a.t2.workbench.activityicons.ActivityIconSPI | 1 -
...ntextualviews.activity.ContextualViewFactory | 1 -
...rvicedescriptions.ServiceDescriptionProvider | 1 +
.../org.apache.taverna.ui.menu.MenuComponent | 1 +
...erna.workbench.activityicons.ActivityIconSPI | 1 +
...ntextualviews.activity.ContextualViewFactory | 1 +
.../localworker-activity-ui-context-osgi.xml | 16 +-
.../spring/localworker-activity-ui-context.xml | 8 +-
...rna.scuflworkers.biojava.GenBankParserWorker | 12 +-
...verna.scuflworkers.biojava.ReverseCompWorker | 12 +-
...a.scuflworkers.biojava.SwissProtParserWorker | 12 +-
...averna.scuflworkers.biojava.TranscribeWorker | 12 +-
...na.scuflworkers.io.ConcatenateFileListWorker | 20 +-
...ge.taverna.scuflworkers.io.EnvVariableWorker | 8 +-
...ge.taverna.scuflworkers.io.FileListByExtTask | 16 +-
....taverna.scuflworkers.io.FileListByRegexTask | 16 +-
...ceforge.taverna.scuflworkers.io.LocalCommand | 16 +-
...forge.taverna.scuflworkers.io.TextFileReader | 16 +-
...forge.taverna.scuflworkers.io.TextFileWriter | 20 +-
...rge.taverna.scuflworkers.jdbc.SQLQueryWorker | 40 +-
...ge.taverna.scuflworkers.jdbc.SQLUpdateWorker | 32 +-
...erna.scuflworkers.ncbi.NucleotideFastaWorker | 12 +-
...erna.scuflworkers.ncbi.NucleotideGBSeqWorker | 12 +-
...scuflworkers.ncbi.NucleotideINSDSeqXMLWorker | 12 +-
...scuflworkers.ncbi.NucleotideTinySeqXMLWorker | 12 +-
...taverna.scuflworkers.ncbi.ProteinFastaWorker | 12 +-
...taverna.scuflworkers.ncbi.ProteinGBSeqWorker | 12 +-
...na.scuflworkers.ncbi.ProteinINSDSeqXMLWorker | 12 +-
...na.scuflworkers.ncbi.ProteinTinySeqXMLWorker | 12 +-
...taverna.scuflworkers.ncbi.PubMedEFetchWorker | 20 +-
...averna.scuflworkers.ncbi.PubMedESearchWorker | 40 +-
...urceforge.taverna.scuflworkers.net.BrowseUrl | 8 +-
...forge.taverna.scuflworkers.net.ExtractHeader | 16 +-
...ourceforge.taverna.scuflworkers.ui.AskWorker | 16 +-
...ceforge.taverna.scuflworkers.ui.ChooseWorker | 20 +-
...rge.taverna.scuflworkers.ui.SelectFileWorker | 20 +-
...ceforge.taverna.scuflworkers.ui.SelectWorker | 20 +-
...urceforge.taverna.scuflworkers.ui.TellWorker | 16 +-
...urceforge.taverna.scuflworkers.ui.WarnWorker | 16 +-
...rge.taverna.scuflworkers.xml.XPathTextWorker | 20 +-
...rceforge.taverna.scuflworkers.xml.XSLTWorker | 24 +-
...na.scuflworkers.xml.XSLTWorkerWithParameters | 22 +-
...escience.scuflworkers.java.ByteArrayToString | 16 +-
....ebi.escience.scuflworkers.java.DecodeBase64 | 12 +-
...embl.ebi.escience.scuflworkers.java.EchoList | 12 +-
...escience.scuflworkers.java.EmitLotsOfStrings | 8 +-
....ebi.escience.scuflworkers.java.EncodeBase64 | 12 +-
...escience.scuflworkers.java.ExtractImageLinks | 12 +-
....escience.scuflworkers.java.FilterStringList | 16 +-
...l.ebi.escience.scuflworkers.java.FlattenList | 12 +-
...mbl.ebi.escience.scuflworkers.java.PadNumber | 16 +-
...cuflworkers.java.RegularExpressionStringList | 20 +-
...mbl.ebi.escience.scuflworkers.java.SendEmail | 24 +-
....ebi.escience.scuflworkers.java.SplitByRegex | 16 +-
....ebi.escience.scuflworkers.java.StringConcat | 16 +-
...i.escience.scuflworkers.java.StringListMerge | 16 +-
...cience.scuflworkers.java.StringSetDifference | 16 +-
...ence.scuflworkers.java.StringSetIntersection | 16 +-
...bi.escience.scuflworkers.java.StringSetUnion | 16 +-
...ence.scuflworkers.java.StringStripDuplicates | 12 +-
...scuflworkers.java.TestAlwaysFailingProcessor | 16 +-
...science.scuflworkers.java.TestSometimesFails | 12 +-
...i.escience.scuflworkers.java.WebImageFetcher | 16 +-
...bi.escience.scuflworkers.java.WebPageFetcher | 16 +-
taverna-rest-activity-ui/pom.xml | 10 +-
.../rest/ui/config/HTTPHeadersTableModel.java | 119 --
.../config/RESTActivityConfigurationPanel.java | 670 ----------
.../ui/config/RESTActivityConfigureAction.java | 51 -
.../rest/ui/menu/AddRESTTemplateAction.java | 107 --
.../rest/ui/menu/AddRESTTemplateMenuAction.java | 114 --
.../GenericRESTTemplateService.java | 82 --
.../ui/servicedescription/RESTActivityIcon.java | 54 -
.../serviceprovider/ExampleServiceDesc.java.bak | 99 --
.../ExampleServiceProvider.java.bak | 106 --
.../ExampleServiceProviderConfig.java.bak | 31 -
.../view/ConfigureRESTActivityMenuAction.java | 66 -
.../RESTActivityMainContextViewFactory.java | 62 -
.../ui/view/RESTActivityMainContextualView.java | 220 ----
.../rest/ui/config/HTTPHeadersTableModel.java | 138 ++
.../config/RESTActivityConfigurationPanel.java | 689 ++++++++++
.../ui/config/RESTActivityConfigureAction.java | 70 +
.../rest/ui/menu/AddRESTTemplateAction.java | 106 ++
.../rest/ui/menu/AddRESTTemplateMenuAction.java | 113 ++
.../GenericRESTTemplateService.java | 101 ++
.../ui/servicedescription/RESTActivityIcon.java | 73 ++
.../serviceprovider/ExampleServiceDesc.java.bak | 99 ++
.../ExampleServiceProvider.java.bak | 106 ++
.../ExampleServiceProviderConfig.java.bak | 31 +
.../view/ConfigureRESTActivityMenuAction.java | 85 ++
.../RESTActivityMainContextViewFactory.java | 81 ++
.../ui/view/RESTActivityMainContextualView.java | 239 ++++
...rvicedescriptions.ServiceDescriptionProvider | 1 -
.../net.sf.taverna.t2.ui.menu.MenuComponent | 3 -
...a.t2.workbench.activityicons.ActivityIconSPI | 1 -
...ntextualviews.activity.ContextualViewFactory | 1 -
...rvicedescriptions.ServiceDescriptionProvider | 1 +
.../org.apache.taverna.ui.menu.MenuComponent | 3 +
...erna.workbench.activityicons.ActivityIconSPI | 1 +
...ntextualviews.activity.ContextualViewFactory | 1 +
.../spring/rest-activity-ui-context-osgi.xml | 20 +-
.../spring/rest-activity-ui-context.xml | 12 +-
.../activities/rest/ui/config/information.png | Bin 778 -> 0 bytes
.../t2/activities/rest/ui/config/mediatypes.txt | 65 -
.../ui/servicedescription/service_type_rest.png | Bin 1137 -> 0 bytes
.../activities/rest/ui/config/information.png | Bin 0 -> 778 bytes
.../activities/rest/ui/config/mediatypes.txt | 65 +
.../ui/servicedescription/service_type_rest.png | Bin 0 -> 1137 bytes
...dsheetImportActivityConfigurationAction.java | 72 --
.../il8n/SpreadsheetImportUIText.java | 46 -
.../SpreadsheetImportAddTemplateAction.java | 110 --
.../SpreadsheetImportAddTemplateMenuAction.java | 124 --
.../SpreadsheetImportConfigureMenuAction.java | 84 --
.../SpreadsheetImportActivityIcon.java | 71 --
.../SpreadsheetImportTemplateService.java | 101 --
.../SpreadsheetImportConfigTableModel.java | 190 ---
.../views/SpreadsheetImportConfigView.java | 1082 ----------------
.../views/SpreadsheetImportContextualView.java | 121 --
.../SpreadsheetImportContextualViewFactory.java | 87 --
...dsheetImportActivityConfigurationAction.java | 71 ++
.../il8n/SpreadsheetImportUIText.java | 45 +
.../SpreadsheetImportAddTemplateAction.java | 109 ++
.../SpreadsheetImportAddTemplateMenuAction.java | 123 ++
.../SpreadsheetImportConfigureMenuAction.java | 83 ++
.../SpreadsheetImportActivityIcon.java | 70 +
.../SpreadsheetImportTemplateService.java | 100 ++
.../SpreadsheetImportConfigTableModel.java | 188 +++
.../views/SpreadsheetImportConfigView.java | 1081 ++++++++++++++++
.../views/SpreadsheetImportContextualView.java | 120 ++
.../SpreadsheetImportContextualViewFactory.java | 86 ++
...rvicedescriptions.ServiceDescriptionProvider | 1 -
.../net.sf.taverna.t2.ui.menu.MenuComponent | 3 -
...a.t2.workbench.activityicons.ActivityIconSPI | 1 -
...ntextualviews.activity.ContextualViewFactory | 1 -
...rvicedescriptions.ServiceDescriptionProvider | 1 +
.../org.apache.taverna.ui.menu.MenuComponent | 3 +
...erna.workbench.activityicons.ActivityIconSPI | 1 +
...ntextualviews.activity.ContextualViewFactory | 1 +
...eadsheet-import-activity-ui-context-osgi.xml | 20 +-
.../spreadsheet-import-activity-ui-context.xml | 12 +-
.../spreadsheet/iln8/ui-text.properties | 43 -
.../spreadsheet/iln8/ui-text.properties | 43 +
taverna-wsdl-activity-ui/pom.xml | 185 ++-
.../actions/AbstractAddXMLSplitterAction.java | 156 ---
.../wsdl/actions/AddXMLInputSplitterAction.java | 104 --
.../actions/AddXMLOutputSplitterAction.java | 105 --
.../wsdl/actions/AddXMLSplitterEdit.java | 315 -----
.../actions/WSDLActivityConfigureAction.java | 71 --
.../wsdl/actions/XMLSplitterPortBuilder.java | 127 --
...LInputSplitterForWSDLActivityMenuAction.java | 11 -
...utSplitterForXMLInputSplitterMenuAction.java | 11 -
.../menu/AddXMLInputSplitterMenuAction.java | 70 -
...OutputSplitterForWSDLActivityMenuAction.java | 11 -
...tSplitterForXMLOutputSplitterMenuAction.java | 11 -
.../menu/AddXMLOutputSplitterMenuAction.java | 66 -
.../wsdl/menu/ConfigureWSDLMenuAction.java | 78 --
.../AddWSDLServiceDialog.java | 303 -----
.../ConfirmTrustedCertificateDialog.java | 586 ---------
.../servicedescriptions/WSDLActivityIcon.java | 60 -
.../WSDLServiceDescription.java | 154 ---
.../WSDLServiceProvider.java | 206 ---
.../WSDLServiceProviderConfig.java | 32 -
.../XMLInputSplitterActivityIcon.java | 63 -
.../XMLOutputSplitterActivityIcon.java | 64 -
.../views/AbstractXMLSplitterActionView.java | 159 ---
.../views/WSDLActivityConfigurationView.java | 446 -------
.../wsdl/views/WSDLActivityContextualView.java | 108 --
.../wsdl/views/WSDLActivityViewFactory.java | 88 --
.../wsdl/views/XMLSplitterContextualView.java | 78 --
.../wsdl/views/XMLSplitterViewFactory.java | 66 -
.../actions/AbstractAddXMLSplitterAction.java | 155 +++
.../wsdl/actions/AddXMLInputSplitterAction.java | 102 ++
.../actions/AddXMLOutputSplitterAction.java | 103 ++
.../wsdl/actions/AddXMLSplitterEdit.java | 314 +++++
.../actions/WSDLActivityConfigureAction.java | 70 +
.../wsdl/actions/XMLSplitterPortBuilder.java | 126 ++
...LInputSplitterForWSDLActivityMenuAction.java | 30 +
...utSplitterForXMLInputSplitterMenuAction.java | 30 +
.../menu/AddXMLInputSplitterMenuAction.java | 85 ++
...OutputSplitterForWSDLActivityMenuAction.java | 30 +
...tSplitterForXMLOutputSplitterMenuAction.java | 30 +
.../menu/AddXMLOutputSplitterMenuAction.java | 82 ++
.../wsdl/menu/ConfigureWSDLMenuAction.java | 77 ++
.../AddWSDLServiceDialog.java | 302 +++++
.../ConfirmTrustedCertificateDialog.java | 585 +++++++++
.../servicedescriptions/WSDLActivityIcon.java | 59 +
.../WSDLServiceDescription.java | 153 +++
.../WSDLServiceProvider.java | 227 ++++
.../WSDLServiceProviderConfig.java | 51 +
.../XMLInputSplitterActivityIcon.java | 62 +
.../XMLOutputSplitterActivityIcon.java | 63 +
.../views/AbstractXMLSplitterActionView.java | 178 +++
.../views/WSDLActivityConfigurationView.java | 445 +++++++
.../wsdl/views/WSDLActivityContextualView.java | 107 ++
.../wsdl/views/WSDLActivityViewFactory.java | 87 ++
.../wsdl/views/XMLSplitterContextualView.java | 77 ++
.../wsdl/views/XMLSplitterViewFactory.java | 63 +
...rvicedescriptions.ServiceDescriptionProvider | 1 -
.../net.sf.taverna.t2.ui.menu.MenuComponent | 5 -
...a.t2.workbench.activityicons.ActivityIconSPI | 3 -
...ntextualviews.activity.ContextualViewFactory | 2 -
...rvicedescriptions.ServiceDescriptionProvider | 1 +
.../org.apache.taverna.ui.menu.MenuComponent | 5 +
...erna.workbench.activityicons.ActivityIconSPI | 3 +
...ntextualviews.activity.ContextualViewFactory | 2 +
.../spring/wsdl-activity-ui-context-osgi.xml | 28 +-
.../spring/wsdl-activity-ui-context.xml | 22 +-
.../views/TestWSDLActivityContextualView.java | 53 -
.../views/TestWSDLActivityContextualView.java | 52 +
.../xpath/ui/config/TwoFieldQueryPanel.java | 110 --
.../config/XPathActivityConfigurationPanel.java | 1202 ------------------
...XPathActivityConfigurationPanelProvider.java | 158 ---
.../ui/config/XPathActivityConfigureAction.java | 52 -
.../ui/config/xmltree/TableCellListener.java | 186 ---
.../ui/config/xmltree/XPathActivityXMLTree.java | 572 ---------
.../XPathActivityXMLTreeAttributeNode.java | 50 -
.../XPathActivityXMLTreeElementNode.java | 62 -
.../xmltree/XPathActivityXMLTreeNode.java | 81 --
.../XPathActivityXMLTreeSelectionHandler.java | 251 ----
.../ConfigureXPathActivityMenuAction.java | 65 -
.../XPathActivityMainContextViewFactory.java | 59 -
.../XPathActivityMainContextualView.java | 209 ---
.../xpath/ui/menu/AddXPathTemplateAction.java | 110 --
.../ui/menu/AddXPathTemplateMenuAction.java | 117 --
.../servicedescription/XPathActivityIcon.java | 86 --
.../XPathTemplateService.java | 63 -
.../xpath/ui/config/TwoFieldQueryPanel.java | 110 ++
.../config/XPathActivityConfigurationPanel.java | 1202 ++++++++++++++++++
...XPathActivityConfigurationPanelProvider.java | 158 +++
.../ui/config/XPathActivityConfigureAction.java | 52 +
.../ui/config/xmltree/TableCellListener.java | 186 +++
.../ui/config/xmltree/XPathActivityXMLTree.java | 572 +++++++++
.../XPathActivityXMLTreeAttributeNode.java | 50 +
.../XPathActivityXMLTreeElementNode.java | 62 +
.../xmltree/XPathActivityXMLTreeNode.java | 81 ++
.../XPathActivityXMLTreeSelectionHandler.java | 251 ++++
.../ConfigureXPathActivityMenuAction.java | 65 +
.../XPathActivityMainContextViewFactory.java | 59 +
.../XPathActivityMainContextualView.java | 209 +++
.../xpath/ui/menu/AddXPathTemplateAction.java | 110 ++
.../ui/menu/AddXPathTemplateMenuAction.java | 117 ++
.../servicedescription/XPathActivityIcon.java | 86 ++
.../XPathTemplateService.java | 62 +
...rvicedescriptions.ServiceDescriptionProvider | 1 -
.../net.sf.taverna.t2.ui.menu.MenuComponent | 3 -
...a.t2.workbench.activityicons.ActivityIconSPI | 1 -
...ntextualviews.activity.ContextualViewFactory | 1 -
...rvicedescriptions.ServiceDescriptionProvider | 1 +
.../org.apache.taverna.ui.menu.MenuComponent | 3 +
...erna.workbench.activityicons.ActivityIconSPI | 1 +
...ntextualviews.activity.ContextualViewFactory | 1 +
.../spring/xpath-activity-ui-context-osgi.xml | 20 +-
.../spring/xpath-activity-ui-context.xml | 12 +-
.../xpath/ui/servicedescription/arrow_right.png | Bin 596 -> 0 bytes
.../famfamfam_silk/accept.png | Bin 781 -> 0 bytes
.../famfamfam_silk/exclamation.png | Bin 701 -> 0 bytes
.../servicedescription/famfamfam_silk/help.png | Bin 786 -> 0 bytes
.../famfamfam_silk/page_white_code.png | Bin 603 -> 0 bytes
.../servicedescription/famfamfam_silk/tag.png | Bin 389 -> 0 bytes
.../text_linespacing (collapse).png | Bin 371 -> 0 bytes
.../famfamfam_silk/text_linespacing.png | Bin 363 -> 0 bytes
.../xpath/ui/servicedescription/folds/fold.png | Bin 331 -> 0 bytes
.../ui/servicedescription/folds/unfold.png | Bin 334 -> 0 bytes
.../ui/servicedescription/xpath_attribute.png | Bin 1426 -> 0 bytes
.../xpath/ui/servicedescription/arrow_right.png | Bin 0 -> 596 bytes
.../famfamfam_silk/accept.png | Bin 0 -> 781 bytes
.../famfamfam_silk/exclamation.png | Bin 0 -> 701 bytes
.../servicedescription/famfamfam_silk/help.png | Bin 0 -> 786 bytes
.../famfamfam_silk/page_white_code.png | Bin 0 -> 603 bytes
.../servicedescription/famfamfam_silk/tag.png | Bin 0 -> 389 bytes
.../text_linespacing (collapse).png | Bin 0 -> 371 bytes
.../famfamfam_silk/text_linespacing.png | Bin 0 -> 363 bytes
.../xpath/ui/servicedescription/folds/fold.png | Bin 0 -> 331 bytes
.../ui/servicedescription/folds/unfold.png | Bin 0 -> 334 bytes
.../ui/servicedescription/xpath_attribute.png | Bin 0 -> 1426 bytes
426 files changed, 19401 insertions(+), 19032 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 17d95a0..8ba508e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@
/taverna-beanshell-activity-ui/target/
/taverna-spreadsheet-import-activity-ui/target/
/taverna-external-tool-activity-ui/target/
-/taverna-localworker-activity-ui/target/
\ No newline at end of file
+/taverna-localworker-activity-ui/target/
+/taverna-xpath-activity-ui/target/
+/taverna-rest-activity-ui/target/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/actions/BeanshellActivityConfigurationAction.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/actions/BeanshellActivityConfigurationAction.java b/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/actions/BeanshellActivityConfigurationAction.java
deleted file mode 100644
index be81889..0000000
--- a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/actions/BeanshellActivityConfigurationAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.activities.beanshell.actions;
-
-import java.awt.Frame;
-import java.awt.event.ActionEvent;
-
-import net.sf.taverna.t2.activities.beanshell.views.BeanshellConfigurationPanel;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.ui.actions.activity.ActivityConfigurationAction;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityConfigurationDialog;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
-import org.apache.taverna.scufl2.api.activity.Activity;
-
-@SuppressWarnings("serial")
-public class BeanshellActivityConfigurationAction extends ActivityConfigurationAction {
-
- public static final String EDIT_BEANSHELL_SCRIPT = "Edit beanshell script";
- private final EditManager editManager;
- private final FileManager fileManager;
- private final ApplicationConfiguration applicationConfiguration;
-
- public BeanshellActivityConfigurationAction(Activity activity, Frame owner,
- EditManager editManager, FileManager fileManager,
- ActivityIconManager activityIconManager,
- ServiceDescriptionRegistry serviceDescriptionRegistry,
- ApplicationConfiguration applicationConfiguration) {
- super(activity, activityIconManager, serviceDescriptionRegistry);
- this.editManager = editManager;
- this.fileManager = fileManager;
- this.applicationConfiguration = applicationConfiguration;
- putValue(NAME, EDIT_BEANSHELL_SCRIPT);
- }
-
- public void actionPerformed(ActionEvent e) {
- ActivityConfigurationDialog currentDialog = ActivityConfigurationAction.getDialog(getActivity());
- if (currentDialog != null) {
- currentDialog.toFront();
- return;
- }
- final BeanshellConfigurationPanel beanshellConfigView = new BeanshellConfigurationPanel(
- getActivity(), applicationConfiguration);
- final ActivityConfigurationDialog dialog = new ActivityConfigurationDialog(getActivity(),
- beanshellConfigView, editManager);
-
- ActivityConfigurationAction.setDialog(getActivity(), dialog, fileManager);
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/AddBeanshellTemplateAction.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/AddBeanshellTemplateAction.java b/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/AddBeanshellTemplateAction.java
deleted file mode 100644
index 7bd5d61..0000000
--- a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/AddBeanshellTemplateAction.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007-2009 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.activities.beanshell.menu;
-
-import java.awt.event.ActionEvent;
-import java.net.URI;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-
-import net.sf.taverna.t2.activities.beanshell.servicedescriptions.BeanshellTemplateService;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.ui.menu.AbstractContextualMenuAction;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.workflowview.WorkflowView;
-import org.apache.taverna.commons.services.ServiceRegistry;
-import org.apache.taverna.scufl2.api.core.Workflow;
-
-/**
- * An action to add a beanshell activity + a wrapping processor to the workflow.
- *
- * @author Alex Nenadic
- * @author David Withers
- */
-@SuppressWarnings("serial")
-public class AddBeanshellTemplateAction extends AbstractContextualMenuAction {
-
- private static final String ADD_BEANSHELL = "Beanshell";
-
- private static final URI insertSection = URI
- .create("http://taverna.sf.net/2009/contextMenu/insert");
-
- private EditManager editManager;
- private MenuManager menuManager;
- private SelectionManager selectionManager;
- private ActivityIconManager activityIconManager;
- private ServiceDescriptionRegistry serviceDescriptionRegistry;
- private ServiceRegistry serviceRegistry;
-
- public AddBeanshellTemplateAction() {
- super(insertSection, 300);
- }
-
- @Override
- public boolean isEnabled() {
- return super.isEnabled() && getContextualSelection().getSelection() instanceof Workflow;
- }
-
- @Override
- protected Action createAction() {
-
- return new AddBeanshellAction();
- }
-
- protected class AddBeanshellAction extends AbstractAction {
- AddBeanshellAction() {
- super(ADD_BEANSHELL, activityIconManager
- .iconForActivity(BeanshellTemplateService.ACTIVITY_TYPE));
- }
-
- public void actionPerformed(ActionEvent e) {
- WorkflowView.importServiceDescription(serviceDescriptionRegistry
- .getServiceDescription(BeanshellTemplateService.ACTIVITY_TYPE), false,
- editManager, menuManager, selectionManager, serviceRegistry);
- }
- }
-
- public void setEditManager(EditManager editManager) {
- this.editManager = editManager;
- }
-
- public void setMenuManager(MenuManager menuManager) {
- this.menuManager = menuManager;
- }
-
- public void setSelectionManager(SelectionManager selectionManager) {
- this.selectionManager = selectionManager;
- }
-
- public void setActivityIconManager(ActivityIconManager activityIconManager) {
- this.activityIconManager = activityIconManager;
- }
-
- public void setServiceDescriptionRegistry(ServiceDescriptionRegistry serviceDescriptionRegistry) {
- this.serviceDescriptionRegistry = serviceDescriptionRegistry;
- }
-
- public void setServiceRegistry(ServiceRegistry serviceRegistry) {
- this.serviceRegistry = serviceRegistry;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/AddBeanshellTemplateMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/AddBeanshellTemplateMenuAction.java b/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/AddBeanshellTemplateMenuAction.java
deleted file mode 100644
index 6aa1ce2..0000000
--- a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/AddBeanshellTemplateMenuAction.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007-2009 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.activities.beanshell.menu;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.net.URI;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.KeyStroke;
-
-import net.sf.taverna.t2.activities.beanshell.servicedescriptions.BeanshellTemplateService;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.ui.menu.AbstractMenuAction;
-import net.sf.taverna.t2.ui.menu.DesignOnlyAction;
-import net.sf.taverna.t2.ui.menu.MenuManager;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.selection.SelectionManager;
-import net.sf.taverna.t2.workbench.ui.workflowview.WorkflowView;
-import org.apache.taverna.commons.services.ServiceRegistry;
-
-/**
- * An action to add a beanshell activity + a wrapping processor to the workflow.
- *
- * @author Alex Nenadic
- * @author alanrw
- * @author David Withers
- */
-@SuppressWarnings("serial")
-public class AddBeanshellTemplateMenuAction extends AbstractMenuAction {
-
- private static final String ADD_BEANSHELL = "Beanshell";
-
- private static final URI INSERT = URI
- .create("http://taverna.sf.net/2008/t2workbench/menu#insert");
-
- private static final URI ADD_BEANSHELL_URI = URI
- .create("http://taverna.sf.net/2008/t2workbench/menu#graphMenuAddBeanshell");
-
- private EditManager editManager;
- private MenuManager menuManager;
- private SelectionManager selectionManager;
- private ActivityIconManager activityIconManager;
- private ServiceDescriptionRegistry serviceDescriptionRegistry;
- private ServiceRegistry serviceRegistry;
-
- public AddBeanshellTemplateMenuAction() {
- super(INSERT, 300, ADD_BEANSHELL_URI);
- }
-
- @Override
- protected Action createAction() {
- return new AddBeanshellMenuAction();
- }
-
- protected class AddBeanshellMenuAction extends AbstractAction implements DesignOnlyAction {
- AddBeanshellMenuAction() {
- super();
- putValue(SMALL_ICON,
- activityIconManager.iconForActivity(BeanshellTemplateService.ACTIVITY_TYPE));
- putValue(NAME, ADD_BEANSHELL);
- putValue(SHORT_DESCRIPTION, "Beanshell service");
- putValue(
- Action.ACCELERATOR_KEY,
- KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.SHIFT_DOWN_MASK
- | InputEvent.ALT_DOWN_MASK));
- }
-
- public void actionPerformed(ActionEvent e) {
- WorkflowView.importServiceDescription(serviceDescriptionRegistry
- .getServiceDescription(BeanshellTemplateService.ACTIVITY_TYPE), false,
- editManager, menuManager, selectionManager, serviceRegistry);
- }
- }
-
- public void setEditManager(EditManager editManager) {
- this.editManager = editManager;
- }
-
- public void setMenuManager(MenuManager menuManager) {
- this.menuManager = menuManager;
- }
-
- public void setSelectionManager(SelectionManager selectionManager) {
- this.selectionManager = selectionManager;
- }
-
- public void setActivityIconManager(ActivityIconManager activityIconManager) {
- this.activityIconManager = activityIconManager;
- }
-
- public void setServiceDescriptionRegistry(ServiceDescriptionRegistry serviceDescriptionRegistry) {
- this.serviceDescriptionRegistry = serviceDescriptionRegistry;
- }
-
- public void setServiceRegistry(ServiceRegistry serviceRegistry) {
- this.serviceRegistry = serviceRegistry;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/ConfigureBeanshellMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/ConfigureBeanshellMenuAction.java b/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/ConfigureBeanshellMenuAction.java
deleted file mode 100644
index deea214..0000000
--- a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/menu/ConfigureBeanshellMenuAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package net.sf.taverna.t2.activities.beanshell.menu;
-
-import java.net.URI;
-
-import net.sf.taverna.t2.activities.beanshell.actions.BeanshellActivityConfigurationAction;
-import net.sf.taverna.t2.activities.beanshell.servicedescriptions.BeanshellTemplateService;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.activitytools.AbstractConfigureActivityMenuAction;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-
-import javax.swing.Action;
-
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
-import org.apache.taverna.scufl2.api.activity.Activity;
-
-public class ConfigureBeanshellMenuAction extends AbstractConfigureActivityMenuAction {
-
- public static final URI LOCALWORKER_ACTIVITY = URI
- .create("http://ns.taverna.org.uk/2010/activity/localworker");
-
- private EditManager editManager;
- private FileManager fileManager;
- private ActivityIconManager activityIconManager;
- private ServiceDescriptionRegistry serviceDescriptionRegistry;
- private ApplicationConfiguration applicationConfiguration;
-
- public ConfigureBeanshellMenuAction() {
- super(BeanshellTemplateService.ACTIVITY_TYPE);
- }
-
- @Override
- protected Action createAction() {
- Activity a = findActivity();
- Action result = null;
- if (!(a.getType().equals(LOCALWORKER_ACTIVITY))) {
- result = new BeanshellActivityConfigurationAction(findActivity(), getParentFrame(),
- editManager, fileManager, activityIconManager, serviceDescriptionRegistry,
- applicationConfiguration);
- result.putValue(Action.NAME, BeanshellActivityConfigurationAction.EDIT_BEANSHELL_SCRIPT);
- addMenuDots(result);
- }
- return result;
- }
-
- public void setEditManager(EditManager editManager) {
- this.editManager = editManager;
- }
-
- public void setFileManager(FileManager fileManager) {
- this.fileManager = fileManager;
- }
-
- public void setActivityIconManager(ActivityIconManager activityIconManager) {
- this.activityIconManager = activityIconManager;
- }
-
- public void setServiceDescriptionRegistry(ServiceDescriptionRegistry serviceDescriptionRegistry) {
- this.serviceDescriptionRegistry = serviceDescriptionRegistry;
- }
-
- public void setApplicationConfiguration(ApplicationConfiguration applicationConfiguration) {
- this.applicationConfiguration = applicationConfiguration;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/servicedescriptions/BeanshellActivityIcon.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/servicedescriptions/BeanshellActivityIcon.java b/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/servicedescriptions/BeanshellActivityIcon.java
deleted file mode 100644
index 055aa81..0000000
--- a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/servicedescriptions/BeanshellActivityIcon.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.activities.beanshell.servicedescriptions;
-
-import java.net.URI;
-
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconSPI;
-
-/**
- *
- * @author Alex Nenadic
- * @author David Withers
- */
-public class BeanshellActivityIcon implements ActivityIconSPI {
-
- private static Icon icon = null;
-
- @Override
- public int canProvideIconScore(URI activityType) {
- if (BeanshellTemplateService.ACTIVITY_TYPE.equals(activityType))
- return DEFAULT_ICON + 1;
- else
- return NO_ICON;
- }
-
- @Override
- public Icon getIcon(URI activityType) {
- return getBeanshellIcon();
- }
-
- public static Icon getBeanshellIcon() {
- if (icon == null) {
- icon = new ImageIcon(BeanshellActivityIcon.class.getResource("/beanshell.png"));
- }
- return icon;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/servicedescriptions/BeanshellTemplateService.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/servicedescriptions/BeanshellTemplateService.java b/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/servicedescriptions/BeanshellTemplateService.java
deleted file mode 100644
index 847b73c..0000000
--- a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/servicedescriptions/BeanshellTemplateService.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package net.sf.taverna.t2.activities.beanshell.servicedescriptions;
-
-import java.net.URI;
-
-import javax.swing.Icon;
-
-import net.sf.taverna.t2.servicedescriptions.AbstractTemplateService;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescription;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionProvider;
-import org.apache.taverna.scufl2.api.configurations.Configuration;
-
-public class BeanshellTemplateService extends AbstractTemplateService {
-
- public static final URI ACTIVITY_TYPE = URI.create("http://ns.taverna.org.uk/2010/activity/beanshell");
-
- private static final String BEANSHELL = "Beanshell";
-
- private static final URI providerId = URI
- .create("http://taverna.sf.net/2010/service-provider/beanshell");
-
- public String getName() {
- return BEANSHELL;
- }
-
- @Override
- public URI getActivityType() {
- return ACTIVITY_TYPE;
- }
-
- @Override
- public Configuration getActivityConfiguration() {
- Configuration configuration = new Configuration();
- configuration.setType(ACTIVITY_TYPE.resolve("#Config"));
- configuration.getJsonAsObjectNode().put("script", "");
- configuration.getJsonAsObjectNode().put("classLoaderSharing", "workflow");
- return configuration;
- }
-
- @Override
- public Icon getIcon() {
- return BeanshellActivityIcon.getBeanshellIcon();
- }
-
- @Override
- public String getDescription() {
- return "A service that allows Beanshell scripts, with dependencies on libraries";
- }
-
- public static ServiceDescription getServiceDescription() {
- BeanshellTemplateService bts = new BeanshellTemplateService();
- return bts.templateService;
- }
-
- public String getId() {
- return providerId.toString();
- }
-
- @Override
- public ServiceDescriptionProvider newInstance() {
- return new BeanshellTemplateService();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellActivityViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellActivityViewFactory.java b/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellActivityViewFactory.java
deleted file mode 100644
index 58dd0d4..0000000
--- a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellActivityViewFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.activities.beanshell.views;
-
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.ContextualView;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
-import org.apache.taverna.scufl2.api.activity.Activity;
-
-public class BeanshellActivityViewFactory implements ContextualViewFactory<Activity> {
-
- private static final URI ACTIVITY_TYPE = URI
- .create("http://ns.taverna.org.uk/2010/activity/beanshell");
-
- private EditManager editManager;
- private FileManager fileManager;
- private ActivityIconManager activityIconManager;
- private ColourManager colourManager;
- private ServiceDescriptionRegistry serviceDescriptionRegistry;
-
- private ApplicationConfiguration applicationConfiguration;
-
- public boolean canHandle(Object object) {
- return object instanceof Activity && ((Activity) object).getType().equals(ACTIVITY_TYPE);
- }
-
- public List<ContextualView> getViews(Activity activity) {
- return Arrays.asList(new ContextualView[] { new BeanshellContextualView(activity,
- editManager, fileManager, activityIconManager, colourManager,
- serviceDescriptionRegistry, applicationConfiguration) });
- }
-
- public void setEditManager(EditManager editManager) {
- this.editManager = editManager;
- }
-
- public void setFileManager(FileManager fileManager) {
- this.fileManager = fileManager;
- }
-
- public void setActivityIconManager(ActivityIconManager activityIconManager) {
- this.activityIconManager = activityIconManager;
- }
-
- public void setColourManager(ColourManager colourManager) {
- this.colourManager = colourManager;
- }
-
- public void setServiceDescriptionRegistry(ServiceDescriptionRegistry serviceDescriptionRegistry) {
- this.serviceDescriptionRegistry = serviceDescriptionRegistry;
- }
-
- public void setApplicationConfiguration(ApplicationConfiguration applicationConfiguration) {
- this.applicationConfiguration = applicationConfiguration;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellConfigurationPanel.java b/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellConfigurationPanel.java
deleted file mode 100644
index a4bece7..0000000
--- a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellConfigurationPanel.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2012 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.activities.beanshell.views;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import net.sf.taverna.t2.lang.ui.EditorKeySetUtil;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityPortConfiguration;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.DependencyConfigurationPanel;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ListConfigurationComponent;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.MultiPageActivityConfigurationPanel;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ScriptConfigurationComponent;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ValidatingTextField;
-import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ValidatingTextGroup;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
-import org.apache.taverna.scufl2.api.activity.Activity;
-import org.apache.taverna.scufl2.api.port.InputActivityPort;
-import org.apache.taverna.scufl2.api.port.OutputActivityPort;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-
-/**
- * Component for configuring a Beanshell activity.
- *
- * @author David Withers
- */
-@SuppressWarnings("serial")
-public class BeanshellConfigurationPanel extends MultiPageActivityConfigurationPanel {
-
- private ScriptConfigurationComponent scriptConfigurationComponent;
- private ValidatingTextGroup inputTextGroup, outputTextGroup;
- private DependencyConfigurationPanel dependencyConfigurationPanel;
- private File libDir;
-
- public BeanshellConfigurationPanel(Activity activity,
- ApplicationConfiguration applicationConfiguration) {
- super(activity);
- libDir = new File(applicationConfiguration.getApplicationHomeDir(), "lib");
- if (!libDir.exists()) {
- libDir.mkdir();
- }
- initialise();
- }
-
- @Override
- protected void initialise() {
- super.initialise();
- removeAllPages();
- addPage("Script", createScriptEditPanel());
- addPage("Input ports", createInputPanel());
- addPage("Output ports", createOutputPanel());
- addPage("Dependencies", createDependenciesPanel());
- setPreferredSize(new Dimension(600, 500));
- }
-
- @Override
- public void noteConfiguration() {
- setProperty("script", scriptConfigurationComponent.getScript());
- setProperty("classLoaderSharing", dependencyConfigurationPanel.getClassLoaderSharing());
- List<String> localDependencies = dependencyConfigurationPanel.getLocalDependencies();
- if (localDependencies == null || localDependencies.isEmpty()) {
- getJson().remove("localDependency");
- } else {
- ArrayNode localDependenciesArray = getJson().arrayNode();
- for (String localDependency : localDependencies) {
- localDependenciesArray.add(localDependency);
- }
- getJson().put("localDependency", localDependenciesArray);
- }
- }
-
- @Override
- public boolean checkValues() {
- return true;
- }
-
- private Component createScriptEditPanel() {
- Set<String> keywords = EditorKeySetUtil.loadKeySet(getClass().getResourceAsStream(
- "keys.txt"));
- Set<String> ports = new HashSet<>();
- for (InputActivityPort ip : getActivity().getInputPorts()) {
- ports.add(ip.getName());
- }
- for (OutputActivityPort op : getActivity().getOutputPorts()) {
- ports.add(op.getName());
- }
- scriptConfigurationComponent = new ScriptConfigurationComponent(getProperty("script"),
- keywords, ports, "Beanshell", ".bsh");
- return scriptConfigurationComponent;
- }
-
- private Component createInputPanel() {
- inputTextGroup = new ValidatingTextGroup();
- ListConfigurationComponent<ActivityPortConfiguration> inputPanel = new ListConfigurationComponent<ActivityPortConfiguration>(
- "Input Port", getInputPorts()) {
- @Override
- protected Component createItemComponent(ActivityPortConfiguration port) {
- return new PortComponent(port, inputTextGroup);
- }
-
- @Override
- protected ActivityPortConfiguration createDefaultItem() {
- return new ActivityPortConfiguration("in", 0);
- }
- };
- return inputPanel;
- }
-
- private Component createOutputPanel() {
- outputTextGroup = new ValidatingTextGroup();
- ListConfigurationComponent<ActivityPortConfiguration> inputPanel = new ListConfigurationComponent<ActivityPortConfiguration>(
- "Output Port", getOutputPorts()) {
- @Override
- protected Component createItemComponent(ActivityPortConfiguration port) {
- return new PortComponent(port, outputTextGroup);
- }
-
- @Override
- protected ActivityPortConfiguration createDefaultItem() {
- return new ActivityPortConfiguration("out", 0);
- }
- };
- return inputPanel;
- }
-
- private Component createDependenciesPanel() {
- String classLoaderSharing = getProperty("classLoaderSharing");
- List<String> localDependencies = new ArrayList<>();
- if (getJson().has("localDependency")) {
- for (JsonNode localDependency : getJson().get("localDependency")) {
- localDependencies.add(localDependency.textValue());
- }
- }
- dependencyConfigurationPanel = new DependencyConfigurationPanel(classLoaderSharing,
- localDependencies, libDir);
- return dependencyConfigurationPanel;
- }
-
- class PortComponent extends JPanel {
-
- private ValidatingTextField nameField;
- private SpinnerNumberModel depthModel;
- private final ValidatingTextGroup validatingTextGroup;
-
- public PortComponent(final ActivityPortConfiguration portConfiguration,
- ValidatingTextGroup validatingTextGroup) {
- this.validatingTextGroup = validatingTextGroup;
-
- nameField = new ValidatingTextField(portConfiguration.getName());
- nameField.getDocument().addDocumentListener(new DocumentListener() {
- @Override
- public void removeUpdate(DocumentEvent e) {
- portConfiguration.setName(nameField.getText());
- }
-
- @Override
- public void insertUpdate(DocumentEvent e) {
- portConfiguration.setName(nameField.getText());
- }
-
- @Override
- public void changedUpdate(DocumentEvent e) {
- portConfiguration.setName(nameField.getText());
- }
- });
- validatingTextGroup.addValidTextComponent(nameField);
- depthModel = new SpinnerNumberModel(portConfiguration.getDepth(), 0, 100, 1);
- depthModel.addChangeListener(new ChangeListener() {
- @Override
- public void stateChanged(ChangeEvent e) {
- portConfiguration.setDepth(depthModel.getNumber().intValue());
- }
- });
-
- setLayout(new GridBagLayout());
- GridBagConstraints c = new GridBagConstraints();
- c.anchor = GridBagConstraints.WEST;
- add(new JLabel("Name"), c);
- c.fill = GridBagConstraints.HORIZONTAL;
- c.weightx = 1;
- add(nameField, c);
- c.fill = GridBagConstraints.NONE;
- c.weightx = 0;
- add(new JLabel("Depth"), c);
- add(new JSpinner(depthModel), c);
-
- }
-
- public void removeNotify() {
- validatingTextGroup.removeTextComponent(nameField);
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellContextualView.java b/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellContextualView.java
deleted file mode 100644
index 1f08aa9..0000000
--- a/taverna-beanshell-activity-ui/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellContextualView.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.activities.beanshell.views;
-
-import java.awt.Frame;
-
-import javax.swing.Action;
-
-import net.sf.taverna.t2.activities.beanshell.actions.BeanshellActivityConfigurationAction;
-import net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry;
-import net.sf.taverna.t2.workbench.activityicons.ActivityIconManager;
-import net.sf.taverna.t2.workbench.configuration.colour.ColourManager;
-import net.sf.taverna.t2.workbench.edits.EditManager;
-import net.sf.taverna.t2.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.ui.actions.activity.HTMLBasedActivityContextualView;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
-import org.apache.taverna.scufl2.api.activity.Activity;
-import org.apache.taverna.scufl2.api.port.InputActivityPort;
-import org.apache.taverna.scufl2.api.port.OutputActivityPort;
-
-/**
- * A simple non editable HTML table view over a {@link BeanshellActivity}.
- * Clicking on the configure button shows the editable {@link BeanshellConfigView}
- *
- * @author Ian Dunlop
- * @author Stuart Owen
- * @author David Withers
- */
-@SuppressWarnings("serial")
-public class BeanshellContextualView extends HTMLBasedActivityContextualView {
-
- private EditManager editManager;
- private FileManager fileManager;
- private final ActivityIconManager activityIconManager;
- private final ServiceDescriptionRegistry serviceDescriptionRegistry;
- private final ApplicationConfiguration applicationConfiguration;
-
- public BeanshellContextualView(Activity activity, EditManager editManager,
- FileManager fileManager, ActivityIconManager activityIconManager,
- ColourManager colourManager, ServiceDescriptionRegistry serviceDescriptionRegistry,
- ApplicationConfiguration applicationConfiguration) {
- super(activity, colourManager);
- this.editManager = editManager;
- this.fileManager = fileManager;
- this.activityIconManager = activityIconManager;
- this.serviceDescriptionRegistry = serviceDescriptionRegistry;
- this.applicationConfiguration = applicationConfiguration;
- init();
- }
-
- private void init() {
- }
-
- @Override
- protected String getRawTableRowsHtml() {
- StringBuilder html = new StringBuilder();
- html.append("<tr><th>Input Port Name</th><th>Depth</th></tr>");
- for (InputActivityPort inputActivityPort : getActivity().getInputPorts()) {
- html.append("<tr><td>" + inputActivityPort.getName() + "</td><td>");
- html.append(inputActivityPort.getDepth() + "</td></tr>");
- }
- html.append("<tr><th>Output Port Name</th><th>Depth</th></tr>");
- for (OutputActivityPort outputActivityPort : getActivity().getOutputPorts()) {
- html.append("<tr><td>" + outputActivityPort.getName() + "</td><td>");
- html.append(outputActivityPort.getDepth() + "</td></tr>");
- }
- return html.toString();
- }
-
- @Override
- public String getViewTitle() {
- return "Beanshell service";
- }
-
- @Override
- public Action getConfigureAction(Frame owner) {
- return new BeanshellActivityConfigurationAction(getActivity(), owner, editManager,
- fileManager, activityIconManager, serviceDescriptionRegistry, applicationConfiguration);
- }
-
- @Override
- public int getPreferredPosition() {
- return 100;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/actions/BeanshellActivityConfigurationAction.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/actions/BeanshellActivityConfigurationAction.java b/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/actions/BeanshellActivityConfigurationAction.java
new file mode 100644
index 0000000..1a7b189
--- /dev/null
+++ b/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/actions/BeanshellActivityConfigurationAction.java
@@ -0,0 +1,70 @@
+/*
+* 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.activities.beanshell.actions;
+
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+
+import org.apache.taverna.activities.beanshell.views.BeanshellConfigurationPanel;
+import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry;
+import org.apache.taverna.workbench.activityicons.ActivityIconManager;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.file.FileManager;
+import org.apache.taverna.workbench.ui.actions.activity.ActivityConfigurationAction;
+import org.apache.taverna.workbench.ui.views.contextualviews.activity.ActivityConfigurationDialog;
+import uk.org.taverna.configuration.app.ApplicationConfiguration;
+import org.apache.taverna.scufl2.api.activity.Activity;
+
+@SuppressWarnings("serial")
+public class BeanshellActivityConfigurationAction extends ActivityConfigurationAction {
+
+ public static final String EDIT_BEANSHELL_SCRIPT = "Edit beanshell script";
+ private final EditManager editManager;
+ private final FileManager fileManager;
+ private final ApplicationConfiguration applicationConfiguration;
+
+ public BeanshellActivityConfigurationAction(Activity activity, Frame owner,
+ EditManager editManager, FileManager fileManager,
+ ActivityIconManager activityIconManager,
+ ServiceDescriptionRegistry serviceDescriptionRegistry,
+ ApplicationConfiguration applicationConfiguration) {
+ super(activity, activityIconManager, serviceDescriptionRegistry);
+ this.editManager = editManager;
+ this.fileManager = fileManager;
+ this.applicationConfiguration = applicationConfiguration;
+ putValue(NAME, EDIT_BEANSHELL_SCRIPT);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ ActivityConfigurationDialog currentDialog = ActivityConfigurationAction.getDialog(getActivity());
+ if (currentDialog != null) {
+ currentDialog.toFront();
+ return;
+ }
+ final BeanshellConfigurationPanel beanshellConfigView = new BeanshellConfigurationPanel(
+ getActivity(), applicationConfiguration);
+ final ActivityConfigurationDialog dialog = new ActivityConfigurationDialog(getActivity(),
+ beanshellConfigView, editManager);
+
+ ActivityConfigurationAction.setDialog(getActivity(), dialog, fileManager);
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/AddBeanshellTemplateAction.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/AddBeanshellTemplateAction.java b/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/AddBeanshellTemplateAction.java
new file mode 100644
index 0000000..60186a5
--- /dev/null
+++ b/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/AddBeanshellTemplateAction.java
@@ -0,0 +1,112 @@
+/*
+* 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.activities.beanshell.menu;
+
+import java.awt.event.ActionEvent;
+import java.net.URI;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+
+import org.apache.taverna.activities.beanshell.servicedescriptions.BeanshellTemplateService;
+import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry;
+import org.apache.taverna.ui.menu.AbstractContextualMenuAction;
+import org.apache.taverna.ui.menu.MenuManager;
+import org.apache.taverna.workbench.activityicons.ActivityIconManager;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
+import org.apache.taverna.workbench.ui.workflowview.WorkflowView;
+import org.apache.taverna.commons.services.ServiceRegistry;
+import org.apache.taverna.scufl2.api.core.Workflow;
+
+/**
+ * An action to add a beanshell activity + a wrapping processor to the workflow.
+ *
+ * @author Alex Nenadic
+ * @author David Withers
+ */
+@SuppressWarnings("serial")
+public class AddBeanshellTemplateAction extends AbstractContextualMenuAction {
+
+ private static final String ADD_BEANSHELL = "Beanshell";
+
+ private static final URI insertSection = URI
+ .create("http://taverna.sf.net/2009/contextMenu/insert");
+
+ private EditManager editManager;
+ private MenuManager menuManager;
+ private SelectionManager selectionManager;
+ private ActivityIconManager activityIconManager;
+ private ServiceDescriptionRegistry serviceDescriptionRegistry;
+ private ServiceRegistry serviceRegistry;
+
+ public AddBeanshellTemplateAction() {
+ super(insertSection, 300);
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return super.isEnabled() && getContextualSelection().getSelection() instanceof Workflow;
+ }
+
+ @Override
+ protected Action createAction() {
+
+ return new AddBeanshellAction();
+ }
+
+ protected class AddBeanshellAction extends AbstractAction {
+ AddBeanshellAction() {
+ super(ADD_BEANSHELL, activityIconManager
+ .iconForActivity(BeanshellTemplateService.ACTIVITY_TYPE));
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ WorkflowView.importServiceDescription(serviceDescriptionRegistry
+ .getServiceDescription(BeanshellTemplateService.ACTIVITY_TYPE), false,
+ editManager, menuManager, selectionManager, serviceRegistry);
+ }
+ }
+
+ public void setEditManager(EditManager editManager) {
+ this.editManager = editManager;
+ }
+
+ public void setMenuManager(MenuManager menuManager) {
+ this.menuManager = menuManager;
+ }
+
+ public void setSelectionManager(SelectionManager selectionManager) {
+ this.selectionManager = selectionManager;
+ }
+
+ public void setActivityIconManager(ActivityIconManager activityIconManager) {
+ this.activityIconManager = activityIconManager;
+ }
+
+ public void setServiceDescriptionRegistry(ServiceDescriptionRegistry serviceDescriptionRegistry) {
+ this.serviceDescriptionRegistry = serviceDescriptionRegistry;
+ }
+
+ public void setServiceRegistry(ServiceRegistry serviceRegistry) {
+ this.serviceRegistry = serviceRegistry;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/AddBeanshellTemplateMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/AddBeanshellTemplateMenuAction.java b/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/AddBeanshellTemplateMenuAction.java
new file mode 100644
index 0000000..7ec6d66
--- /dev/null
+++ b/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/AddBeanshellTemplateMenuAction.java
@@ -0,0 +1,120 @@
+/*
+* 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.activities.beanshell.menu;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.net.URI;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
+
+import org.apache.taverna.activities.beanshell.servicedescriptions.BeanshellTemplateService;
+import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry;
+import org.apache.taverna.ui.menu.AbstractMenuAction;
+import org.apache.taverna.ui.menu.DesignOnlyAction;
+import org.apache.taverna.ui.menu.MenuManager;
+import org.apache.taverna.workbench.activityicons.ActivityIconManager;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.selection.SelectionManager;
+import org.apache.taverna.workbench.ui.workflowview.WorkflowView;
+import org.apache.taverna.commons.services.ServiceRegistry;
+
+/**
+ * An action to add a beanshell activity + a wrapping processor to the workflow.
+ *
+ * @author Alex Nenadic
+ * @author alanrw
+ * @author David Withers
+ */
+@SuppressWarnings("serial")
+public class AddBeanshellTemplateMenuAction extends AbstractMenuAction {
+
+ private static final String ADD_BEANSHELL = "Beanshell";
+
+ private static final URI INSERT = URI
+ .create("http://taverna.sf.net/2008/t2workbench/menu#insert");
+
+ private static final URI ADD_BEANSHELL_URI = URI
+ .create("http://taverna.sf.net/2008/t2workbench/menu#graphMenuAddBeanshell");
+
+ private EditManager editManager;
+ private MenuManager menuManager;
+ private SelectionManager selectionManager;
+ private ActivityIconManager activityIconManager;
+ private ServiceDescriptionRegistry serviceDescriptionRegistry;
+ private ServiceRegistry serviceRegistry;
+
+ public AddBeanshellTemplateMenuAction() {
+ super(INSERT, 300, ADD_BEANSHELL_URI);
+ }
+
+ @Override
+ protected Action createAction() {
+ return new AddBeanshellMenuAction();
+ }
+
+ protected class AddBeanshellMenuAction extends AbstractAction implements DesignOnlyAction {
+ AddBeanshellMenuAction() {
+ super();
+ putValue(SMALL_ICON,
+ activityIconManager.iconForActivity(BeanshellTemplateService.ACTIVITY_TYPE));
+ putValue(NAME, ADD_BEANSHELL);
+ putValue(SHORT_DESCRIPTION, "Beanshell service");
+ putValue(
+ Action.ACCELERATOR_KEY,
+ KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.SHIFT_DOWN_MASK
+ | InputEvent.ALT_DOWN_MASK));
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ WorkflowView.importServiceDescription(serviceDescriptionRegistry
+ .getServiceDescription(BeanshellTemplateService.ACTIVITY_TYPE), false,
+ editManager, menuManager, selectionManager, serviceRegistry);
+ }
+ }
+
+ public void setEditManager(EditManager editManager) {
+ this.editManager = editManager;
+ }
+
+ public void setMenuManager(MenuManager menuManager) {
+ this.menuManager = menuManager;
+ }
+
+ public void setSelectionManager(SelectionManager selectionManager) {
+ this.selectionManager = selectionManager;
+ }
+
+ public void setActivityIconManager(ActivityIconManager activityIconManager) {
+ this.activityIconManager = activityIconManager;
+ }
+
+ public void setServiceDescriptionRegistry(ServiceDescriptionRegistry serviceDescriptionRegistry) {
+ this.serviceDescriptionRegistry = serviceDescriptionRegistry;
+ }
+
+ public void setServiceRegistry(ServiceRegistry serviceRegistry) {
+ this.serviceRegistry = serviceRegistry;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/ConfigureBeanshellMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/ConfigureBeanshellMenuAction.java b/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/ConfigureBeanshellMenuAction.java
new file mode 100644
index 0000000..bcecbc5
--- /dev/null
+++ b/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/menu/ConfigureBeanshellMenuAction.java
@@ -0,0 +1,86 @@
+/*
+* 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.activities.beanshell.menu;
+
+import java.net.URI;
+
+import org.apache.taverna.activities.beanshell.actions.BeanshellActivityConfigurationAction;
+import org.apache.taverna.activities.beanshell.servicedescriptions.BeanshellTemplateService;
+import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry;
+import org.apache.taverna.workbench.activityicons.ActivityIconManager;
+import org.apache.taverna.workbench.activitytools.AbstractConfigureActivityMenuAction;
+import org.apache.taverna.workbench.edits.EditManager;
+import org.apache.taverna.workbench.file.FileManager;
+
+import javax.swing.Action;
+
+import uk.org.taverna.configuration.app.ApplicationConfiguration;
+import org.apache.taverna.scufl2.api.activity.Activity;
+
+public class ConfigureBeanshellMenuAction extends AbstractConfigureActivityMenuAction {
+
+ public static final URI LOCALWORKER_ACTIVITY = URI
+ .create("http://ns.taverna.org.uk/2010/activity/localworker");
+
+ private EditManager editManager;
+ private FileManager fileManager;
+ private ActivityIconManager activityIconManager;
+ private ServiceDescriptionRegistry serviceDescriptionRegistry;
+ private ApplicationConfiguration applicationConfiguration;
+
+ public ConfigureBeanshellMenuAction() {
+ super(BeanshellTemplateService.ACTIVITY_TYPE);
+ }
+
+ @Override
+ protected Action createAction() {
+ Activity a = findActivity();
+ Action result = null;
+ if (!(a.getType().equals(LOCALWORKER_ACTIVITY))) {
+ result = new BeanshellActivityConfigurationAction(findActivity(), getParentFrame(),
+ editManager, fileManager, activityIconManager, serviceDescriptionRegistry,
+ applicationConfiguration);
+ result.putValue(Action.NAME, BeanshellActivityConfigurationAction.EDIT_BEANSHELL_SCRIPT);
+ addMenuDots(result);
+ }
+ return result;
+ }
+
+ public void setEditManager(EditManager editManager) {
+ this.editManager = editManager;
+ }
+
+ public void setFileManager(FileManager fileManager) {
+ this.fileManager = fileManager;
+ }
+
+ public void setActivityIconManager(ActivityIconManager activityIconManager) {
+ this.activityIconManager = activityIconManager;
+ }
+
+ public void setServiceDescriptionRegistry(ServiceDescriptionRegistry serviceDescriptionRegistry) {
+ this.serviceDescriptionRegistry = serviceDescriptionRegistry;
+ }
+
+ public void setApplicationConfiguration(ApplicationConfiguration applicationConfiguration) {
+ this.applicationConfiguration = applicationConfiguration;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/163747de/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/servicedescriptions/BeanshellActivityIcon.java
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/servicedescriptions/BeanshellActivityIcon.java b/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/servicedescriptions/BeanshellActivityIcon.java
new file mode 100644
index 0000000..0708f0a
--- /dev/null
+++ b/taverna-beanshell-activity-ui/src/main/java/org/apache/taverna/activities/beanshell/servicedescriptions/BeanshellActivityIcon.java
@@ -0,0 +1,57 @@
+/*
+* 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.activities.beanshell.servicedescriptions;
+
+import java.net.URI;
+
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+
+import org.apache.taverna.workbench.activityicons.ActivityIconSPI;
+
+/**
+ *
+ * @author Alex Nenadic
+ * @author David Withers
+ */
+public class BeanshellActivityIcon implements ActivityIconSPI {
+
+ private static Icon icon = null;
+
+ @Override
+ public int canProvideIconScore(URI activityType) {
+ if (BeanshellTemplateService.ACTIVITY_TYPE.equals(activityType))
+ return DEFAULT_ICON + 1;
+ else
+ return NO_ICON;
+ }
+
+ @Override
+ public Icon getIcon(URI activityType) {
+ return getBeanshellIcon();
+ }
+
+ public static Icon getBeanshellIcon() {
+ if (icon == null) {
+ icon = new ImageIcon(BeanshellActivityIcon.class.getResource("/beanshell.png"));
+ }
+ return icon;
+ }
+}