[MOBY-guts] biomoby commit

[Andreas Groscurth]

groscurt
Mon Jan  5 03:42:18 EST 2009
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator
In directory dev.open-bio.org:/tmp/cvs-serv23700/src/main/org/biomoby/service/generator

Modified Files:
	DataTypesGenerator.java 
Log Message:
templates for HAS(A) float and integer children of data types. 
moby-live/Java/src/main/org/biomoby/service/generator DataTypesGenerator.java,1.7,1.8
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/DataTypesGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/DataTypesGenerator.java	2008/03/03 11:34:17	1.7
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/DataTypesGenerator.java	2009/01/05 08:42:18	1.8
@@ -64,9 +64,13 @@
     protected static final String TN_METHODS_HAS = "tn04";
     protected static final String TN_METHODS_STRING_HAS = "tn041";
     protected static final String TN_METHODS_BOOLEAN_HAS = "tn042";
+    protected static final String TN_METHODS_INTEGER_HAS = "tn043";
+    protected static final String TN_METHODS_FLOAT_HAS = "tn044";
     protected static final String TN_METHODS_HASA = "tn05";
     protected static final String TN_METHODS_STRING_HASA = "tn051";
     protected static final String TN_METHODS_BOOLEAN_HASA = "tn052";
+    protected static final String TN_METHODS_INTEGER_HASA = "tn053";
+    protected static final String TN_METHODS_FLOAT_HASA = "tn054";
     protected static final String TN_TOSTRING_HAS = "tn06";
     protected static final String TN_TOSTRING_HASA = "tn07";
     protected static final String TN_TOXML_HAS = "tn08";
@@ -117,9 +121,13 @@
 	tNames.put (TN_METHODS_HAS,          new File (dir, "MethodsHASTemplate.java"));
 	tNames.put (TN_METHODS_STRING_HAS,   new File (dir, "MethodsHAS_string_Template.java"));
 	tNames.put (TN_METHODS_BOOLEAN_HAS,  new File (dir, "MethodsHAS_boolean_Template.java"));
+	tNames.put( TN_METHODS_INTEGER_HAS, new File(dir, "MethodsHAS_integer_Template.java") );
+	tNames.put( TN_METHODS_FLOAT_HAS, new File(dir, "MethodsHAS_float_Template.java") );
 	tNames.put (TN_METHODS_HASA,         new File (dir, "MethodsHASATemplate.java"));
 	tNames.put (TN_METHODS_STRING_HASA,  new File (dir, "MethodsHASA_string_Template.java"));
 	tNames.put (TN_METHODS_BOOLEAN_HASA, new File (dir, "MethodsHASA_boolean_Template.java"));
+	tNames.put (TN_METHODS_INTEGER_HASA,  new File (dir, "MethodsHASA_integer_Template.java"));
+	tNames.put( TN_METHODS_FLOAT_HASA, new File(dir, "MethodsHASA_float_Template.java") );
 	tNames.put (TN_TOSTRING_HAS,         new File (dir, "ToStringHASTemplate.java"));
 	tNames.put (TN_TOSTRING_HASA,        new File (dir, "ToStringHASATemplate.java"));
 	tNames.put (TN_TOXML_HAS,            new File (dir, "ToXMLHASTemplate.java"));
@@ -138,9 +146,13 @@
     String methodsHASTemplate;
     String methodsHASStringTemplate;
     String methodsHASBooleanTemplate;
+    String methodsHASIntegerTemplate;
+    String methodsHASFloatTemplate;
     String methodsHASATemplate;
     String methodsHASAStringTemplate;
     String methodsHASABooleanTemplate;
+    String methodsHASAIntegerTemplate;
+    String methodsHASAFloatTemplate;
     String toStringHASTemplate;
     String toStringHASATemplate;
     String toXMLHASTemplate;
@@ -188,9 +200,13 @@
  	methodsHASTemplate   = loadTemplate (templates.get (TN_METHODS_HAS));
 	methodsHASStringTemplate  = loadTemplate (templates.get (TN_METHODS_STRING_HAS));
 	methodsHASBooleanTemplate = loadTemplate (templates.get (TN_METHODS_BOOLEAN_HAS));
+	methodsHASIntegerTemplate = loadTemplate( templates.get( TN_METHODS_INTEGER_HAS ) );
+	methodsHASFloatTemplate = loadTemplate( templates.get( TN_METHODS_FLOAT_HAS ) );
 	methodsHASATemplate  = loadTemplate (templates.get (TN_METHODS_HASA));
 	methodsHASAStringTemplate  = loadTemplate (templates.get (TN_METHODS_STRING_HASA));
 	methodsHASABooleanTemplate = loadTemplate (templates.get (TN_METHODS_BOOLEAN_HASA));
+	methodsHASAIntegerTemplate = loadTemplate( templates.get(TN_METHODS_INTEGER_HASA) );
+	methodsHASAFloatTemplate = loadTemplate( templates.get(TN_METHODS_FLOAT_HASA) );
 	toStringHASTemplate  = loadTemplate (templates.get (TN_TOSTRING_HAS));
 	toStringHASATemplate = loadTemplate (templates.get (TN_TOSTRING_HASA));
 	toXMLHASTemplate     = loadTemplate (templates.get (TN_TOXML_HAS));
@@ -373,8 +389,12 @@
 	    return methodsHASAStringTemplate;
 	else if (MobyTags.MOBYBOOLEAN.equals (dataTypeName))
 	    return methodsHASABooleanTemplate;
-	else
-	    return null;
+	else if(MobyTags.MOBYINTEGER.equals( dataTypeName ))
+		return methodsHASAIntegerTemplate;
+	else if(MobyTags.MOBYFLOAT.equals( dataTypeName )) 
+		return methodsHASAFloatTemplate;
+	else 
+		return null;
     }
 
     protected String selectHASTemplateForPrimitiveType (String dataTypeName) {
@@ -382,6 +402,10 @@
 	    return methodsHASStringTemplate;
 	else if (MobyTags.MOBYBOOLEAN.equals (dataTypeName))
 	    return methodsHASBooleanTemplate;
+	else if(MobyTags.MOBYINTEGER.equals( dataTypeName ))
+		return methodsHASIntegerTemplate;
+	else if(MobyTags.MOBYFLOAT.equals( dataTypeName )) 
+		return methodsHASFloatTemplate;
 	else
 	    return null;
     }