mpoeschl 2004/01/21 14:40:26
Modified: src/generator/src/templates/om Object.vm
ObjectWithManager.vm
Log:
sync Object.vm and ObjectWithManager.vm
remove extra )
Revision Changes Path
1.11 +13 -13 db-torque/src/generator/src/templates/om/Object.vm
Index: Object.vm
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Object.vm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Object.vm 21 Jan 2004 19:57:22 -0000 1.10
+++ Object.vm 21 Jan 2004 22:40:26 -0000 1.11
@@ -370,7 +370,7 @@
set${col.JavaName}(((NumberKey) keys[$i]).longValue());
#elseif($fktype == "BigDecimal")
set${col.JavaName}(((NumberKey) keys[$i]).getBigDecimal());
- #elseif($fktype == "byte") )
+ #elseif($fktype == "byte")
set${col.JavaName}(((NumberKey) keys[$i]).byteValue());
#elseif($fktype == "float")
set${col.JavaName}(((NumberKey) keys[$i]).floatValue());
@@ -382,7 +382,7 @@
set${col.JavaName}(new Integer(((NumberKey) keys[$i]).intValue()));
#elseif($fktype == "Long")
set${col.JavaName}(new Long(((NumberKey) keys[$i]).longValue()));
- #elseif($fktype == "Byte") )
+ #elseif($fktype == "Byte")
set${col.JavaName}(new Byte(((NumberKey) keys[$i]).byteValue()));
#elseif($fktype == "Float")
set${col.JavaName}(new Float(((NumberKey) keys[$i]).floatValue()));
@@ -409,7 +409,7 @@
set${col.JavaName}(((NumberKey) key).longValue());
#elseif($fktype == "BigDecimal")
set${col.JavaName}(((NumberKey) key).getBigDecimal());
- #elseif($fktype == "byte") )
+ #elseif($fktype == "byte")
set${col.JavaName}(((NumberKey) key).byteValue());
#elseif($fktype == "float")
set${col.JavaName}(((NumberKey) key).floatValue());
@@ -421,7 +421,7 @@
set${col.JavaName}(new Integer(((NumberKey) key).intValue()));
#elseif($fktype == "Long")
set${col.JavaName}(new Long(((NumberKey) key).longValue()));
- #elseif($fktype == "Byte") )
+ #elseif($fktype == "Byte")
set${col.JavaName}(new Byte(((NumberKey) key).byteValue()));
#elseif($fktype == "Float")
set${col.JavaName}(new Float(((NumberKey) key).floatValue()));
@@ -1209,7 +1209,7 @@
/**
* Set the PrimaryKey using ObjectKey.
*
- * @param $clo ObjectKey
+ * @param key ObjectKey $clo
*/
public void setPrimaryKey(ObjectKey key)
$throwsClause
@@ -1222,7 +1222,7 @@
set${col.JavaName}(((NumberKey) key).longValue());
#elseif($cjtype == "BigDecimal")
set${col.JavaName}(((NumberKey) key).getBigDecimal());
- #elseif($cjtype == "byte") )
+ #elseif($cjtype == "byte")
set${col.JavaName}(((NumberKey) key).byteValue());
#elseif($cjtype == "float")
set${col.JavaName}(((NumberKey) key).floatValue());
@@ -1234,7 +1234,7 @@
set${col.JavaName}(new Integer(((NumberKey) key).intValue()));
#elseif($cjtype == "Long")
set${col.JavaName}(new Long(((NumberKey) key).longValue()));
- #elseif($cjtype == "Byte") )
+ #elseif($cjtype == "Byte")
set${col.JavaName}(new Byte(((NumberKey) key).byteValue()));
#elseif($cjtype == "Float")
set${col.JavaName}(new Float(((NumberKey) key).floatValue()));
@@ -1243,9 +1243,9 @@
#elseif($cjtype == "String")
set${col.JavaName}(key.toString());
#elseif($cjtype == "Date")
- set${col.JavaName}(((DateKey)key).getDate());
+ set${col.JavaName}(((DateKey) key).getDate());
#else
- set${col.JavaName}(($cjtype)key);
+ set${col.JavaName}(($cjtype) key);
#end
}
@@ -1264,7 +1264,7 @@
set${col.JavaName}(Long.parseLong(key));
#elseif($cjtype == "BigDecimal")
set${col.JavaName}(new BigDecimal(key));
- #elseif($cjtype == "byte") )
+ #elseif($cjtype == "byte")
set${col.JavaName}(Byte.parseByte(key));
#elseif($cjtype == "float")
set${col.JavaName}(Float.parseFloat(key));
@@ -1276,7 +1276,7 @@
set${col.JavaName}(new Integer(key));
#elseif($cjtype == "Long")
set${col.JavaName}(new Long(key));
- #elseif($cjtype == "Byte") )
+ #elseif($cjtype == "Byte")
set${col.JavaName}(new Byte(key));
#elseif($cjtype == "Float")
set${col.JavaName}(new Float(key));
@@ -1316,7 +1316,7 @@
set${pk.JavaName}(((NumberKey)keys[$i]).longValue());
#elseif($pktype == "BigDecimal")
set${pk.JavaName}(((NumberKey)keys[$i]).getBigDecimal());
- #elseif($pktype == "byte") )
+ #elseif($pktype == "byte")
set${pk.JavaName}(((NumberKey)keys[$i]).byteValue());
#elseif($pktype == "float")
set${pk.JavaName}(((NumberKey)keys[$i]).floatValue());
@@ -1328,7 +1328,7 @@
set${pk.JavaName}(new Integer(((NumberKey)keys[$i]).intValue()));
#elseif($pktype == "Long")
set${pk.JavaName}(new Long(((NumberKey)keys[$i]).longValue()));
- #elseif($pktype == "Byte") )
+ #elseif($pktype == "Byte")
set${pk.JavaName}(new Byte(((NumberKey)keys[$i]).byteValue()));
#elseif($pktype == "Float")
set${pk.JavaName}(new Float(((NumberKey)keys[$i]).floatValue()));
1.7 +28 -28 db-torque/src/generator/src/templates/om/ObjectWithManager.vm
Index: ObjectWithManager.vm
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/ObjectWithManager.vm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ObjectWithManager.vm 21 Jan 2004 19:57:22 -0000 1.6
+++ ObjectWithManager.vm 21 Jan 2004 22:40:26 -0000 1.7
@@ -350,7 +350,7 @@
set${col.JavaName}(((NumberKey) keys[$i]).longValue());
#elseif($fktype == "BigDecimal")
set${col.JavaName}(((NumberKey) keys[$i]).getBigDecimal());
- #elseif($fktype == "byte") )
+ #elseif($fktype == "byte")
set${col.JavaName}(((NumberKey) keys[$i]).byteValue());
#elseif($fktype == "float")
set${col.JavaName}(((NumberKey) keys[$i]).floatValue());
@@ -362,7 +362,7 @@
set${col.JavaName}(new Integer(((NumberKey) keys[$i]).intValue()));
#elseif($fktype == "Long")
set${col.JavaName}(new Long(((NumberKey) keys[$i]).longValue()));
- #elseif($fktype == "Byte") )
+ #elseif($fktype == "Byte")
set${col.JavaName}(new Byte(((NumberKey) keys[$i]).byteValue()));
#elseif($fktype == "Float")
set${col.JavaName}(new Float(((NumberKey) keys[$i]).floatValue()));
@@ -389,7 +389,7 @@
set${col.JavaName}(((NumberKey) key).longValue());
#elseif($fktype == "BigDecimal")
set${col.JavaName}(((NumberKey) key).getBigDecimal());
- #elseif($fktype == "byte") )
+ #elseif($fktype == "byte")
set${col.JavaName}(((NumberKey) key).byteValue());
#elseif($fktype == "float")
set${col.JavaName}(((NumberKey) key).floatValue());
@@ -401,7 +401,7 @@
set${col.JavaName}(new Integer(((NumberKey) key).intValue()));
#elseif($fktype == "Long")
set${col.JavaName}(new Long(((NumberKey) key).longValue()));
- #elseif($fktype == "Byte") )
+ #elseif($fktype == "Byte")
set${col.JavaName}(new Byte(((NumberKey) key).byteValue()));
#elseif($fktype == "Float")
set${col.JavaName}(new Float(((NumberKey) key).floatValue()));
@@ -1179,43 +1179,43 @@
/**
* Set the PrimaryKey using ObjectKey.
*
- * @param $clo ObjectKey
+ * @param key ObjectKey $clo
*/
- public void setPrimaryKey(ObjectKey $clo)
+ public void setPrimaryKey(ObjectKey key)
$throwsClause
{
#if ($cjtype == "short")
- set${col.JavaName}(((NumberKey)$clo).shortValue());
+ set${col.JavaName}(((NumberKey) key).shortValue());
#elseif($cjtype == "int")
- set${col.JavaName}(((NumberKey)$clo).intValue());
+ set${col.JavaName}(((NumberKey) key).intValue());
#elseif($cjtype == "long")
- set${col.JavaName}(((NumberKey)$clo).longValue());
+ set${col.JavaName}(((NumberKey) key).longValue());
#elseif($cjtype == "BigDecimal")
- set${col.JavaName}(((NumberKey)$clo).getBigDecimal());
- #elseif($cjtype == "byte") )
- set${col.JavaName}(((NumberKey)$clo).byteValue());
+ set${col.JavaName}(((NumberKey) key).getBigDecimal());
+ #elseif($cjtype == "byte")
+ set${col.JavaName}(((NumberKey) key).byteValue());
#elseif($cjtype == "float")
- set${col.JavaName}(((NumberKey)$clo).floatValue());
+ set${col.JavaName}(((NumberKey) key).floatValue());
#elseif($cjtype == "double")
- set${col.JavaName}(((NumberKey)$clo).doubleValue());
+ set${col.JavaName}(((NumberKey) key).doubleValue());
#elseif($cjtype == "Short")
- set${col.JavaName}(new Short(((NumberKey)$clo).shortValue()));
+ set${col.JavaName}(new Short(((NumberKey) key).shortValue()));
#elseif($cjtype == "Integer")
- set${col.JavaName}(new Integer(((NumberKey)$clo).intValue()));
+ set${col.JavaName}(new Integer(((NumberKey) key).intValue()));
#elseif($cjtype == "Long")
- set${col.JavaName}(new Long(((NumberKey)$clo).longValue()));
- #elseif($cjtype == "Byte") )
- set${col.JavaName}(new Byte(((NumberKey)$clo).byteValue()));
+ set${col.JavaName}(new Long(((NumberKey) key).longValue()));
+ #elseif($cjtype == "Byte")
+ set${col.JavaName}(new Byte(((NumberKey) key).byteValue()));
#elseif($cjtype == "Float")
- set${col.JavaName}(new Float(((NumberKey)$clo).floatValue()));
+ set${col.JavaName}(new Float(((NumberKey) key).floatValue()));
#elseif($cjtype == "Double")
- set${col.JavaName}(new Double(((NumberKey)$clo).doubleValue()));
+ set${col.JavaName}(new Double(((NumberKey) key).doubleValue()));
#elseif($cjtype == "String")
- set${col.JavaName}(${clo}.toString());
+ set${col.JavaName}(key.toString());
#elseif($cjtype == "Date")
- set${col.JavaName}(((DateKey)$clo).getDate());
+ set${col.JavaName}(((DateKey) key).getDate());
#else
- set${col.JavaName}(($cjtype)$clo);
+ set${col.JavaName}(($cjtype) key);
#end
}
@@ -1234,7 +1234,7 @@
set${col.JavaName}(Long.parseLong(key));
#elseif($cjtype == "BigDecimal")
set${col.JavaName}(new BigDecimal(key));
- #elseif($cjtype == "byte") )
+ #elseif($cjtype == "byte")
set${col.JavaName}(Byte.parseByte(key));
#elseif($cjtype == "float")
set${col.JavaName}(Float.parseFloat(key));
@@ -1246,7 +1246,7 @@
set${col.JavaName}(new Integer(key));
#elseif($cjtype == "Long")
set${col.JavaName}(new Long(key));
- #elseif($cjtype == "Byte") )
+ #elseif($cjtype == "Byte")
set${col.JavaName}(new Byte(key));
#elseif($cjtype == "Float")
set${col.JavaName}(new Float(key));
@@ -1286,7 +1286,7 @@
set${pk.JavaName}(((NumberKey)keys[$i]).longValue());
#elseif($pktype == "BigDecimal")
set${pk.JavaName}(((NumberKey)keys[$i]).getBigDecimal());
- #elseif($pktype == "byte") )
+ #elseif($pktype == "byte")
set${pk.JavaName}(((NumberKey)keys[$i]).byteValue());
#elseif($pktype == "float")
set${pk.JavaName}(((NumberKey)keys[$i]).floatValue());
@@ -1298,7 +1298,7 @@
set${pk.JavaName}(new Integer(((NumberKey)keys[$i]).intValue()));
#elseif($pktype == "Long")
set${pk.JavaName}(new Long(((NumberKey)keys[$i]).longValue()));
- #elseif($pktype == "Byte") )
+ #elseif($pktype == "Byte")
set${pk.JavaName}(new Byte(((NumberKey)keys[$i]).byteValue()));
#elseif($pktype == "Float")
set${pk.JavaName}(new Float(((NumberKey)keys[$i]).floatValue()));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
