Repository: airavata Updated Branches: refs/heads/master db4569977 -> 201a05e20
Show data type in input and output confiuration dialogs, and refactored the both code Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/201a05e2 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/201a05e2 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/201a05e2 Branch: refs/heads/master Commit: 201a05e20b839dd323e3e258e61f12adaa63e9c9 Parents: db45699 Author: shamrath <[email protected]> Authored: Mon Dec 15 15:44:41 2014 -0500 Committer: shamrath <[email protected]> Committed: Mon Dec 15 15:44:41 2014 -0500 ---------------------------------------------------------------------- .../graph/system/InputConfigurationDialog.java | 71 +++----------------- .../graph/system/OutputConfigurationDialog.java | 41 +++-------- 2 files changed, 19 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/201a05e2/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java index 340d82b..449c51d 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java @@ -59,11 +59,10 @@ public class InputConfigurationDialog { private XBayaTextField valueTextField; - private XBayaTextArea valueTextArea; + private XBayaTextField dataTypeTextField; - private XBayaTextArea metadataTextArea; + private XBayaLabel dataTypeLabel; - private XBayaTextField visibilityTextField; /** * Constructs an InputConfigurationWindow. @@ -81,22 +80,8 @@ public class InputConfigurationDialog { * Shows the dialog. */ public void show() { - DataType type = this.node.getParameterType(); - XBayaTextComponent textComponent; - textComponent = this.valueTextField; - this.valueLabel.setText("Value"); - - this.valueLabel.setLabelFor(textComponent); - final int index = 3; - this.gridPanel.remove(index); - this.gridPanel.add(textComponent, index); - this.gridPanel.layout(new double[] { 0,0, 1.0 / 2}, new double[] { 0, 1 }); String name = this.node.getID(); // Show ID. this.nameTextField.setText(name); - -// String visibility = Boolean.toString(this.node.isVisibility()); -// this.visibilityTextField.setText(visibility); - this.descriptionTextArea.setText(this.node.getDescription()); Object value = this.node.getDefaultValue(); String valueString; @@ -107,17 +92,8 @@ public class InputConfigurationDialog { } else { valueString = value.toString(); } + this.dataTypeTextField.setText(this.node.getParameterType().toString()); this.valueTextField.setText(valueString); - textComponent.setText(valueString); -// XmlElement metadata = this.node.getMetadata(); -// String metadataText; -// if (metadata == null) { -// metadataText = WSConstants.EMPTY_APPINFO; -// } else { -// metadataText = XMLUtil.xmlElementToString(metadata); -// } -// this.metadataTextArea.setText(metadataText); - this.dialog.show(); } @@ -129,16 +105,11 @@ public class InputConfigurationDialog { } private void setInput() { - DataType type = this.node.getParameterType(); XBayaTextComponent textComponent; textComponent = this.valueTextField; - String name = this.nameTextField.getText(); String description = this.descriptionTextArea.getText(); String valueString = textComponent.getText(); -// String metadataText = this.metadataTextArea.getText(); -// String visibilityText = this.visibilityTextField.getText(); - if (name.length() == 0) { String warning = "The name cannot be empty."; this.xbayaGUI.getErrorWindow().error(warning); @@ -152,25 +123,11 @@ public class InputConfigurationDialog { } value = valueString; } -// XmlElement metadata; -// if (metadataText.length() == 0) { -// metadata = null; -// } else { -// try { -// metadata = XMLUtil.stringToXmlElement(metadataText); -// } catch (RuntimeException e) { -// String warning = "The metadata is ill-formed."; -// this.xbayaGUI.getErrorWindow().error(warning, e); -// return; -// } -// } this.node.setConfigured(true); this.node.setConfiguredName(name); this.node.setDescription(description); this.node.setDefaultValue(value); -// this.node.setMetadata(metadata); -// this.node.setVisibility(Boolean.parseBoolean(visibilityText)); hide(); this.xbayaGUI.getGraphCanvas().repaint(); } @@ -186,28 +143,22 @@ public class InputConfigurationDialog { XBayaLabel descriptionLabel = new XBayaLabel("Description", this.descriptionTextArea); this.valueTextField = new XBayaTextField(); // for string - this.valueTextArea = new XBayaTextArea(); // for XML - // temporaly set text field. - this.valueLabel = new XBayaLabel("", this.valueTextField); -// -// this.metadataTextArea = new XBayaTextArea(); -// XBayaLabel metadataLabel = new XBayaLabel("Metadata", this.metadataTextArea); -// -// this.visibilityTextField = new XBayaTextField(); -// XBayaLabel visibilityLabel = new XBayaLabel("Visibility", this.visibilityTextField); + this.valueLabel = new XBayaLabel("Value", this.valueTextField); + + this.dataTypeTextField = new XBayaTextField(); + this.dataTypeTextField.setEditable(false); + this.dataTypeLabel = new XBayaLabel("Type", this.dataTypeTextField); this.gridPanel = new GridPanel(); this.gridPanel.add(nameLabel); this.gridPanel.add(this.nameTextField); -// this.gridPanel.add(visibilityLabel); -// this.gridPanel.add(this.visibilityTextField); this.gridPanel.add(this.valueLabel); this.gridPanel.add(this.valueTextField); + this.gridPanel.add(this.dataTypeLabel); + this.gridPanel.add(this.dataTypeTextField); this.gridPanel.add(descriptionLabel); this.gridPanel.add(this.descriptionTextArea); -// this.gridPanel.add(metadataLabel); -// this.gridPanel.add(this.metadataTextArea); - this.gridPanel.layout(3, 2, 3, 1); + this.gridPanel.layout(4, 2, 3, 1); JButton okButton = new JButton("OK"); okButton.addActionListener(new AbstractAction() { http://git-wip-us.apache.org/repos/asf/airavata/blob/201a05e2/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java index a3c063e..7862959 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/OutputConfigurationDialog.java @@ -50,7 +50,9 @@ public class OutputConfigurationDialog { private XBayaTextArea descriptionTextArea; - private XBayaTextArea metadataTextArea; + private XBayaTextField dataTypeField; + + private XBayaLabel dataTypeLabel; /** * Constructs an InputConfigurationWindow. @@ -68,22 +70,12 @@ public class OutputConfigurationDialog { * Shows the dialog. */ public void show() { - String name = this.node.getConfiguredName(); if (name == null) { name = this.node.getName(); } this.nameTextField.setText(name); this.descriptionTextArea.setText(this.node.getDescription()); - XmlElement metadata = this.node.getMetadata(); - String metadataText; - if (metadata == null) { - metadataText = WSConstants.EMPTY_APPINFO; - } else { - metadataText = XMLUtil.xmlElementToString(metadata); - } - this.metadataTextArea.setText(metadataText); - this.dialog.show(); } @@ -97,31 +89,14 @@ public class OutputConfigurationDialog { private void setInput() { String name = this.nameTextField.getText(); String description = this.descriptionTextArea.getText(); - String metadataText = this.metadataTextArea.getText(); - if (name.length() == 0) { String warning = "The name cannot be empty."; this.xbayaGUI.getErrorWindow().error(warning); return; } - - XmlElement metadata; - if (metadataText.length() == 0) { - metadata = null; - } else { - try { - metadata = XMLUtil.stringToXmlElement(metadataText); - } catch (RuntimeException e) { - String warning = "The metadata is ill-formed."; - this.xbayaGUI.getErrorWindow().error(warning, e); - return; - } - } - this.node.setConfigured(true); this.node.setConfiguredName(name); this.node.setDescription(description); - this.node.setMetadata(metadata); hide(); this.xbayaGUI.getGraphCanvas().repaint(); } @@ -133,19 +108,19 @@ public class OutputConfigurationDialog { this.nameTextField = new XBayaTextField(); XBayaLabel nameLabel = new XBayaLabel("Name", this.nameTextField); + this.dataTypeField = new XBayaTextField(this.node.getParameterType().toString()); + this.dataTypeField.setEditable(false); + this.dataTypeLabel = new XBayaLabel("Type", this.dataTypeField); this.descriptionTextArea = new XBayaTextArea(); XBayaLabel descriptionLabel = new XBayaLabel("Description", this.descriptionTextArea); - this.metadataTextArea = new XBayaTextArea(); - XBayaLabel metadataLabel = new XBayaLabel("Metadata", this.metadataTextArea); - GridPanel mainPanel = new GridPanel(); mainPanel.add(nameLabel); mainPanel.add(this.nameTextField); + mainPanel.add(this.dataTypeLabel); + mainPanel.add(this.dataTypeField); mainPanel.add(descriptionLabel); mainPanel.add(this.descriptionTextArea); - mainPanel.add(metadataLabel); - mainPanel.add(this.metadataTextArea); mainPanel.layout(3, 2, 2, 1); JButton okButton = new JButton("OK");
