You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/05/04 02:20:08 UTC
[1/2] incubator-taverna-workbench-common-activities git commit:
TAVERNA-963 usecase -> tool
Repository: incubator-taverna-workbench-common-activities
Updated Branches:
refs/heads/master 6bdb12da2 -> 3ed895b17
TAVERNA-963 usecase -> tool
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/50a9367b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/tree/50a9367b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/diff/50a9367b
Branch: refs/heads/master
Commit: 50a9367b2488baa6e38930e2e452d7c6f29cc178
Parents: 6bdb12d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed May 4 01:19:39 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed May 4 01:19:39 2016 +0100
----------------------------------------------------------------------
.../manager/ssh/ExternalToolSshNodeViewer.java | 2 +-
.../ssh/SshInvocationMechanismEditor.java | 4 ++--
.../ExternalToolServiceDescription.java | 8 +++----
.../ExternalToolServiceProvider.java | 14 ++++++-------
.../ExternalToolTemplateServiceDescription.java | 4 ++--
.../activities/externaltool/utils/Tools.java | 4 ++--
.../externaltool/views/EditablePanel.java | 12 +++++------
.../ExternalToolActivityContextualView.java | 10 ++++-----
.../views/ExternalToolConfigView.java | 22 ++++++++++----------
.../views/ExternalToolFileViewer.java | 6 +++---
.../ExternalToolRuntimeEnvironmentViewer.java | 8 +++----
.../views/ExternalToolStaticStringViewer.java | 3 ++-
.../views/ExternalToolStaticUrlViewer.java | 6 +++---
.../ExternalToolStringReplacementViewer.java | 4 ++--
.../views/LoadDescriptionAction.java | 14 ++++++-------
.../views/SaveDescriptionAction.java | 16 +++++++-------
.../externaltool/views/ScriptPanel.java | 12 +++++------
.../externaltool/views/ToolXMLPanel.java | 6 +++---
18 files changed, 78 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/manager/ssh/ExternalToolSshNodeViewer.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/manager/ssh/ExternalToolSshNodeViewer.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/manager/ssh/ExternalToolSshNodeViewer.java
index 676d16d..bbe7bef 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/manager/ssh/ExternalToolSshNodeViewer.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/manager/ssh/ExternalToolSshNodeViewer.java
@@ -7,8 +7,8 @@ import javax.swing.JCheckBox;
import javax.swing.JTextField;
import org.apache.taverna.activities.externaltool.manager.InvocationMechanism;
+import org.apache.taverna.activities.externaltool.ssh.SshNode;
-import de.uni_luebeck.inb.knowarc.usecases.invocation.ssh.SshNode;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/manager/ssh/SshInvocationMechanismEditor.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/manager/ssh/SshInvocationMechanismEditor.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/manager/ssh/SshInvocationMechanismEditor.java
index 2dc8d63..d9b7692 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/manager/ssh/SshInvocationMechanismEditor.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/manager/ssh/SshInvocationMechanismEditor.java
@@ -25,8 +25,8 @@ import org.apache.taverna.activities.externaltool.manager.InvocationMechanism;
import org.apache.taverna.activities.externaltool.manager.InvocationMechanismEditor;
import org.apache.taverna.activities.externaltool.ssh.ExternalToolSshInvocationMechanism;
import org.apache.taverna.lang.ui.DeselectingButton;
-import de.uni_luebeck.inb.knowarc.usecases.invocation.ssh.SshNode;
-import de.uni_luebeck.inb.knowarc.usecases.invocation.ssh.SshNodeFactory;
+import org.apache.taverna.activities.externaltool.ssh.SshNode;
+import org.apache.taverna.activities.externaltool.ssh.SshNodeFactory;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolServiceDescription.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolServiceDescription.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolServiceDescription.java
index 54a516f..21f2239 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolServiceDescription.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolServiceDescription.java
@@ -38,7 +38,7 @@ import org.apache.taverna.activities.externaltool.manager.InvocationGroupManager
import org.apache.taverna.activities.externaltool.manager.impl.InvocationGroupManagerImpl;
import org.apache.taverna.servicedescriptions.ServiceDescription;
import org.apache.taverna.workflowmodel.processor.activity.Activity;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
+import org.apache.taverna.activities.externaltool.desc.ToolDescription;
/**
* ExternalToolServiceDescription stores the repository URL and the use case id so
@@ -56,7 +56,7 @@ public class ExternalToolServiceDescription extends ServiceDescription<ExternalT
private String repositoryUrl;
private String externaltoolid;
- private UseCaseDescription useCaseDescription;
+ private ToolDescription useCaseDescription;
public String getRepositoryUrl() {
return repositoryUrl;
@@ -98,7 +98,7 @@ public class ExternalToolServiceDescription extends ServiceDescription<ExternalT
ExternalToolActivityConfigurationBean bean = new ExternalToolActivityConfigurationBean();
bean.setRepositoryUrl(repositoryUrl);
bean.setExternaltoolid(externaltoolid);
- bean.setUseCaseDescription(useCaseDescription);
+ bean.setToolDescription(useCaseDescription);
bean.setMechanism(manager.getDefaultMechanism());
return bean;
@@ -140,7 +140,7 @@ public class ExternalToolServiceDescription extends ServiceDescription<ExternalT
return "";
}
- public void setUseCaseDescription(UseCaseDescription usecase) {
+ public void setToolDescription(UseCaseDescription usecase) {
this.useCaseDescription = usecase;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolServiceProvider.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolServiceProvider.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolServiceProvider.java
index 7ba6ae3..db65270 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolServiceProvider.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolServiceProvider.java
@@ -32,8 +32,8 @@ import javax.swing.Icon;
import org.apache.taverna.servicedescriptions.AbstractConfigurableServiceProvider;
import org.apache.taverna.servicedescriptions.CustomizedConfigurePanelProvider;
import org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseEnumeration;
+import org.apache.taverna.activities.externaltool.desc.ToolDescription;
+import org.apache.taverna.activities.externaltool.desc.ToolDescriptionParser;
/**
* ExternalToolServiceProvider searches an use case repository XML for use case
@@ -67,22 +67,22 @@ public class ExternalToolServiceProvider extends AbstractConfigurableServiceProv
callBack.status("Parsing use case repository:" + repositoryUrl);
// prepare a list of all use case descriptions which are stored in
// the given repository URL
- List<UseCaseDescription> usecases = new ArrayList<UseCaseDescription> ();
+ List<ToolDescription> usecases = new ArrayList<UseCaseDescription> ();
try {
- usecases = UseCaseEnumeration.readDescriptionsFromUrl(
+ usecases = ToolDescriptionParser.readDescriptionsFromUrl(
repositoryUrl);
} catch (IOException e) {
callBack.fail("Unable to read tool descriptions", e);
}
callBack.status("Found " + usecases.size() + " use cases:" + repositoryUrl);
- // convert all the UseCaseDescriptions in the XML file into
+ // convert all the ToolDescriptions in the XML file into
// ExternalToolServiceDescription items
List<ExternalToolServiceDescription> items = new ArrayList<ExternalToolServiceDescription>();
- for (UseCaseDescription usecase : usecases) {
+ for (ToolDescription usecase : usecases) {
ExternalToolServiceDescription item = new ExternalToolServiceDescription();
item.setRepositoryUrl(repositoryUrl);
item.setExternaltoolid(usecase.getUsecaseid());
- item.setUseCaseDescription(usecase);
+ item.setToolDescription(usecase);
items.add(item);
}
// we dont have streaming data loading or partial results, so return
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolTemplateServiceDescription.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolTemplateServiceDescription.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolTemplateServiceDescription.java
index 835db90..381dad0 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolTemplateServiceDescription.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/servicedescriptions/ExternalToolTemplateServiceDescription.java
@@ -8,7 +8,7 @@ import java.util.UUID;
import javax.swing.Icon;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
+import org.apache.taverna.activities.externaltool.desc.ToolDescription;
import org.apache.taverna.activities.externaltool.ExternalToolActivity;
import org.apache.taverna.activities.externaltool.ExternalToolActivityConfigurationBean;
@@ -41,7 +41,7 @@ public class ExternalToolTemplateServiceDescription extends
public ExternalToolActivityConfigurationBean getActivityConfiguration() {
ExternalToolActivityConfigurationBean result = new ExternalToolActivityConfigurationBean();
result.setExternaltoolid(UUID.randomUUID().toString());
- result.setUseCaseDescription(new UseCaseDescription(""));
+ result.setToolDescription(new UseCaseDescription(""));
result.setMechanism(manager.getDefaultMechanism());
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/utils/Tools.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/utils/Tools.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/utils/Tools.java
index e2bed9b..9dbe812 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/utils/Tools.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/utils/Tools.java
@@ -19,8 +19,8 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.CompoundBorder;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInput;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInputUser;
+import org.apache.taverna.activities.externaltool.desc.ScriptInput;
+import org.apache.taverna.activities.externaltool.desc.ScriptInputUser;
import org.apache.taverna.lang.ui.DeselectingButton;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/EditablePanel.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/EditablePanel.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/EditablePanel.java
index 9b32218..9a0beb9 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/EditablePanel.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/EditablePanel.java
@@ -12,8 +12,8 @@ import javax.swing.JButton;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseEnumeration;
+import org.apache.taverna.activities.externaltool.desc.ToolDescription;
+import org.apache.taverna.activities.externaltool.desc.ToolDescriptionParser;
import org.apache.taverna.activities.externaltool.ExternalToolActivityConfigurationBean;
import org.apache.taverna.activities.externaltool.utils.Tools;
@@ -35,16 +35,16 @@ public class EditablePanel extends JPanel {
ExternalToolActivityConfigurationBean bean = view.getConfiguration();
String repositoryUrl = bean.getRepositoryUrl();
String id = bean.getExternaltoolid();
- UseCaseDescription usecase = null;
+ ToolDescription usecase = null;
try {
- usecase = UseCaseEnumeration.readDescriptionFromUrl(
+ usecase = ToolDescriptionParser.readDescriptionFromUrl(
repositoryUrl, id);
}
catch (IOException ex) {
// Already logged
}
if (usecase != null) {
- bean.setUseCaseDescription(usecase);
+ bean.setToolDescription(usecase);
view.refreshConfiguration(bean);
} else {
JOptionPane.showMessageDialog(view, "Unable to find tool description " + id, "Missing tool description", JOptionPane.ERROR_MESSAGE);
@@ -63,7 +63,7 @@ public class EditablePanel extends JPanel {
}
});
makeEditable.setToolTipText("Edit the tool description");
- if (Tools.areAllUnderstood(view.getConfiguration().getUseCaseDescription().getInputs())) {
+ if (Tools.areAllUnderstood(view.getConfiguration().getToolDescription().getInputs())) {
this.add(makeEditable);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolActivityContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolActivityContextualView.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolActivityContextualView.java
index c1c819e..da458c5 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolActivityContextualView.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolActivityContextualView.java
@@ -39,10 +39,10 @@ import org.apache.taverna.workbench.edits.EditManager;
import org.apache.taverna.workbench.file.FileManager;
import org.apache.taverna.workbench.ui.actions.activity.HTMLBasedActivityContextualView;
import org.apache.taverna.workflowmodel.processor.activity.Activity;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInput;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInputStatic;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptOutput;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
+import org.apache.taverna.activities.externaltool.desc.ScriptInput;
+import org.apache.taverna.activities.externaltool.desc.ScriptInputStatic;
+import org.apache.taverna.activities.externaltool.desc.ScriptOutput;
+import org.apache.taverna.activities.externaltool.desc.ToolDescription;
/**
* ExternalToolActivityContextualView displays the use case information in a HTML table. Currently,
@@ -81,7 +81,7 @@ public class ExternalToolActivityContextualView extends
}
html += "<tr><td>Id</td><td>" + id + "</td></tr>";
- UseCaseDescription useCaseDescription = bean.getUseCaseDescription();
+ ToolDescription useCaseDescription = bean.getUseCaseDescription();
String name = useCaseDescription.getUsecaseid();
if ((name == null) || name.isEmpty()) {
name = "<b>Not specified</b>";
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolConfigView.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolConfigView.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolConfigView.java
index 6327ac2..38a8bfd 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolConfigView.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolConfigView.java
@@ -59,11 +59,11 @@ import org.apache.taverna.workbench.ui.views.contextualviews.activity.ActivityCo
import org.apache.log4j.Logger;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInput;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInputStatic;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInputUser;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptOutput;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
+import org.apache.taverna.activities.externaltool.desc.ScriptInput;
+import org.apache.taverna.activities.externaltool.desc.ScriptInputStatic;
+import org.apache.taverna.activities.externaltool.desc.ScriptInputUser;
+import org.apache.taverna.activities.externaltool.desc.ScriptOutput;
+import org.apache.taverna.activities.externaltool.desc.ToolDescription;
/**
* Provides the configurable view for a {@link ExternalToolActivity} through
@@ -172,7 +172,7 @@ public class ExternalToolConfigView
if (!isFromRepository()) {
- UseCaseDescription ucd = newConfiguration.getUseCaseDescription();
+ ToolDescription ucd = newConfiguration.getUseCaseDescription();
ucd.setUsecaseid(nameField.getText());
if (groupField.getText().isEmpty()) {
@@ -303,8 +303,8 @@ public class ExternalToolConfigView
}
if (!isFromRepository()) {
- UseCaseDescription useCaseDescription = configuration
- .getUseCaseDescription();
+ ToolDescription useCaseDescription = configuration
+ .getToolDescription();
nameField.setText(useCaseDescription.getUsecaseid());
if (useCaseDescription.getGroup() != null) {
@@ -494,14 +494,14 @@ public class ExternalToolConfigView
"in", FILE_LIST_DESCRIPTION, "Add file list"));
annotationPanel = new AnnotationPanel(nameField, descriptionArea, groupField);
advancedTab.addTab("Annotation", annotationPanel);
- final ToolXMLPanel toolXMLPanel = new ToolXMLPanel(configuration.getUseCaseDescription());
+ final ToolXMLPanel toolXMLPanel = new ToolXMLPanel(configuration.getToolDescription());
advancedTab.addTab("XML", toolXMLPanel);
advancedTab.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
if (advancedTab.getSelectedComponent() == toolXMLPanel) {
- toolXMLPanel.regenerateTree(makeConfiguration().getUseCaseDescription());
+ toolXMLPanel.regenerateTree(makeConfiguration().getToolDescription());
}
}});
tabbedPane.addChangeListener(new ChangeListener() {
@@ -510,7 +510,7 @@ public class ExternalToolConfigView
public void stateChanged(ChangeEvent e) {
if ((tabbedPane.getSelectedComponent() == advancedPanel) &&
(advancedTab.getSelectedComponent() == toolXMLPanel)) {
- toolXMLPanel.regenerateTree(makeConfiguration().getUseCaseDescription());
+ toolXMLPanel.regenerateTree(makeConfiguration().getToolDescription());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolFileViewer.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolFileViewer.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolFileViewer.java
index f23cf2a..ef6c9e6 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolFileViewer.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolFileViewer.java
@@ -10,9 +10,9 @@ import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JTextField;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInput;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInputUser;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptOutput;
+import org.apache.taverna.activities.externaltool.desc.ScriptInput;
+import org.apache.taverna.activities.externaltool.desc.ScriptInputUser;
+import org.apache.taverna.activities.externaltool.desc.ScriptOutput;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolRuntimeEnvironmentViewer.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolRuntimeEnvironmentViewer.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolRuntimeEnvironmentViewer.java
index efc0cf6..a7529f7 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolRuntimeEnvironmentViewer.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolRuntimeEnvironmentViewer.java
@@ -6,10 +6,10 @@ package org.apache.taverna.activities.externaltool.views;
import javax.swing.JComboBox;
import javax.swing.JTextField;
-import de.uni_luebeck.inb.knowarc.usecases.RuntimeEnvironmentConstraint;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInput;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInputUser;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptOutput;
+import org.apache.taverna.activities.externaltool.desc.RuntimeEnvironmentConstraint;
+import org.apache.taverna.activities.externaltool.desc.ScriptInput;
+import org.apache.taverna.activities.externaltool.desc.ScriptInputUser;
+import org.apache.taverna.activities.externaltool.desc.ScriptOutput;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStaticStringViewer.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStaticStringViewer.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStaticStringViewer.java
index 8615e85..089de37 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStaticStringViewer.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStaticStringViewer.java
@@ -6,7 +6,8 @@ package org.apache.taverna.activities.externaltool.views;
import javax.swing.JTextArea;
import javax.swing.JTextField;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInputStatic;
+import org.apache.taverna.activities.externaltool.desc.ScriptInputStatic;
+
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStaticUrlViewer.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStaticUrlViewer.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStaticUrlViewer.java
index 53948b0..ee01c40 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStaticUrlViewer.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStaticUrlViewer.java
@@ -7,9 +7,9 @@ import javax.swing.JComboBox;
import javax.swing.JTextArea;
import javax.swing.JTextField;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInput;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInputStatic;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInputUser;
+import org.apache.taverna.activities.externaltool.desc.ScriptInput;
+import org.apache.taverna.activities.externaltool.desc.ScriptInputStatic;
+import org.apache.taverna.activities.externaltool.desc.ScriptInputUser;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStringReplacementViewer.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStringReplacementViewer.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStringReplacementViewer.java
index 55d9809..f32db72 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStringReplacementViewer.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ExternalToolStringReplacementViewer.java
@@ -12,8 +12,8 @@ import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JTextField;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInput;
-import de.uni_luebeck.inb.knowarc.usecases.ScriptInputUser;
+import org.apache.taverna.activities.externaltool.desc.ScriptInput;
+import org.apache.taverna.activities.externaltool.desc.ScriptInputUser;
/**
* @author alanrw
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/LoadDescriptionAction.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/LoadDescriptionAction.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/LoadDescriptionAction.java
index ca5efa8..979581d 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/LoadDescriptionAction.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/LoadDescriptionAction.java
@@ -19,8 +19,8 @@ import org.apache.taverna.lang.ui.FileTools;
import org.jdom.Document;
import org.jdom.JDOMException;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseEnumeration;
+import org.apache.taverna.activities.externaltool.desc.ToolDescription;
+import org.apache.taverna.activities.externaltool.desc.ToolDescriptionParser;
final class LoadDescriptionAction extends AbstractAction {
/**
@@ -43,29 +43,29 @@ final class LoadDescriptionAction extends AbstractAction {
try {
Document doc = ScriptPanel.builder
.build(new StringReader(descriptionsString));
- List<UseCaseDescription> descriptions = UseCaseEnumeration.readDescriptionsFromStream(new StringBufferInputStream(descriptionsString));
+ List<ToolDescription> descriptions = ToolDescriptionParser.readDescriptionsFromStream(new StringBufferInputStream(descriptionsString));
if (descriptions.isEmpty()) {
JOptionPane.showMessageDialog(this.scriptPanel, "No tool descriptions found", "File content", JOptionPane.ERROR_MESSAGE);
return;
}
if (descriptions.size() == 1) {
- view.getConfiguration().setUseCaseDescription(descriptions.get(0));
+ view.getConfiguration().setToolDescription(descriptions.get(0));
view.refreshConfiguration(view.getConfiguration());
return;
}
List<String> descriptionNames = new ArrayList();
- for (UseCaseDescription ud : descriptions) {
+ for (ToolDescription ud : descriptions) {
descriptionNames.add(ud.getUsecaseid());
}
Collections.sort(descriptionNames);
String chosenName = (String) JOptionPane.showInputDialog(this.scriptPanel, "Please select a tool description",
"Select tool description", JOptionPane.PLAIN_MESSAGE, null, descriptionNames.toArray(), descriptionNames.get(0));
if (chosenName != null) {
- for (UseCaseDescription ud : descriptions) {
+ for (ToolDescription ud : descriptions) {
if (ud.getUsecaseid().equals(chosenName)) {
- view.getConfiguration().setUseCaseDescription(ud);
+ view.getConfiguration().setToolDescription(ud);
view.refreshConfiguration(view.getConfiguration());
return;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/SaveDescriptionAction.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/SaveDescriptionAction.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/SaveDescriptionAction.java
index 977b228..418e63b 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/SaveDescriptionAction.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/SaveDescriptionAction.java
@@ -26,8 +26,8 @@ import org.jdom.Element;
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseEnumeration;
+import org.apache.taverna.activities.externaltool.desc.ToolDescription;
+import org.apache.taverna.activities.externaltool.desc.ToolDescriptionParser;
final class SaveDescriptionAction extends AbstractAction {
/**
@@ -47,7 +47,7 @@ final class SaveDescriptionAction extends AbstractAction {
}
public void actionPerformed(ActionEvent e) {
- UseCaseDescription currentDescription = view.makeConfiguration().getUseCaseDescription();
+ ToolDescription currentDescription = view.makeConfiguration().getUseCaseDescription();
String usecaseid = currentDescription.getUsecaseid();
String description = currentDescription.getDescription();
String group = currentDescription.getGroup();
@@ -60,7 +60,7 @@ final class SaveDescriptionAction extends AbstractAction {
}
}
- public static boolean saveStringToFile(Component parent, String dialogTitle, String extension, UseCaseDescription description) {
+ public static boolean saveStringToFile(Component parent, String dialogTitle, String extension, ToolDescription description) {
JFileChooser fileChooser = new JFileChooser();
fileChooser.setDialogTitle(dialogTitle);
@@ -89,14 +89,14 @@ final class SaveDescriptionAction extends AbstractAction {
// TODO: Open in separate thread to avoid hanging UI
try {
- List<UseCaseDescription> currentDescriptions;
+ List<ToolDescription> currentDescriptions;
if (file.exists()) {
- currentDescriptions = UseCaseEnumeration.readDescriptionsFromStream(new FileInputStream(file));
+ currentDescriptions = ToolDescriptionParser.readDescriptionsFromStream(new FileInputStream(file));
} else {
- currentDescriptions = new ArrayList<UseCaseDescription>();
+ currentDescriptions = new ArrayList<ToolDescription>();
}
Element overallElement = new Element("usecases");
- for (UseCaseDescription ud : currentDescriptions) {
+ for (ToolDescription ud : currentDescriptions) {
if (!ud.getUsecaseid().equals(description.getUsecaseid())) {
overallElement.addContent(ud.writeToXMLElement());
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ScriptPanel.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ScriptPanel.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ScriptPanel.java
index c36ac8c..2b02b29 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ScriptPanel.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ScriptPanel.java
@@ -26,8 +26,8 @@ import org.apache.taverna.lang.ui.LineEnabledTextPanel;
import org.jdom.input.SAXBuilder;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseEnumeration;
+import org.apache.taverna.activities.externaltool.desc.ToolDescription;
+import org.apache.taverna.activities.externaltool.desc.ToolDescriptionParser;
/**
@@ -59,7 +59,7 @@ public class ScriptPanel extends JPanel {
BorderLayout.CENTER);
- UseCaseDescription useCaseDescription = view.getConfiguration().getUseCaseDescription();
+ ToolDescription useCaseDescription = view.getConfiguration().getUseCaseDescription();
stdInCheckBox.setSelected(useCaseDescription.isIncludeStdIn());
stdOutCheckBox.setSelected(useCaseDescription.isIncludeStdOut());
stdErrCheckBox.setSelected(useCaseDescription.isIncludeStdErr());
@@ -84,16 +84,16 @@ public class ScriptPanel extends JPanel {
ExternalToolActivityConfigurationBean bean = view.makeConfiguration();
String repositoryUrl = bean.getRepositoryUrl();
String id = bean.getExternaltoolid();
- UseCaseDescription usecase = null;
+ ToolDescription usecase = null;
try {
- usecase = UseCaseEnumeration.readDescriptionFromUrl(
+ usecase = ToolDescriptionParser.readDescriptionFromUrl(
repositoryUrl, id);
}
catch (IOException ex) {
// Already logged
}
if (usecase != null) {
- bean.setUseCaseDescription(usecase);
+ bean.setToolDescription(usecase);
view.setEditable(false, bean);
} else {
JOptionPane.showMessageDialog(view, "Unable to find tool description " + id, "Missing tool description", JOptionPane.ERROR_MESSAGE);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/50a9367b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ToolXMLPanel.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ToolXMLPanel.java b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ToolXMLPanel.java
index f3e8b9b..86bf57c 100644
--- a/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ToolXMLPanel.java
+++ b/taverna-external-tool-activity-ui/src/main/java/org/apache/taverna/activities/externaltool/views/ToolXMLPanel.java
@@ -10,7 +10,7 @@ import javax.swing.JScrollPane;
import org.apache.taverna.renderers.impl.XMLTree;
-import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
+import org.apache.taverna.activities.externaltool.desc.ToolDescription;
/**
* @author alanrw
@@ -18,13 +18,13 @@ import de.uni_luebeck.inb.knowarc.usecases.UseCaseDescription;
*/
public class ToolXMLPanel extends JPanel {
- public ToolXMLPanel(UseCaseDescription useCaseDescription) {
+ public ToolXMLPanel(ToolDescription useCaseDescription) {
super(new BorderLayout());
XMLTree xmlTree = new XMLTree(useCaseDescription.writeToXMLElement());
this.add(new JScrollPane(xmlTree), BorderLayout.CENTER);
}
- public void regenerateTree(UseCaseDescription useCaseDescription) {
+ public void regenerateTree(ToolDescription useCaseDescription) {
this.removeAll();
XMLTree xmlTree = new XMLTree(useCaseDescription.writeToXMLElement());
this.add(new JScrollPane(xmlTree), BorderLayout.CENTER);
[2/2] incubator-taverna-workbench-common-activities git commit:
gitignore
Posted by st...@apache.org.
gitignore
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/3ed895b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/tree/3ed895b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/diff/3ed895b1
Branch: refs/heads/master
Commit: 3ed895b176ae67562f9edf584e225bd8b657a835
Parents: 50a9367
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed May 4 01:20:00 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed May 4 01:20:00 2016 +0100
----------------------------------------------------------------------
.gitignore | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-common-activities/blob/3ed895b1/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8ba508e..f736862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
-/target/
-/taverna-beanshell-activity-ui/target/
-/taverna-spreadsheet-import-activity-ui/target/
-/taverna-external-tool-activity-ui/target/
-/taverna-localworker-activity-ui/target/
-/taverna-xpath-activity-ui/target/
-/taverna-rest-activity-ui/target/
\ No newline at end of file
+.project
+.settings
+.classpath
+target
+.gitignore