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/08/12 13:13:15 UTC
[27/46] incubator-taverna-plugin-gis git commit: Add basic activity
configuration panel
Add basic activity configuration panel
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/commit/908b9720
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/tree/908b9720
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/diff/908b9720
Branch: refs/heads/taverna2
Commit: 908b97205a26bd7eaa041ce29736197664f886c6
Parents: dafb279
Author: edikaradumi <ed...@gmail.com>
Authored: Thu Aug 4 04:58:27 2016 +0100
Committer: edikaradumi <ed...@gmail.com>
Committed: Thu Aug 4 04:58:27 2016 +0100
----------------------------------------------------------------------
.../gis/ui/config/GisConfigurationPanel.java | 42 +++++++++++---------
1 file changed, 24 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/908b9720/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigurationPanel.java b/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigurationPanel.java
index dd5a965..4213664 100644
--- a/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigurationPanel.java
+++ b/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/config/GisConfigurationPanel.java
@@ -22,8 +22,8 @@ public class GisConfigurationPanel
private GisActivity activity;
private GisActivityConfigurationBean configBean;
+ private JTextField fieldServiceURI;
private JTextField fieldProcessIdentifier;
- private JTextField fieldURI;
public GisConfigurationPanel(GisActivity activity) {
this.activity = activity;
@@ -35,17 +35,17 @@ public class GisConfigurationPanel
setLayout(new GridLayout(0, 2));
// FIXME: Create GUI depending on activity configuration bean
- JLabel labelString = new JLabel("Example string:");
- add(labelString);
- fieldProcessIdentifier = new JTextField(20);
+ JLabel labelServiceURI = new JLabel("Service URI:");
+ add(labelServiceURI);
+ fieldServiceURI = new JTextField(100);
+ add(fieldServiceURI);
+ labelServiceURI.setLabelFor(fieldServiceURI);
+
+ JLabel labelProcessIdentifier = new JLabel("Process Identifier:");
+ add(labelProcessIdentifier);
+ fieldProcessIdentifier = new JTextField(100);
add(fieldProcessIdentifier);
- labelString.setLabelFor(fieldProcessIdentifier);
-
- JLabel labelURI = new JLabel("Example URI:");
- add(labelURI);
- fieldURI = new JTextField(25);
- add(fieldURI);
- labelURI.setLabelFor(fieldURI);
+ labelProcessIdentifier.setLabelFor(fieldProcessIdentifier);
// Populate fields from activity configuration bean
refreshConfiguration();
@@ -57,13 +57,16 @@ public class GisConfigurationPanel
@Override
public boolean checkValues() {
try {
- URI.create(fieldURI.getText());
+ URI.create(fieldServiceURI.getText());
} catch (IllegalArgumentException ex) {
JOptionPane.showMessageDialog(this, ex.getCause().getMessage(),
"Invalid URI", JOptionPane.ERROR_MESSAGE);
// Not valid, return false
return false;
}
+
+ // TODO: Should check if process exists
+
// All valid, return true
return true;
}
@@ -83,11 +86,12 @@ public class GisConfigurationPanel
*/
@Override
public boolean isConfigurationChanged() {
- String originalString = configBean.getProcessIdentifier();
- String originalUri = configBean.getOgcServiceUri().toASCIIString();
+ String originalServiceUri = configBean.getOgcServiceUri().toASCIIString();
+ String originalProcessIdentifier = configBean.getProcessIdentifier();
+
// true (changed) unless all fields match the originals
- return ! (originalString.equals(fieldProcessIdentifier.getText())
- && originalUri.equals(fieldURI.getText()));
+ return ! (originalServiceUri.equals(fieldServiceURI.getText())
+ && originalProcessIdentifier.equals(fieldProcessIdentifier.getText()));
}
/**
@@ -99,8 +103,9 @@ public class GisConfigurationPanel
configBean = new GisActivityConfigurationBean();
// FIXME: Update bean fields from your UI elements
+ configBean.setOgcServiceUri(URI.create(fieldServiceURI.getText()));
configBean.setProcessIdentifier(fieldProcessIdentifier.getText());
- configBean.setOgcServiceUri(URI.create(fieldURI.getText()));
+
}
/**
@@ -112,7 +117,8 @@ public class GisConfigurationPanel
configBean = activity.getConfiguration();
// FIXME: Update UI elements from your bean fields
+ fieldServiceURI.setText(configBean.getOgcServiceUri().toASCIIString());
fieldProcessIdentifier.setText(configBean.getProcessIdentifier());
- fieldURI.setText(configBean.getOgcServiceUri().toASCIIString());
+
}
}