http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/TestSimpleMerge.java ---------------------------------------------------------------------- diff --git a/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/TestSimpleMerge.java b/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/TestSimpleMerge.java deleted file mode 100644 index 811678e..0000000 --- a/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/TestSimpleMerge.java +++ /dev/null @@ -1,98 +0,0 @@ -package net.sf.taverna.t2.workbench.file.importworkflow; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; - -import java.util.List; - -import org.junit.Ignore; -import org.junit.Test; - -import uk.org.taverna.scufl2.api.core.DataLink; -import uk.org.taverna.scufl2.api.core.Processor; -import uk.org.taverna.scufl2.api.core.Workflow; -import uk.org.taverna.scufl2.api.port.InputProcessorPort; -import uk.org.taverna.scufl2.api.port.InputWorkflowPort; -import uk.org.taverna.scufl2.api.port.SenderPort; - -@Ignore -public class TestSimpleMerge extends AbstractTestHelper { - - private void checkMergedAbcP(Workflow merged) { - // Check that it has everything from both - assertHasProcessors(merged, "A", "B", "C", "P"); - assertHasInputPorts(merged, "in1", "in2", "i"); - assertHasOutputPorts(merged, "a", "b", "c", "o"); - assertHasDatalinks(merged, "in2->B.inputlist", "in1->A.string1", - "in2->A.string2", "Merge0:Merge0_output->C.inputlist", - "A.output->a", "B.outputlist->b", - "B.outputlist->Merge0:outputlistToMerge0_input0", - "A.output->Merge0:outputToMerge0_input0", "C.outputlist->c", - "i->P.inputlist", "P.outputlist->o"); - assertHasConditionals(merged, "A;B"); - } - - private void checkCopiedFromP(Workflow merged) { - Processor newProcP = findProcessor(merged, "P"); - Processor originalProcP = findProcessor(p, "P"); - assertNotSame("Did not copy processor P", newProcP, originalProcP); - - InputProcessorPort inp = newProcP.getInputPorts().first(); - InputWorkflowPort newInI = findInputPort(merged, "i"); - assertEquals(0, newInI.getDepth().intValue()); - - InputWorkflowPort originalInI = findInputPort(p, "i"); - assertNotSame("Did not copy port 'i'", originalInI, newInI); - - List<DataLink> datalinksTo = scufl2Tools.datalinksTo(inp); - assertEquals(1, datalinksTo.size()); - SenderPort source = datalinksTo.get(0).getReceivesFrom(); - - assertSame("Not linked to new port", source, newInI); - assertNotSame("Still linked to old port", source, originalInI); - } - - - @Test - public void mergeAbcAndPIntoNew() throws Exception { - Workflow merged = new Workflow(); - DataflowMerger merger = new DataflowMerger(merged); - merger.getMergeEdit(abc).doEdit(); - - assertNotSame(abc, merged); - merger.getMergeEdit(p).doEdit(); - - - // Assert abc and p were not modified - checkAbc(); - checkP(); - - checkMergedAbcP(merged); - checkCopiedFromP(merged); - } - - @Test - public void mergePintoAbc() throws Exception { - DataflowMerger merger = new DataflowMerger(abc); - Workflow merged = abc; - - merger.getMergeEdit(p).doEdit(); - checkMergedAbcP(merged); - checkCopiedFromP(merged); - // Assert P did not change - checkP(); - } - - @Test - public void mergeAbcintoP() throws Exception { - Workflow merged = p; - DataflowMerger merger = new DataflowMerger(merged); - merger.getMergeEdit(abc).doEdit(); - - checkMergedAbcP(merged); - // Assert ABC did not change - checkAbc(); - } - -}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/TestTestHelper.java ---------------------------------------------------------------------- diff --git a/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/TestTestHelper.java b/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/TestTestHelper.java deleted file mode 100644 index 2165a67..0000000 --- a/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/TestTestHelper.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.sf.taverna.t2.workbench.file.importworkflow; - -import org.junit.Ignore; -import org.junit.Test; - -@Ignore -public class TestTestHelper extends AbstractTestHelper { - - @Test - public void checkAbc() throws Exception { - super.checkAbc(); - } - - @Test - public void checkP() throws Exception { - super.checkP(); - } - - @Test - public void checkQ() throws Exception { - super.checkQ(); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/gui/ImportWizardLauncher.java ---------------------------------------------------------------------- diff --git a/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/gui/ImportWizardLauncher.java b/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/gui/ImportWizardLauncher.java deleted file mode 100644 index b45a774..0000000 --- a/taverna-dataflow-activity-ui/src/test/java/net/sf/taverna/t2/workbench/file/importworkflow/gui/ImportWizardLauncher.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.sf.taverna.t2.workbench.file.importworkflow.gui; - -import javax.swing.UIManager; - -import net.sf.taverna.t2.workbench.edits.EditManager; -import net.sf.taverna.t2.workbench.edits.impl.EditManagerImpl; -import net.sf.taverna.t2.workbench.file.FileManager; -import net.sf.taverna.t2.workbench.file.impl.FileManagerImpl; - - -public class ImportWizardLauncher { - - public static void main(String[] args) throws Exception { - - UIManager.setLookAndFeel(UIManager - .getSystemLookAndFeelClassName()); - - EditManager editManager = new EditManagerImpl(); - FileManager fileManager = new FileManagerImpl(editManager); - - ImportWorkflowWizard s = new ImportWorkflowWizard(null, editManager, fileManager, null, null, null, null); - s.setVisible(true); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/test/resources/abc.t2flow ---------------------------------------------------------------------- diff --git a/taverna-dataflow-activity-ui/src/test/resources/abc.t2flow b/taverna-dataflow-activity-ui/src/test/resources/abc.t2flow deleted file mode 100644 index a30cdc6..0000000 --- a/taverna-dataflow-activity-ui/src/test/resources/abc.t2flow +++ /dev/null @@ -1,116 +0,0 @@ -<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"; version="1" producedBy="taverna-2.1-beta-2"><dataflow id="55a3691f-127a-4fd3-b51c-a7ed27f6ec88" role="top"><name>Workflow2</name><inputPorts><port><name>in1</name><depth>0</depth><granularDepth>0</granularDepth><annotations /></port><port><name>in2</name><depth>1</depth><granularDepth>1</granularDepth><annotations /></port></inputPorts><outputPorts><port><name>a</name></port><port><name>b</name></port><port><name>c</name></port></outputPorts><processors><processor><name>B</name><inputPorts><port><name>inputlist</name><depth>1</depth></port></inputPorts><outputPorts><port><name>outputlist</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>localworker-activity</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.activities.localworker.LocalworkerActivity</class><inputMap><map from="inputlist" to="in putlist" /></inputMap><outputMap><map from="outputlist" to="outputlist" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean xmlns=""> - <script>outputlist = inputlist;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>[B</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>inputlist</name> - <depth>1</depth> - <mimeTypes> - <string>l('')</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>1</granularDepth> - <name>outputlist</name> - <depth>1</depth> - <mimeTypes> - <string>l('')</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="inputlist" depth="1" /></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>A</name><inputPorts><port><name>string1</name><depth>0</depth></port><port><name>string2</name><depth>0</depth></port></inputPorts><outputPorts><port><name>output</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>localworker-activity</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.act ivities.localworker.LocalworkerActivity</class><inputMap><map from="string2" to="string2" /><map from="string1" to="string1" /></inputMap><outputMap><map from="output" to="output" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean xmlns=""> - <script>output = string1 + string2;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>string1</name> - <depth>0</depth> - <mimeTypes> - <string>'text/plain'</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>string2</name> - <depth>0</depth> - <mimeTypes> - <string>'text/plain'</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>0</granularDepth> - <name>output</name> - <depth>0</depth> - <mimeTypes> - <string>'text/plain'</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="string1" depth="0" /><port name="string2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>C</name><inputPorts><port><name>inputlist</name><depth>1</depth></port></inputPorts><outputPorts><port><name>outputlist</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>localworker-activity</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.activities.loca lworker.LocalworkerActivity</class><inputMap><map from="inputlist" to="inputlist" /></inputMap><outputMap><map from="outputlist" to="outputlist" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean xmlns=""> - <script>outputlist = inputlist;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>[B</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>inputlist</name> - <depth>1</depth> - <mimeTypes> - <string>l('')</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>1</granularDepth> - <name>outputlist</name> - <depth>1</depth> - <mimeTypes> - <string>l('')</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="inputlist" depth="1" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions><condition control="A" target="B" /></conditions><datalinks><datalink><sink type="processor"><processor>B</processor><port>inputlist</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="processor"><processor>A</processor><port>string1</port></sink><source type="dataflow"><port>in1</port></source></datalink><datalink><sink type="processor"><processor>A</processor><port>str ing2</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="merge"><processor>C</processor><port>inputlist</port></sink><source type="processor"><processor>B</processor><port>outputlist</port></source></datalink><datalink><sink type="merge"><processor>C</processor><port>inputlist</port></sink><source type="processor"><processor>A</processor><port>output</port></source></datalink><datalink><sink type="dataflow"><port>a</port></sink><source type="processor"><processor>A</processor><port>output</port></source></datalink><datalink><sink type="dataflow"><port>b</port></sink><source type="processor"><processor>B</processor><port>outputlist</port></source></datalink><datalink><sink type="dataflow"><port>c</port></sink><source type="processor"><processor>C</processor><port>outputlist</port></source></datalink></datalinks><annotations /></dataflow></workflow> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/test/resources/p.t2flow ---------------------------------------------------------------------- diff --git a/taverna-dataflow-activity-ui/src/test/resources/p.t2flow b/taverna-dataflow-activity-ui/src/test/resources/p.t2flow deleted file mode 100644 index d4e191c..0000000 --- a/taverna-dataflow-activity-ui/src/test/resources/p.t2flow +++ /dev/null @@ -1,36 +0,0 @@ -<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"; version="1" producedBy="taverna-2.1-beta-2"><dataflow id="a158f691-3561-424f-bec1-e6359b6b486f" role="top"><name>Workflow7</name><inputPorts><port><name>i</name><depth>0</depth><granularDepth>0</granularDepth><annotations /></port></inputPorts><outputPorts><port><name>o</name></port></outputPorts><processors><processor><name>P</name><inputPorts><port><name>inputlist</name><depth>1</depth></port></inputPorts><outputPorts><port><name>outputlist</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>localworker-activity</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.activities.localworker.LocalworkerActivity</class><inputMap><map from="inputlist" to="inputlist" /></inputMap><outputMap><map from="outputlist" to="outputlist" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.l ocalworker.LocalworkerActivityConfigurationBean xmlns=""> - <script>outputlist = inputlist;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>[B</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>inputlist</name> - <depth>1</depth> - <mimeTypes> - <string>l('')</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>1</granularDepth> - <name>outputlist</name> - <depth>1</depth> - <mimeTypes> - <string>l('')</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="inputlist" depth="1" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>P</processor><port>inputlist</port></sink><source type="dataflow"><port>i</port></source></datalink><datalink><sink type="dataflow"><port>o</port></sink><source type="processor"><processor>P</processor><port>outputlist</port></source></datalink></datalinks><annotations /></dataflow></workflow> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-dataflow-activity-ui/src/test/resources/q.t2flow ---------------------------------------------------------------------- diff --git a/taverna-dataflow-activity-ui/src/test/resources/q.t2flow b/taverna-dataflow-activity-ui/src/test/resources/q.t2flow deleted file mode 100644 index 03a3cd2..0000000 --- a/taverna-dataflow-activity-ui/src/test/resources/q.t2flow +++ /dev/null @@ -1,36 +0,0 @@ -<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"; version="1" producedBy="taverna-2.1-beta-2"><dataflow id="0833816b-d18b-41b4-b2f7-dae317023444" role="top"><name>Workflow2</name><inputPorts><port><name>p</name><depth>1</depth><granularDepth>1</granularDepth><annotations /></port></inputPorts><outputPorts><port><name>q</name></port><port><name>p</name></port></outputPorts><processors><processor><name>Q</name><inputPorts><port><name>inputlist</name><depth>1</depth></port></inputPorts><outputPorts><port><name>outputlist</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>localworker-activity</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.activities.localworker.LocalworkerActivity</class><inputMap><map from="inputlist" to="inputlist" /></inputMap><outputMap><map from="outputlist" to="outputlist" /></outputMap><configBean encoding="xstream"><net .sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean xmlns=""> - <script>outputlist = inputlist;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>[B</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>inputlist</name> - <depth>1</depth> - <mimeTypes> - <string>l('')</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>1</granularDepth> - <name>outputlist</name> - <depth>1</depth> - <mimeTypes> - <string>l('')</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="inputlist" depth="1" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>Q</processor><port>inputlist</port></sink><source type="dataflow"><port>p</port></source></datalink><datalink><sink type="dataflow"><port>q</port></sink><source type="processor"><processor>Q</processor><port>outputlist</port></source></datalink><datalink><sink type="dataflow"><port>p</port></sink><source type="dataflow"><port>p</port></source></datalink></d atalinks><annotations /></dataflow></workflow> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-disabled-activity-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/pom.xml b/taverna-disabled-activity-ui/pom.xml deleted file mode 100644 index ddbaf29..0000000 --- a/taverna-disabled-activity-ui/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.sf.taverna</groupId> - <artifactId>taverna-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - </parent> - <groupId>net.sf.taverna.t2.ui-activities</groupId> - <artifactId>disabled-activity-ui</artifactId> - <version>2.0.1-SNAPSHOT</version> - <packaging>bundle</packaging> - <name>Taverna 2 Disabled Activity UI</name> - <dependencies> - <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>activity-icons-api</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>menu-api</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>report-api</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.ui-impl</groupId> - <artifactId>contextual-views-impl</artifactId> - <version>${t2.ui.impl.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>activity-tools</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.ui-components</groupId> - <artifactId>workflow-view</artifactId> - <version>${t2.ui.components.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.activities</groupId> - <artifactId>beanshell-activity</artifactId> - <version>${t2.activities.version}</version> - </dependency> - <dependency> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - <version>${javahelp.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.lang</groupId> - <artifactId>uibuilder</artifactId> - <version>${t2.lang.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.ui-impl</groupId> - <artifactId>helper</artifactId> - <version>${t2.ui.impl.version}</version> - </dependency> - </dependencies> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>mygrid-repository</id> - <name>myGrid Repository</name> - <url>http://www.mygrid.org.uk/maven/repository - </url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots /> - <id>mygrid-snapshot-repository</id> - <name>myGrid Snapshot Repository</name> - <url>http://www.mygrid.org.uk/maven/snapshot-repository</url> - </repository> - </repositories> - <scm> - <connection>scm:git:https://github.com/taverna/taverna-disabled-activity-ui.git</connection> - <developerConnection>scm:git:ssh://[email protected]/taverna/taverna-disabled-activity-ui.git</developerConnection> - <url>https://github.com/taverna/taverna-disabled-activity-ui/</url> - <tag>HEAD</tag> - </scm> -</project> - http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/actions/DisabledActivityConfigurationAction.java ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/actions/DisabledActivityConfigurationAction.java b/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/actions/DisabledActivityConfigurationAction.java deleted file mode 100644 index c71d483..0000000 --- a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/actions/DisabledActivityConfigurationAction.java +++ /dev/null @@ -1,118 +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.disabled.actions; - -import java.awt.Component; -import java.awt.Frame; -import java.awt.event.ActionEvent; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JOptionPane; - -import uk.org.taverna.scufl2.api.activity.Activity; - -import net.sf.taverna.t2.activities.disabled.views.DisabledConfigView; -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.report.ReportManager; -import net.sf.taverna.t2.workbench.ui.actions.activity.ActivityConfigurationAction; -import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityConfigurationDialog; - -@SuppressWarnings("serial") -public class DisabledActivityConfigurationAction extends ActivityConfigurationAction { - - public static final String FIX_DISABLED = "Edit properties"; - private final EditManager editManager; - private final FileManager fileManager; - private final ReportManager reportManager; - - public DisabledActivityConfigurationAction(Activity activity, Frame owner, - EditManager editManager, FileManager fileManager, ReportManager reportManager, - ActivityIconManager activityIconManager, ServiceDescriptionRegistry serviceDescriptionRegistry) { - super(activity, activityIconManager, serviceDescriptionRegistry); - this.editManager = editManager; - this.fileManager = fileManager; - this.reportManager = reportManager; - putValue(NAME, FIX_DISABLED); - } - - public void actionPerformed(ActionEvent e) { - ActivityConfigurationDialog currentDialog = ActivityConfigurationAction - .getDialog(getActivity()); - if (currentDialog != null) { - currentDialog.toFront(); - return; - } - int answer = JOptionPane.showConfirmDialog((Component) e.getSource(), - "Directly editing properties can be dangerous. Are you sure you want to proceed?", - "Confirm editing", JOptionPane.YES_NO_OPTION); - if (answer != JOptionPane.YES_OPTION) { - return; - } - - final DisabledConfigView disabledConfigView = new DisabledConfigView(getActivity()); - final DisabledActivityConfigurationDialog dialog = new DisabledActivityConfigurationDialog( - getActivity(), disabledConfigView); - - ActivityConfigurationAction.setDialog(getActivity(), dialog, fileManager); - - } - - private class DisabledActivityConfigurationDialog extends ActivityConfigurationDialog { - public DisabledActivityConfigurationDialog(Activity a, DisabledConfigView p) { - super(a, p, editManager); - this.setModal(true); - super.applyButton.setEnabled(false); - super.applyButton.setVisible(false); - } - - public void configureActivity(Dataflow df, Activity a, Object bean) { - Edit<?> configureActivityEdit = editManager.getEdits() - .getConfigureActivityEdit(a, bean); - try { - List<Edit<?>> editList = new ArrayList<Edit<?>>(); - editList.add(configureActivityEdit); - Processor p = findProcessor(df, a); - if (p != null && p.getActivityList().size() == 1) { - editList.add(editManager.getEdits().getMapProcessorPortsForActivityEdit(p)); - } - Edit e = Tools.getEnableDisabledActivityEdit(super.owningProcessor, activity, - editManager.getEdits()); - if (e != null) { - editList.add(e); - editManager.doDataflowEdit(df, new CompoundEdit(editList)); - reportManager.updateObjectReport(super.owningDataflow, super.owningProcessor); - - } - } catch (IllegalStateException e) { - // TODO Auto-generated catch block - logger.error(e); - } catch (EditException e) { - logger.error(e); - } - } - - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/menu/ConfigureDisabledMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/menu/ConfigureDisabledMenuAction.java b/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/menu/ConfigureDisabledMenuAction.java deleted file mode 100644 index 68a906e..0000000 --- a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/menu/ConfigureDisabledMenuAction.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.sf.taverna.t2.activities.disabled.menu; - -import javax.swing.Action; - -import net.sf.taverna.t2.activities.disabled.actions.DisabledActivityConfigurationAction; -import net.sf.taverna.t2.activities.disabled.views.DisabledActivityViewFactory; -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 net.sf.taverna.t2.workbench.report.ReportManager; - -public class ConfigureDisabledMenuAction extends AbstractConfigureActivityMenuAction { - - private EditManager editManager; - private FileManager fileManager; - private ReportManager reportManager; - private ActivityIconManager activityIconManager; - private ServiceDescriptionRegistry serviceDescriptionRegistry; - - public ConfigureDisabledMenuAction() { - super(DisabledActivityViewFactory.ACTIVITY_TYPE); - } - - @Override - protected Action createAction() { - return new DisabledActivityConfigurationAction(findActivity(), getParentFrame(), - editManager, fileManager, reportManager, activityIconManager, serviceDescriptionRegistry); - } - - public void setEditManager(EditManager editManager) { - this.editManager = editManager; - } - - public void setFileManager(FileManager fileManager) { - this.fileManager = fileManager; - } - - public void setReportManager(ReportManager reportManager) { - this.reportManager = reportManager; - } - - public void setActivityIconManager(ActivityIconManager activityIconManager) { - this.activityIconManager = activityIconManager; - } - - public void setServiceDescriptionRegistry(ServiceDescriptionRegistry serviceDescriptionRegistry) { - this.serviceDescriptionRegistry = serviceDescriptionRegistry; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledActivityViewFactory.java ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledActivityViewFactory.java b/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledActivityViewFactory.java deleted file mode 100644 index a168974..0000000 --- a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledActivityViewFactory.java +++ /dev/null @@ -1,80 +0,0 @@ -package net.sf.taverna.t2.activities.disabled.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.report.ReportManager; -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.scufl2.api.activity.Activity; - -/** - * This class generates a contextual view for a DisabledActivity - * - * @author alanrw - * @author David Withers - */ -public class DisabledActivityViewFactory implements ContextualViewFactory<Activity> { - - public static final URI ACTIVITY_TYPE = URI.create("http://ns.taverna.org.uk/2010/activity/disabled";); - - private EditManager editManager; - private FileManager fileManager; - private ReportManager reportManager; - private ActivityIconManager activityIconManager; - private ColourManager colourManager; - private ServiceDescriptionRegistry serviceDescriptionRegistry; - - /** - * The factory can handle a DisabledActivity - * - * @param object - * @return - */ - public boolean canHandle(Object object) { - return object instanceof Activity && ((Activity) object).getType().equals(ACTIVITY_TYPE); - } - - /** - * Return a contextual view that can display information about a DisabledActivity - * - * @param activity - * @return - */ - public List<ContextualView> getViews(Activity activity) { - return Arrays.asList(new ContextualView[] { new DisabledContextualView(activity, - editManager, fileManager, reportManager, colourManager, activityIconManager, - serviceDescriptionRegistry) }); - } - - public void setEditManager(EditManager editManager) { - this.editManager = editManager; - } - - public void setFileManager(FileManager fileManager) { - this.fileManager = fileManager; - } - - public void setReportManager(ReportManager reportManager) { - this.reportManager = reportManager; - } - - public void setActivityIconManager(ActivityIconManager activityIconManager) { - this.activityIconManager = activityIconManager; - } - - public void setColourManager(ColourManager colourManager) { - this.colourManager = colourManager; - } - - public void setServiceDescriptionRegistry(ServiceDescriptionRegistry serviceDescriptionRegistry) { - this.serviceDescriptionRegistry = serviceDescriptionRegistry; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java b/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java deleted file mode 100644 index 9c8c9cd..0000000 --- a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledConfigView.java +++ /dev/null @@ -1,141 +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.disabled.views; - -import java.awt.BorderLayout; -import java.beans.BeanInfo; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -import javax.help.CSH; -import javax.swing.JOptionPane; -import javax.swing.JPanel; - -import uk.org.taverna.scufl2.api.activity.Activity; - -import net.sf.taverna.t2.lang.uibuilder.UIBuilder; -import net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ActivityConfigurationPanel; - -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.io.xml.DomDriver; - -@SuppressWarnings("serial") -public class DisabledConfigView extends ActivityConfigurationPanel { - - private ActivityAndBeanWrapper configuration; - private List<String> fieldNames; - - private Object clonedConfig = null; - String origConfigXML = ""; - - public DisabledConfigView(Activity activity) { - super(activity); - setLayout(new BorderLayout()); - fieldNames = null; - initialise(); - } - - private void initialise() { - CSH.setHelpIDString( - this, - "net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.DisabledConfigView"); - configuration = activity.getConfiguration(); - XStream xstream = new XStream(new DomDriver()); - Activity a = configuration.getActivity(); - xstream.setClassLoader(a.getClass().getClassLoader()); - Object origConfig = configuration.getBean(); - if (fieldNames == null) { - fieldNames = getFieldNames(origConfig); - } - origConfigXML = xstream.toXML(origConfig); - clonedConfig = xstream.fromXML(origConfigXML); - JPanel panel = UIBuilder.buildEditor(clonedConfig, (String[]) fieldNames.toArray(new String[0])); - this.add(panel, BorderLayout.CENTER); - this.revalidate(); - } - - @Override - public void refreshConfiguration() { - this.removeAll(); - initialise(); - } - - public boolean checkValues() { - boolean result = false; - result = activity.configurationWouldWork(clonedConfig); - if (!result) { - JOptionPane.showMessageDialog( - this, - "The new properties are invalid or not consistent with the workflow", - "Invalid properties", JOptionPane.WARNING_MESSAGE); - } - return result; - } - - public void noteConfiguration() { - if (isConfigurationChanged()) { - ActivityAndBeanWrapper newConfig = new ActivityAndBeanWrapper(); - newConfig.setActivity(configuration.getActivity()); - newConfig.setBean(clonedConfig); - configuration = newConfig; - - XStream xstream = new XStream(new DomDriver()); - xstream.setClassLoader(configuration.getActivity().getClass().getClassLoader()); - - origConfigXML = xstream.toXML(clonedConfig); - } - } - - @Override - public ActivityAndBeanWrapper getConfiguration() { - return configuration; - } - - public boolean isConfigurationChanged() { - XStream xstream = new XStream(new DomDriver()); - xstream.setClassLoader(configuration.getActivity().getClass().getClassLoader()); - return (!xstream.toXML(clonedConfig).equals(origConfigXML)); - } - - private List<String> getFieldNames(Object config) { - List<String> result = new ArrayList<String>(); - try { - BeanInfo beanInfo = Introspector.getBeanInfo(config.getClass()); - for (PropertyDescriptor pd : beanInfo.getPropertyDescriptors()) { - Method readMethod = pd.getReadMethod(); - if ((readMethod != null) && !(pd.getName().equals("class"))) { - try { - result.add(pd.getName()); - } catch (IllegalArgumentException ex) { - // ignore - } - } - } - } catch (IntrospectionException e) { - // ignore - } - return result; - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledContextualView.java ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledContextualView.java b/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledContextualView.java deleted file mode 100644 index 9d60faa..0000000 --- a/taverna-disabled-activity-ui/src/main/java/net/sf/taverna/t2/activities/disabled/views/DisabledContextualView.java +++ /dev/null @@ -1,128 +0,0 @@ -/** - * - */ -package net.sf.taverna.t2.activities.disabled.views; - -import java.awt.Frame; -import java.beans.BeanInfo; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.Action; - -import net.sf.taverna.t2.activities.disabled.actions.DisabledActivityConfigurationAction; -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.report.ReportManager; -import net.sf.taverna.t2.workbench.ui.actions.activity.HTMLBasedActivityContextualView; -import uk.org.taverna.scufl2.api.activity.Activity; -import uk.org.taverna.scufl2.api.port.InputActivityPort; -import uk.org.taverna.scufl2.api.port.OutputActivityPort; - -import com.fasterxml.jackson.databind.JsonNode; - -/** - * A DisabledContextualView displays information about a DisabledActivity - * - * @author alanrw - * @author David Withers - */ -@SuppressWarnings("serial") -public class DisabledContextualView extends HTMLBasedActivityContextualView { - - private List<String> fieldNames; - - private final EditManager editManager; - private final FileManager fileManager; - private final ReportManager reportManager; - private final ActivityIconManager activityIconManager; - private final ServiceDescriptionRegistry serviceDescriptionRegistry; - - public DisabledContextualView(Activity activity, EditManager editManager, - FileManager fileManager, ReportManager reportManager, ColourManager colourManager, - ActivityIconManager activityIconManager, ServiceDescriptionRegistry serviceDescriptionRegistry) { - super(activity, colourManager); - this.editManager = editManager; - this.fileManager = fileManager; - this.reportManager = reportManager; - this.activityIconManager = activityIconManager; - this.serviceDescriptionRegistry = serviceDescriptionRegistry; - } - - /** - * The table for the DisabledActivity shows its ports and the information within the offline - * Activity's configuration. - * - * @return - */ - @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>"); - } - - JsonNode config = getConfigBean().getJson(); - try { - html.append("<tr><th>Property Name</th><th>Property Value</th></tr>"); - BeanInfo beanInfo = Introspector.getBeanInfo(config.getClass()); - for (PropertyDescriptor pd : beanInfo.getPropertyDescriptors()) { - Method readMethod = pd.getReadMethod(); - if ((readMethod != null) && !(pd.getName().equals("class"))) { - try { - html.append("<tr><td>"); - html.append(pd.getName()); - html.append("</td><td>"); - html.append(readMethod.invoke(config)); - html.append("</td></tr>"); - if (fieldNames == null) { - fieldNames = new ArrayList<String>(); - } - fieldNames.add(pd.getName()); - } catch (IllegalAccessException ex) { - // ignore - } catch (IllegalArgumentException ex) { - // ignore - } catch (InvocationTargetException ex) { - // ignore - } - } - } - } catch (IntrospectionException e) { - // ignore - } - return html.toString(); - } - - @Override - public String getViewTitle() { - return "Unavailable service"; - } - - @Override - public int getPreferredPosition() { - return 100; - } - - @Override - public Action getConfigureAction(Frame owner) { - return new DisabledActivityConfigurationAction(getActivity(), owner, - editManager, fileManager, reportManager, activityIconManager, serviceDescriptionRegistry); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-disabled-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent b/taverna-disabled-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent deleted file mode 100644 index 022189a..0000000 --- a/taverna-disabled-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.ui.menu.MenuComponent +++ /dev/null @@ -1 +0,0 @@ -net.sf.taverna.t2.activities.disabled.menu.ConfigureDisabledMenuAction \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-disabled-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory b/taverna-disabled-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory deleted file mode 100644 index 80b0bf3..0000000 --- a/taverna-disabled-activity-ui/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory +++ /dev/null @@ -1 +0,0 @@ -net.sf.taverna.t2.activities.disabled.views.DisabledActivityViewFactory http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-disabled-activity-ui/src/main/resources/META-INF/spring/disabled-activity-ui-context-osgi.xml ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/resources/META-INF/spring/disabled-activity-ui-context-osgi.xml b/taverna-disabled-activity-ui/src/main/resources/META-INF/spring/disabled-activity-ui-context-osgi.xml deleted file mode 100644 index f938272..0000000 --- a/taverna-disabled-activity-ui/src/main/resources/META-INF/spring/disabled-activity-ui-context-osgi.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans:beans xmlns="http://www.springframework.org/schema/osgi"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi.xsd";> - - <service ref="ConfigureDisabledMenuAction" auto-export="interfaces" /> - - <service ref="DisabledActivityViewFactory" interface="net.sf.taverna.t2.workbench.ui.views.contextualviews.activity.ContextualViewFactory" /> - - <reference id="editManager" interface="net.sf.taverna.t2.workbench.edits.EditManager" /> - <reference id="fileManager" interface="net.sf.taverna.t2.workbench.file.FileManager" /> - <reference id="reportManager" interface="net.sf.taverna.t2.workbench.report.ReportManager" /> - <reference id="activityIconManager" interface="net.sf.taverna.t2.workbench.activityicons.ActivityIconManager" /> - <reference id="colourManager" interface="net.sf.taverna.t2.workbench.configuration.colour.ColourManager" /> - <reference id="serviceDescriptionRegistry" interface="net.sf.taverna.t2.servicedescriptions.ServiceDescriptionRegistry" /> - -</beans:beans> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-disabled-activity-ui/src/main/resources/META-INF/spring/disabled-activity-ui-context.xml ---------------------------------------------------------------------- diff --git a/taverna-disabled-activity-ui/src/main/resources/META-INF/spring/disabled-activity-ui-context.xml b/taverna-disabled-activity-ui/src/main/resources/META-INF/spring/disabled-activity-ui-context.xml deleted file mode 100644 index fbc0aa0..0000000 --- a/taverna-disabled-activity-ui/src/main/resources/META-INF/spring/disabled-activity-ui-context.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <bean id="ConfigureDisabledMenuAction" class="net.sf.taverna.t2.activities.disabled.menu.ConfigureDisabledMenuAction"> - <property name="editManager" ref="editManager" /> - <property name="fileManager" ref="fileManager" /> - <property name="reportManager" ref="reportManager" /> - <property name="activityIconManager" ref="activityIconManager" /> - <property name="serviceDescriptionRegistry" ref="serviceDescriptionRegistry" /> - </bean> - - <bean id="DisabledActivityViewFactory" class="net.sf.taverna.t2.activities.disabled.views.DisabledActivityViewFactory"> - <property name="editManager" ref="editManager" /> - <property name="fileManager" ref="fileManager" /> - <property name="reportManager" ref="reportManager" /> - <property name="activityIconManager" ref="activityIconManager" /> - <property name="colourManager" ref="colourManager" /> - <property name="serviceDescriptionRegistry" ref="serviceDescriptionRegistry" /> - </bean> - -</beans> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-stringconstant-activity-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-stringconstant-activity-ui/pom.xml b/taverna-stringconstant-activity-ui/pom.xml deleted file mode 100644 index 761981f..0000000 --- a/taverna-stringconstant-activity-ui/pom.xml +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>net.sf.taverna</groupId> - <artifactId>taverna-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> - </parent> - <groupId>net.sf.taverna.t2.ui-activities</groupId> - <artifactId>stringconstant-activity-ui</artifactId> - <version>2.0-SNAPSHOT</version> - <packaging>bundle</packaging> - <name>Taverna 2 StringConstant Activity UI</name> - <dependencies> - <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>activity-icons-api</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>activity-palette-api</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>menu-api</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>contextual-views-api</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> - <dependency> - <groupId>net.sf.taverna.t2.ui-components</groupId> - <artifactId>workflow-view</artifactId> - <version>${t2.ui.components.version}</version> - </dependency> - <dependency> - <groupId>uk.org.taverna.commons</groupId> - <artifactId>taverna-services-api</artifactId> - <version>0.1.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>com.springsource.org.apache.commons.lang</artifactId> - <version>${commons.lang.version}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <!-- <dependency> - <groupId>net.sf.taverna.t2.ui-impl</groupId> - <artifactId>activity-palette-impl</artifactId> - <version>${t2.ui.impl.version}</version> - <scope>test</scope> - </dependency> --> - <!-- <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>activity-tools</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> --> - <dependency> - <groupId>net.sf.taverna.t2.ui-api</groupId> - <artifactId>activity-tools</artifactId> - <version>${t2.ui.api.version}</version> - </dependency> - </dependencies> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>mygrid-repository</id> - <name>myGrid Repository</name> - <url>http://www.mygrid.org.uk/maven/repository - </url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots /> - <id>mygrid-snapshot-repository</id> - <name>myGrid Snapshot Repository</name> - <url>http://www.mygrid.org.uk/maven/snapshot-repository</url> - </repository> - </repositories> -</project> - http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/actions/StringConstantActivityConfigurationAction.java ---------------------------------------------------------------------- diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/actions/StringConstantActivityConfigurationAction.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/actions/StringConstantActivityConfigurationAction.java deleted file mode 100644 index fa8bafc..0000000 --- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/actions/StringConstantActivityConfigurationAction.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.stringconstant.actions; - -import java.awt.Frame; -import java.awt.event.ActionEvent; - -import net.sf.taverna.t2.activities.stringconstant.views.StringConstantConfigView; -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.commons.services.ServiceRegistry; -import uk.org.taverna.scufl2.api.activity.Activity; - -public class StringConstantActivityConfigurationAction extends - ActivityConfigurationAction { - private static final long serialVersionUID = 2518716617809186972L; - public static final String CONFIGURE_STRINGCONSTANT = "Edit value"; - - private final EditManager editManager; - private final FileManager fileManager; - private final ServiceRegistry serviceRegistry; - - public StringConstantActivityConfigurationAction(Activity activity, - Frame owner, EditManager editManager, FileManager fileManager, - ActivityIconManager activityIconManager, - ServiceDescriptionRegistry serviceDescriptionRegistry, - ServiceRegistry serviceRegistry) { - super(activity, activityIconManager, serviceDescriptionRegistry); - this.editManager = editManager; - this.fileManager = fileManager; - this.serviceRegistry = serviceRegistry; - putValue(NAME, CONFIGURE_STRINGCONSTANT); - } - - @Override - public void actionPerformed(ActionEvent e) { - ActivityConfigurationDialog currentDialog = getDialog(getActivity()); - if (currentDialog != null) { - currentDialog.toFront(); - return; - } - - StringConstantConfigView configView = new StringConstantConfigView( - activity, serviceRegistry); - ActivityConfigurationDialog dialog = new ActivityConfigurationDialog( - getActivity(), configView, editManager); - setDialog(getActivity(), dialog, fileManager); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateAction.java ---------------------------------------------------------------------- diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateAction.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateAction.java deleted file mode 100644 index fb9d069..0000000 --- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateAction.java +++ /dev/null @@ -1,112 +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.stringconstant.menu; - -import static net.sf.taverna.t2.workbench.ui.workflowview.WorkflowView.importServiceDescription; - -import java.awt.event.ActionEvent; -import java.net.URI; - -import javax.swing.AbstractAction; -import javax.swing.Action; - -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 uk.org.taverna.commons.services.ServiceRegistry; -import uk.org.taverna.scufl2.api.core.Workflow; - -/** - * An action to add a string constant activity + a wrapping processor to the - * workflow. - * - * @author Alex Nenadic - * @author David Withers - */ -@SuppressWarnings("serial") -public class AddStringConstantTemplateAction extends - AbstractContextualMenuAction { - private static final URI ACTIVITY_TYPE = URI - .create("http://ns.taverna.org.uk/2010/activity/constant";); - 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 AddStringConstantTemplateAction() { - super(insertSection, 800); - } - - @Override - public boolean isEnabled() { - return super.isEnabled() - && getContextualSelection().getSelection() instanceof Workflow; - } - - @Override - protected Action createAction() { - AbstractAction action = new AbstractAction("Text constant", - activityIconManager.iconForActivity(ACTIVITY_TYPE)) { - @Override - public void actionPerformed(ActionEvent e) { - importServiceDescription( - serviceDescriptionRegistry - .getServiceDescription(ACTIVITY_TYPE), - false, editManager, menuManager, selectionManager, - serviceRegistry); - } - }; - return action; - } - - 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/blob/dc466d6d/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java deleted file mode 100644 index cb1682d..0000000 --- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/AddStringConstantTemplateMenuAction.java +++ /dev/null @@ -1,124 +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.stringconstant.menu; - -import static java.awt.event.InputEvent.ALT_DOWN_MASK; -import static java.awt.event.InputEvent.SHIFT_DOWN_MASK; -import static java.awt.event.KeyEvent.VK_S; -import static javax.swing.KeyStroke.getKeyStroke; -import static net.sf.taverna.t2.workbench.ui.workflowview.WorkflowView.importServiceDescription; - -import java.awt.event.ActionEvent; -import java.net.URI; - -import javax.swing.AbstractAction; -import javax.swing.Action; - -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 uk.org.taverna.commons.services.ServiceRegistry; - -/** - * An action to add a string constant activity + a wrapping processor to the - * workflow. - * - * @author Alex Nenadic - * @author Alan R Williams - * @author David Withers - */ -@SuppressWarnings("serial") -public class AddStringConstantTemplateMenuAction extends AbstractMenuAction { - private static final URI ACTIVITY_TYPE = URI - .create("http://ns.taverna.org.uk/2010/activity/constant";); - private static final URI INSERT = URI - .create("http://taverna.sf.net/2008/t2workbench/menu#insert";); - private static final String ADD_STRING_CONSTANT = "Text constant"; - private static final URI ADD_STRING_CONSTANT_URI = URI - .create("http://taverna.sf.net/2008/t2workbench/menu#graphMenuAddStringConstant";); - - private EditManager editManager; - private MenuManager menuManager; - private SelectionManager selectionManager; - private ActivityIconManager activityIconManager; - private ServiceDescriptionRegistry serviceDescriptionRegistry; - private ServiceRegistry serviceRegistry; - - public AddStringConstantTemplateMenuAction() { - super(INSERT, 800, ADD_STRING_CONSTANT_URI); - } - - @Override - protected Action createAction() { - return new AddStringConstantMenuAction(); - } - - protected class AddStringConstantMenuAction extends AbstractAction - implements DesignOnlyAction { - AddStringConstantMenuAction() { - super(); - putValue(SMALL_ICON, - activityIconManager.iconForActivity(ACTIVITY_TYPE)); - putValue(NAME, ADD_STRING_CONSTANT); - putValue(SHORT_DESCRIPTION, ADD_STRING_CONSTANT); - putValue(ACCELERATOR_KEY, - getKeyStroke(VK_S, SHIFT_DOWN_MASK | ALT_DOWN_MASK)); - } - - @Override - public void actionPerformed(ActionEvent e) { - importServiceDescription( - serviceDescriptionRegistry - .getServiceDescription(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/blob/dc466d6d/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java deleted file mode 100644 index 46bdde9..0000000 --- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/menu/ConfigureStringConstantMenuAction.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.sf.taverna.t2.activities.stringconstant.menu; - -import static javax.swing.Action.NAME; -import static net.sf.taverna.t2.activities.stringconstant.actions.StringConstantActivityConfigurationAction.CONFIGURE_STRINGCONSTANT; - -import java.net.URI; - -import javax.swing.Action; - -import net.sf.taverna.t2.activities.stringconstant.actions.StringConstantActivityConfigurationAction; -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 uk.org.taverna.commons.services.ServiceRegistry; - -public class ConfigureStringConstantMenuAction extends - AbstractConfigureActivityMenuAction { - private static final URI ACTIVITY_TYPE = URI - .create("http://ns.taverna.org.uk/2010/activity/constant";); - - private EditManager editManager; - private FileManager fileManager; - private ActivityIconManager activityIconManager; - private ServiceDescriptionRegistry serviceDescriptionRegistry; - private ServiceRegistry serviceRegistry; - - public ConfigureStringConstantMenuAction() { - super(ACTIVITY_TYPE); - } - - @Override - protected Action createAction() { - StringConstantActivityConfigurationAction configAction = new StringConstantActivityConfigurationAction( - findActivity(), getParentFrame(), editManager, fileManager, - activityIconManager, serviceDescriptionRegistry, - serviceRegistry); - configAction.putValue(NAME, CONFIGURE_STRINGCONSTANT); - addMenuDots(configAction); - return configAction; - } - - 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 setServiceRegistry(ServiceRegistry serviceRegistry) { - this.serviceRegistry = serviceRegistry; - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dc466d6d/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/servicedescriptions/StringConstantActivityIcon.java ---------------------------------------------------------------------- diff --git a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/servicedescriptions/StringConstantActivityIcon.java b/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/servicedescriptions/StringConstantActivityIcon.java deleted file mode 100644 index 409c0f5..0000000 --- a/taverna-stringconstant-activity-ui/src/main/java/net/sf/taverna/t2/activities/stringconstant/servicedescriptions/StringConstantActivityIcon.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.stringconstant.servicedescriptions; - -import java.net.URI; - -import javax.swing.Icon; -import javax.swing.ImageIcon; - -import net.sf.taverna.t2.workbench.activityicons.ActivityIconSPI; - -/** - * @author Alex Nenadic - */ -public class StringConstantActivityIcon implements ActivityIconSPI { - private static final URI ACTIVITY_TYPE = URI - .create("http://ns.taverna.org.uk/2010/activity/constant";); - private static Icon icon = null; - - @Override - public int canProvideIconScore(URI activityType) { - if (activityType.equals(ACTIVITY_TYPE)) - return DEFAULT_ICON + 1; - else - return NO_ICON; - } - - @Override - public Icon getIcon(URI activityType) { - return getStringConstantIcon(); - } - - public static Icon getStringConstantIcon() { - if (icon == null) - icon = new ImageIcon( - StringConstantActivityIcon.class - .getResource("/stringconstant.png")); - return icon; - } -}
