You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/04/22 22:53:52 UTC
svn commit: r1328973 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
graph/system/gui/InputConfigurationDialog.java lead/LEADTypes.java
Author: lahiru
Date: Sun Apr 22 20:53:52 2012
New Revision: 1328973
URL: http://svn.apache.org/viewvc?rev=1328973&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-386.
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java?rev=1328973&r1=1328972&r2=1328973&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/InputConfigurationDialog.java Sun Apr 22 20:53:52 2012
@@ -92,13 +92,13 @@ public class InputConfigurationDialog {
this.valueLabel.setText("Default value (in XML)");
}
this.valueLabel.setLabelFor(textComponent);
- final int index = 5;
+ final int index = 7;
this.gridPanel.remove(index);
this.gridPanel.add(textComponent, index);
if (knownType) {
- this.gridPanel.layout(new double[] { 0, 1.0 / 2, 0, 1.0 / 2 }, new double[] { 0, 1 });
+ this.gridPanel.layout(new double[] { 0, 1.0 / 2,0, 0, 1.0 / 2 }, new double[] { 0, 1 });
} else {
- this.gridPanel.layout(new double[] { 0, 1.0 / 3, 1.0 / 3, 1.0 / 3 }, new double[] { 0, 1 });
+ this.gridPanel.layout(new double[] { 0, 1.0 / 3,0, 1.0 / 3, 1.0 / 3 }, new double[] { 0, 1 });
}
String name = this.node.getID(); // Show ID.
@@ -117,6 +117,11 @@ public class InputConfigurationDialog {
} else {
valueString = value.toString();
}
+ if (knownType) {
+ this.valueTextField.setText(valueString);
+ } else {
+ this.valueTextArea.setText(valueString);
+ }
textComponent.setText(valueString);
XmlElement metadata = this.node.getMetadata();
String metadataText;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java?rev=1328973&r1=1328972&r2=1328973&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java Sun Apr 22 20:53:52 2012
@@ -34,7 +34,7 @@ public class LEADTypes {
/**
* http://www.extreme.indiana.edu/lead/xsd
*/
- public static final String LEAD_XSD_NS_URI = "http://www.extreme.indiana.edu/lead/xsd";
+ public static final String LEAD_XSD_NS_URI = "http://schemas.airavata.apache.org/gfac/type";
// Simple types
@@ -116,6 +116,34 @@ public class LEADTypes {
*/
public static final QName DATA_ID_ARRAY_TYPE = new QName(LEAD_XSD_NS_URI, "DataIDArrayType");
+ public static final QName STRING_TYPE = new QName(LEAD_XSD_NS_URI, "StringParameterType");
+
+ /**
+ * IntegerArrayType
+ */
+ public static final QName INTEGER_TYPE = new QName(LEAD_XSD_NS_URI, "IntegerParameterType");
+
+ /**
+ * FloatArrayType
+ */
+ public static final QName FLOAT_TYPE = new QName(LEAD_XSD_NS_URI, "FloatParameterType");
+
+ /**
+ * DoubleArrayType
+ */
+ public static final QName DOUBLE_TYPE = new QName(LEAD_XSD_NS_URI, "DoubleParameterType");
+
+ /**
+ * BooleanArrayType
+ */
+ public static final QName BOOLEAN_TYPE = new QName(LEAD_XSD_NS_URI, "BooleanParameterType");
+
+ /**
+ * URIArrayType
+ */
+ public static final QName URI_TYPE = new QName(LEAD_XSD_NS_URI, "URIParameterType");
+
+
/**
* Checks if a specified type is known. If the type is known, the GUI accepts string as a user's input. If not
* known, the GUI accepts XML as the input.
@@ -134,7 +162,9 @@ public class LEADTypes {
|| HOST_NAME_TYPE.equals(type) || STRING_ARRAY_TYPE.equals(type) || INTEGER_ARRAY_TYPE.equals(type)
|| FLOAT_ARRAY_TYPE.equals(type) || DOUBLE_ARRAY_TYPE.equals(type) || BOOLEAN_ARRAY_TYPE.equals(type)
|| QNAME_ARRAY_TYPE.equals(type) || URI_ARRAY_TYPE.equals(type) || LEAD_FILE_ID_ARRAY_TYPE.equals(type)
- || DATA_ID_ARRAY_TYPE.equals(type)) {
+ || DATA_ID_ARRAY_TYPE.equals(type) || STRING_TYPE.equals(type) || URI_TYPE.equals(type)
+ || INTEGER_TYPE.equals(type) || FLOAT_TYPE.equals(type) || DOUBLE_TYPE.equals(type)
+ || BOOLEAN_TYPE.equals(type)) {
return true;
} else if (DATA_ID_TYPE.getLocalPart().equals(type.getLocalPart())) {
// XXX temporary hack.
@@ -153,7 +183,7 @@ public class LEADTypes {
public static boolean isURIType(QName type) {
if (WSConstants.XSD_ANY_URI.equals(type) || LEAD_NAME_LIST_PROPERTIES_FILE_TYPE.equals(type)
|| LEAD_FILE_ID_TYPE.equals(type) || LEAD_NAME_LIST_FILE_TYPE.equals(type)
- || LEAD_WORKFLOW_ID_TYPE.equals(type)) {
+ || LEAD_WORKFLOW_ID_TYPE.equals(type) || URI_TYPE.equals(type)) {
return true;
} else {
return false;