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 2011/10/21 21:33:24 UTC
svn commit: r1187522 - in
/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type:
DataType.java ServiceDescription.java parameter/ParameterFactory.java
Author: lahiru
Date: Fri Oct 21 19:33:24 2011
New Revision: 1187522
URL: http://svn.apache.org/viewvc?rev=1187522&view=rev
Log:
Applying the patch for AIRAVATA-156
Thanks Heshan for the contribution
Modified:
incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/DataType.java
incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ServiceDescription.java
incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/parameter/ParameterFactory.java
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/DataType.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/DataType.java?rev=1187522&r1=1187521&r2=1187522&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/DataType.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/DataType.java Fri Oct 21 19:33:24 2011
@@ -23,49 +23,25 @@ package org.apache.airavata.commons.gfac
public class DataType implements Type {
- private String type;
+ private org.apache.airavata.schemas.gfac.DataType.Enum dataType;
public DataType() {
+ dataType = null;
}
public DataType(String type) {
- this.type = type;
+ dataType = org.apache.airavata.schemas.gfac.DataType.Enum.forString(type);
}
public void setType(String type) {
- this.type = type;
+ dataType = org.apache.airavata.schemas.gfac.DataType.Enum.forString(type);
}
public String getType() {
- return this.type;
+ return dataType.toString();
}
public String toString() {
- return this.type;
+ return dataType.toString();
}
-
- /* TODO:
- private org.apache.airavata.schemas.gfac.DataType dataType;
-
- public DataType() {
- dataType = org.apache.airavata.schemas.gfac.DataType.Factory.newInstance();
- }
-
- public DataType(String type) {
- this.dataType.set(type);
- //this.dataType.set(org.apache.airavata.schemas.gfac.DataType.DOUBLE);
- }
-
- public void setType(String type) {
- this.dataType.set(type);
- }
-
- public String getType() {
- return this.dataType.getStringValue();
- }
-
- public String toString() {
- return this.dataType.toString();
- }
- */
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ServiceDescription.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ServiceDescription.java?rev=1187522&r1=1187521&r2=1187522&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ServiceDescription.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ServiceDescription.java Fri Oct 21 19:33:24 2011
@@ -23,13 +23,9 @@ package org.apache.airavata.commons.gfac
import org.apache.airavata.schemas.gfac.ServiceDescriptionType;
-import java.util.List;
-
public class ServiceDescription implements Type {
private ServiceDescriptionType serviceDescriptionType;
- private List<org.apache.airavata.commons.gfac.type.Parameter> inputParameters;
- private List<Parameter> outputParameters;
public ServiceDescription() {
this.serviceDescriptionType = ServiceDescriptionType.Factory.newInstance();
@@ -51,7 +47,6 @@ public class ServiceDescription implemen
return serviceDescriptionType;
}
- // TODO
public org.apache.airavata.schemas.gfac.Parameter[] getInputParameters() {
return this.serviceDescriptionType.getInputParametersArray();
}
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/parameter/ParameterFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/parameter/ParameterFactory.java?rev=1187522&r1=1187521&r2=1187522&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/parameter/ParameterFactory.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/parameter/ParameterFactory.java Fri Oct 21 19:33:24 2011
@@ -21,12 +21,6 @@
package org.apache.airavata.commons.gfac.type.parameter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.airavata.commons.gfac.type.DataType;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -34,6 +28,8 @@ import org.apache.commons.configuration.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.*;
+
public class ParameterFactory {
private static final Logger log = LoggerFactory.getLogger(ParameterFactory.class);
@@ -111,7 +107,9 @@ public class ParameterFactory {
throw new RuntimeException("Type is not supprted: " + type);
Class<? extends AbstractParameter> cl = map.get(lower);
AbstractParameter result = cl.newInstance();
- result.setType(getType(lower));
+ DataType dataType = new DataType(type);
+ result.setType(dataType);
+ /*result.setType(getType(lower));*/
return result;
}