Hi Scott,
I know that you are close to the 3.1.1 release of Torque but I would
really want you to consider the attached patch. It changes the
generation of the Getter and Setter methods in the Object.vm and Peer.vm
to ask the Column. The column object gets two additional getters, called
getGetterName() and getSetterName(). The getSetterName() just returns
"set$Property", but the getGetterName() returns "is$property" if the
property value is either boolean or a java.lang.Boolean.
This is in accordance to the Sun Java Beans rules and I would really
like to see this patch in the 3.1.1 release.
Regards
Henning
--
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen INTERMETA GmbH
[EMAIL PROTECTED] +49 9131 50 654 0 http://www.intermeta.de/
Java, perl, Solaris, Linux, xSP Consulting, Web Services
RHCE - Consultant - Jakarta Turbine Development - hero for hire
"Fighting for one's political stand is an honourable action, but re-
fusing to acknowledge that there might be weaknesses in one's
position - in order to identify them so that they can be remedied -
is a large enough problem with the Open Source movement that it
deserves to be on this list of the top five problems."
--Michelle Levesque, "Fundamental Issues with
Open Source Software Development"
Index: src/java/org/apache/torque/engine/database/model/Column.java
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/model/Column.java,v
retrieving revision 1.5.2.3
diff -u -r1.5.2.3 Column.java
--- src/java/org/apache/torque/engine/database/model/Column.java 20 May 2004 04:34:15 -0000 1.5.2.3
+++ src/java/org/apache/torque/engine/database/model/Column.java 20 Aug 2004 23:45:28 -0000
@@ -244,7 +244,24 @@
}
return StringUtils.capitalise(javaName);
}
-
+
+ public String getGetterName()
+ {
+ if ("boolean".equalsIgnoreCase(getJavaNative()))
+ {
+ return "is" + StringUtils.capitalize(getJavaName());
+ }
+ else
+ {
+ return "get" + StringUtils.capitalize(getJavaName());
+ }
+ }
+
+ public String getSetterName()
+ {
+ return "set" + StringUtils.capitalize(getJavaName());
+ }
+
/**
* Get variable name to use in Java sources (= uncapitalised java name)
*/
Index: src/templates/om/Object.vm
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Object.vm,v
retrieving revision 1.7.2.3
diff -u -r1.7.2.3 Object.vm
--- src/templates/om/Object.vm 14 Aug 2004 12:02:33 -0000 1.7.2.3
+++ src/templates/om/Object.vm 20 Aug 2004 23:45:29 -0000
@@ -121,7 +121,7 @@
*
* @return $cjtype
*/
- public $cjtype get${cfc}()
+ public $cjtype ${col.GetterName} ()
{
return $clo;
}
@@ -143,7 +143,7 @@
*
* @param v new value
*/
- public void set${cfc}($cjtype v) $throwsClause
+ public void $col.SetterName ($cjtype v) $throwsClause
{
#if (($cjtype == "NumberKey") || ($cjtype == "StringKey") || ($cjtype == "DateKey"))
if (v != null && v.getValue() == null)
@@ -191,9 +191,9 @@
#end
#if($colFK.Primitive)
- if ($varName != null && !(${varName}.get${colFK.JavaName}() == v))
+ if ($varName != null && !(${varName}.${colFK.GetterName}() == v))
#else
- if ($varName != null && !ObjectUtils.equals(${varName}.get${colFK.JavaName}(), v))
+ if ($varName != null && !ObjectUtils.equals(${varName}.${colFK.GetterName}(), v))
#end
{
$varName = null;
@@ -218,7 +218,7 @@
for (int i = 0; i < ${collName}.size(); i++)
{
((${tblFK.JavaName}) ${collName}.get(i))
- .set${colFK.JavaName}(v);
+ .${colFK.SetterName}(v);
}
}
#end
@@ -280,14 +280,14 @@
#end
#set ($coldefval = "0")
#set ($coldefval = $column.DefaultValue)
- set${column.JavaName}($casttype $coldefval);
+ ${column.SetterName}($casttype $coldefval);
#else
- set${column.JavaName}(($column.JavaNative) null);
+ ${column.SetterName}(($column.JavaNative) null);
#end
}
else
{
- set${column.JavaName}(v.get${colFK.JavaName}());
+ ${column.SetterName}(v.${colFK.GetterName}());
}
#end
$varName = v;
@@ -374,35 +374,35 @@
#set ($fktype = $col.JavaNative)
#if ($fktype == "short")
- set${col.JavaName}(((NumberKey) keys[$i]).shortValue());
+ ${col.SetterName}(((NumberKey) keys[$i]).shortValue());
#elseif($fktype == "int")
- set${col.JavaName}(((NumberKey) keys[$i]).intValue());
+ ${col.SetterName}(((NumberKey) keys[$i]).intValue());
#elseif($fktype == "long")
- set${col.JavaName}(((NumberKey) keys[$i]).longValue());
+ ${col.SetterName}(((NumberKey) keys[$i]).longValue());
#elseif($fktype == "BigDecimal")
- set${col.JavaName}(((NumberKey) keys[$i]).getBigDecimal());
+ ${col.SetterName}(((NumberKey) keys[$i]).getBigDecimal());
#elseif($fktype == "byte")
- set${col.JavaName}(((NumberKey) keys[$i]).byteValue());
+ ${col.SetterName}(((NumberKey) keys[$i]).byteValue());
#elseif($fktype == "float")
- set${col.JavaName}(((NumberKey) keys[$i]).floatValue());
+ ${col.SetterName}(((NumberKey) keys[$i]).floatValue());
#elseif($fktype == "double")
- set${col.JavaName}(((NumberKey) keys[$i]).doubleValue());
+ ${col.SetterName}(((NumberKey) keys[$i]).doubleValue());
#elseif($fktype == "Short")
- set${col.JavaName}(new Short(((NumberKey) keys[$i]).shortValue()));
+ ${col.SetterName}(new Short(((NumberKey) keys[$i]).shortValue()));
#elseif($fktype == "Integer")
- set${col.JavaName}(new Integer(((NumberKey) keys[$i]).intValue()));
+ ${col.SetterName}(new Integer(((NumberKey) keys[$i]).intValue()));
#elseif($fktype == "Long")
- set${col.JavaName}(new Long(((NumberKey) keys[$i]).longValue()));
+ ${col.SetterName}(new Long(((NumberKey) keys[$i]).longValue()));
#elseif($fktype == "Byte")
- set${col.JavaName}(new Byte(((NumberKey) keys[$i]).byteValue()));
+ ${col.SetterName}(new Byte(((NumberKey) keys[$i]).byteValue()));
#elseif($fktype == "Float")
- set${col.JavaName}(new Float(((NumberKey) keys[$i]).floatValue()));
+ ${col.SetterName}(new Float(((NumberKey) keys[$i]).floatValue()));
#elseif($fktype == "Double")
- set${col.JavaName}(new Double(((NumberKey) keys[$i]).doubleValue()));
+ ${col.SetterName}(new Double(((NumberKey) keys[$i]).doubleValue()));
#elseif($fktype == "String")
- set${col.JavaName}(keys[$i].toString());
+ ${col.SetterName}(keys[$i].toString());
#elseif($fktype == "Date")
- set${col.JavaName}(((DateKey)keys[$i]).getDate());
+ ${col.SetterName}(((DateKey)keys[$i]).getDate());
#end
#set ( $i = $i + 1 )
#end
@@ -412,35 +412,35 @@
#set ($fktype = $col.JavaNative)
#if ($fktype == "short")
- set${col.JavaName}(((NumberKey) key).shortValue());
+ ${col.SetterName}(((NumberKey) key).shortValue());
#elseif($fktype == "int")
- set${col.JavaName}(((NumberKey) key).intValue());
+ ${col.SetterName}(((NumberKey) key).intValue());
#elseif($fktype == "long")
- set${col.JavaName}(((NumberKey) key).longValue());
+ ${col.SetterName}(((NumberKey) key).longValue());
#elseif($fktype == "BigDecimal")
- set${col.JavaName}(((NumberKey) key).getBigDecimal());
+ ${col.SetterName}(((NumberKey) key).getBigDecimal());
#elseif($fktype == "byte")
- set${col.JavaName}(((NumberKey) key).byteValue());
+ ${col.SetterName}(((NumberKey) key).byteValue());
#elseif($fktype == "float")
- set${col.JavaName}(((NumberKey) key).floatValue());
+ ${col.SetterName}(((NumberKey) key).floatValue());
#elseif($fktype == "double")
- set${col.JavaName}(((NumberKey) key).doubleValue());
+ ${col.SetterName}(((NumberKey) key).doubleValue());
#elseif($fktype == "Short")
- set${col.JavaName}(new Short(((NumberKey) key).shortValue()));
+ ${col.SetterName}(new Short(((NumberKey) key).shortValue()));
#elseif($fktype == "Integer")
- set${col.JavaName}(new Integer(((NumberKey) key).intValue()));
+ ${col.SetterName}(new Integer(((NumberKey) key).intValue()));
#elseif($fktype == "Long")
- set${col.JavaName}(new Long(((NumberKey) key).longValue()));
+ ${col.SetterName}(new Long(((NumberKey) key).longValue()));
#elseif($fktype == "Byte")
- set${col.JavaName}(new Byte(((NumberKey) key).byteValue()));
+ ${col.SetterName}(new Byte(((NumberKey) key).byteValue()));
#elseif($fktype == "Float")
- set${col.JavaName}(new Float(((NumberKey) key).floatValue()));
+ ${col.SetterName}(new Float(((NumberKey) key).floatValue()));
#elseif($fktype == "Double")
- set${col.JavaName}(new Double(((NumberKey) key).doubleValue()));
+ ${col.SetterName}(new Double(((NumberKey) key).doubleValue()));
#elseif($fktype == "String")
- set${col.JavaName}(key.toString());
+ ${col.SetterName}(key.toString());
#elseif($fktype == "Date")
- set${col.JavaName}(((DateKey)key).getDate());
+ ${col.SetterName}(((DateKey)key).getDate());
#end
#end
}
@@ -501,7 +501,7 @@
public void add${relColMs}($className l) throws TorqueException
{
get${relCol}().add(l);
- l.set${table.JavaName}${suffix}(($table.JavaName) this);
+ l.${table.SetterName}${suffix}(($table.JavaName) this);
}
/**
@@ -556,7 +556,7 @@
#set ( $column = $table.getColumn($columnName) )
#set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
#set ( $colFK = $tblFK.getColumn($colFKName) )
- criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, get${column.JavaName}() );
+ criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, ${column.GetterName}() );
#end
$collName = ${className}Peer.doSelect(criteria);
}
@@ -574,7 +574,7 @@
#set ( $column = $table.getColumn($columnName) )
#set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
#set ( $colFK = $tblFK.getColumn($colFKName) )
- criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, get${column.JavaName}());
+ criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, ${column.GetterName}());
#end
#if ($objectIsCaching)
if (!last${relCol}Criteria.equals(criteria))
@@ -640,7 +640,7 @@
#set ( $column = $table.getColumn($columnName) )
#set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
#set ( $colFK = $tblFK.getColumn($colFKName) )
- criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, get${column.JavaName}());
+ criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, ${column.GetterName}());
#end
$collName = ${className}Peer.doSelect(criteria, con);
}
@@ -658,7 +658,7 @@
#set ( $column = $table.getColumn($columnName) )
#set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
#set ( $colFK = $tblFK.getColumn($colFKName) )
- criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, get${column.JavaName}());
+ criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, ${column.GetterName}());
#end
#if ($objectIsCaching)
if (!last${relCol}Criteria.equals(criteria))
@@ -764,7 +764,7 @@
#set ( $column = $table.getColumn($columnName) )
#set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
#set ( $colFK = $tblFK.getColumn($colFKName) )
- criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, get${column.JavaName}());
+ criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, ${column.GetterName}());
#end
$collName = ${className}Peer.doSelectJoin${relCol2}(criteria);
}
@@ -780,7 +780,7 @@
#set ( $column = $table.getColumn($columnName) )
#set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
#set ( $colFK = $tblFK.getColumn($colFKName) )
- criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, get${column.JavaName}());
+ criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, ${column.GetterName}());
#end
#if ($objectIsCaching)
if (!last${relCol}Criteria.equals(criteria))
@@ -831,7 +831,7 @@
#set ( $column = $table.getColumn($columnName) )
#set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
#set ( $colFK = $tblFK.getColumn($colFKName) )
- criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, get${column.JavaName}());
+ criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, ${column.GetterName}());
#end
$collName = ${className}Peer.doSelectJoinAllExcept${table.JavaName}${suffix}(criteria);
}
@@ -847,7 +847,7 @@
#set ( $column = $table.getColumn($columnName) )
#set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
#set ( $colFK = $tblFK.getColumn($colFKName) )
- criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, get${column.JavaName}());
+ criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, ${column.GetterName}());
#end
#if ($objectIsCaching)
if (!last${relCol}Criteria.equals(criteria))
@@ -909,23 +909,23 @@
if (name.equals("${col.JavaName}"))
{
#if ($cjtype == "int")
- return new Integer(get${cfc}());
+ return new Integer(${col.GetterName} ());
#elseif ($cjtype == "long")
- return new Long(get${cfc}());
+ return new Long(${col.GetterName} ());
#elseif ($cjtype == "float")
- return new Float(get${cfc}());
+ return new Float(${col.GetterName} ());
#elseif ($cjtype == "double")
- return new Double(get${cfc}());
+ return new Double(${col.GetterName} ());
#elseif ($cjtype == "boolean")
- return new Boolean(get${cfc}());
+ return new Boolean(${col.GetterName} ());
#elseif ($cjtype == "short")
- return new Short(get${cfc}());
+ return new Short(${col.GetterName} ());
#elseif ($cjtype == "byte")
- return new Byte(get${cfc}());
+ return new Byte(${col.GetterName} ());
#elseif ($cjtype == "char")
- return new Character(get${cfc}());
+ return new Character(${col.GetterName} ());
#else
- return get${cfc}();
+ return ${col.GetterName} ();
#end
}
#end
@@ -949,23 +949,23 @@
if (name.equals(${table.JavaName}Peer.$cup))
{
#if ($cjtype == "int")
- return new Integer(get${cfc}());
+ return new Integer(${col.GetterName} ());
#elseif ($cjtype == "long")
- return new Long(get${cfc}());
+ return new Long(${col.GetterName} ());
#elseif ($cjtype == "float")
- return new Float(get${cfc}());
+ return new Float(${col.GetterName} ());
#elseif ($cjtype == "double")
- return new Double(get${cfc}());
+ return new Double(${col.GetterName} ());
#elseif ($cjtype == "boolean")
- return new Boolean(get${cfc}());
+ return new Boolean(${col.GetterName} ());
#elseif ($cjtype == "short")
- return new Short(get${cfc}());
+ return new Short(${col.GetterName} ());
#elseif ($cjtype == "byte")
- return new Byte(get${cfc}());
+ return new Byte(${col.GetterName} ());
#elseif ($cjtype == "char")
- return new Character(get${cfc}());
+ return new Character(${col.GetterName} ());
#else
- return get${cfc}();
+ return ${col.GetterName} ();
#end
}
#end
@@ -988,23 +988,23 @@
if (pos == $i)
{
#if ($cjtype == "int")
- return new Integer(get${cfc}());
+ return new Integer(${col.GetterName} ());
#elseif ($cjtype == "long")
- return new Long(get${cfc}());
+ return new Long(${col.GetterName} ());
#elseif ($cjtype == "float")
- return new Float(get${cfc}());
+ return new Float(${col.GetterName} ());
#elseif ($cjtype == "double")
- return new Double(get${cfc}());
+ return new Double(${col.GetterName} ());
#elseif ($cjtype == "boolean")
- return new Boolean(get${cfc}());
+ return new Boolean(${col.GetterName} ());
#elseif ($cjtype == "short")
- return new Short(get${cfc}());
+ return new Short(${col.GetterName} ());
#elseif ($cjtype == "byte")
- return new Byte(get${cfc}());
+ return new Byte(${col.GetterName} ());
#elseif ($cjtype == "char")
- return new Character(get${cfc}());
+ return new Character(${col.GetterName} ());
#else
- return get${cfc}();
+ return ${col.GetterName} ();
#end
}
#set ($i = $i + 1)
@@ -1133,7 +1133,7 @@
if ($aVarName != null)
{
${aVarName}.save(con);
- set$pVars.get($i)($aVarName);
+ set${pVars}.get($i)($aVarName);
}
#end
#end
@@ -1225,37 +1225,37 @@
$throwsClause
{
#if ($cjtype == "short")
- set${col.JavaName}(((NumberKey) key).shortValue());
+ ${col.SetterName}(((NumberKey) key).shortValue());
#elseif($cjtype == "int")
- set${col.JavaName}(((NumberKey) key).intValue());
+ ${col.SetterName}(((NumberKey) key).intValue());
#elseif($cjtype == "long")
- set${col.JavaName}(((NumberKey) key).longValue());
+ ${col.SetterName}(((NumberKey) key).longValue());
#elseif($cjtype == "BigDecimal")
- set${col.JavaName}(((NumberKey) key).getBigDecimal());
+ ${col.SetterName}(((NumberKey) key).getBigDecimal());
#elseif($cjtype == "byte")
- set${col.JavaName}(((NumberKey) key).byteValue());
+ ${col.SetterName}(((NumberKey) key).byteValue());
#elseif($cjtype == "float")
- set${col.JavaName}(((NumberKey) key).floatValue());
+ ${col.SetterName}(((NumberKey) key).floatValue());
#elseif($cjtype == "double")
- set${col.JavaName}(((NumberKey) key).doubleValue());
+ ${col.SetterName}(((NumberKey) key).doubleValue());
#elseif($cjtype == "Short")
- set${col.JavaName}(new Short(((NumberKey) key).shortValue()));
+ ${col.SetterName}(new Short(((NumberKey) key).shortValue()));
#elseif($cjtype == "Integer")
- set${col.JavaName}(new Integer(((NumberKey) key).intValue()));
+ ${col.SetterName}(new Integer(((NumberKey) key).intValue()));
#elseif($cjtype == "Long")
- set${col.JavaName}(new Long(((NumberKey) key).longValue()));
+ ${col.SetterName}(new Long(((NumberKey) key).longValue()));
#elseif($cjtype == "Byte")
- set${col.JavaName}(new Byte(((NumberKey) key).byteValue()));
+ ${col.SetterName}(new Byte(((NumberKey) key).byteValue()));
#elseif($cjtype == "Float")
- set${col.JavaName}(new Float(((NumberKey) key).floatValue()));
+ ${col.SetterName}(new Float(((NumberKey) key).floatValue()));
#elseif($cjtype == "Double")
- set${col.JavaName}(new Double(((NumberKey) key).doubleValue()));
+ ${col.SetterName}(new Double(((NumberKey) key).doubleValue()));
#elseif($cjtype == "String")
- set${col.JavaName}(key.toString());
+ ${col.SetterName}(key.toString());
#elseif($cjtype == "Date")
- set${col.JavaName}(((DateKey) key).getDate());
+ ${col.SetterName}(((DateKey) key).getDate());
#else
- set${col.JavaName}(($cjtype) key);
+ ${col.SetterName}(($cjtype) key);
#end
}
@@ -1267,37 +1267,37 @@
public void setPrimaryKey(String key) $throwsClause
{
#if ($cjtype == "short")
- set${col.JavaName}(Short.parseShort(key));
+ ${col.SetterName}(Short.parseShort(key));
#elseif($cjtype == "int")
- set${col.JavaName}(Integer.parseInt(key));
+ ${col.SetterName}(Integer.parseInt(key));
#elseif($cjtype == "long")
- set${col.JavaName}(Long.parseLong(key));
+ ${col.SetterName}(Long.parseLong(key));
#elseif($cjtype == "BigDecimal")
- set${col.JavaName}(new BigDecimal(key));
+ ${col.SetterName}(new BigDecimal(key));
#elseif($cjtype == "byte")
- set${col.JavaName}(Byte.parseByte(key));
+ ${col.SetterName}(Byte.parseByte(key));
#elseif($cjtype == "float")
- set${col.JavaName}(Float.parseFloat(key));
+ ${col.SetterName}(Float.parseFloat(key));
#elseif($cjtype == "double")
- set${col.JavaName}(Double.parseDouble(key));
+ ${col.SetterName}(Double.parseDouble(key));
#elseif($cjtype == "Short")
- set${col.JavaName}(new Short(key));
+ ${col.SetterName}(new Short(key));
#elseif($cjtype == "Integer")
- set${col.JavaName}(new Integer(key));
+ ${col.SetterName}(new Integer(key));
#elseif($cjtype == "Long")
- set${col.JavaName}(new Long(key));
+ ${col.SetterName}(new Long(key));
#elseif($cjtype == "Byte")
- set${col.JavaName}(new Byte(key));
+ ${col.SetterName}(new Byte(key));
#elseif($cjtype == "Float")
- set${col.JavaName}(new Float(key));
+ ${col.SetterName}(new Float(key));
#elseif($cjtype == "Double")
- set${col.JavaName}(new Double(key));
+ ${col.SetterName}(new Double(key));
#elseif($cjtype == "String")
- set${col.JavaName}(key);
+ ${col.SetterName}(key);
#elseif($cjtype == "Date")
- set${col.JavaName}(new Date(key));
+ ${col.SetterName}(new Date(key));
#else
- set${col.JavaName}(new ${cjtype}(key));
+ ${col.SetterName}(new ${cjtype}(key));
#end
}
@@ -1319,35 +1319,35 @@
#foreach ($pk in $table.PrimaryKey)
#set ($pktype = $pk.JavaNative)
#if ($pktype == "short")
- set${pk.JavaName}(((NumberKey)keys[$i]).shortValue());
+ ${pk.SetterName}(((NumberKey)keys[$i]).shortValue());
#elseif($pktype == "int")
- set${pk.JavaName}(((NumberKey)keys[$i]).intValue());
+ ${pk.SetterName}(((NumberKey)keys[$i]).intValue());
#elseif($pktype == "long")
- set${pk.JavaName}(((NumberKey)keys[$i]).longValue());
+ ${pk.SetterName}(((NumberKey)keys[$i]).longValue());
#elseif($pktype == "BigDecimal")
- set${pk.JavaName}(((NumberKey)keys[$i]).getBigDecimal());
+ ${pk.SetterName}(((NumberKey)keys[$i]).getBigDecimal());
#elseif($pktype == "byte")
- set${pk.JavaName}(((NumberKey)keys[$i]).byteValue());
+ ${pk.SetterName}(((NumberKey)keys[$i]).byteValue());
#elseif($pktype == "float")
- set${pk.JavaName}(((NumberKey)keys[$i]).floatValue());
+ ${pk.SetterName}(((NumberKey)keys[$i]).floatValue());
#elseif($pktype == "double")
- set${pk.JavaName}(((NumberKey)keys[$i]).doubleValue());
+ ${pk.SetterName}(((NumberKey)keys[$i]).doubleValue());
#elseif($pktype == "Short")
- set${pk.JavaName}(new Short(((NumberKey)keys[$i]).shortValue()));
+ ${pk.SetterName}(new Short(((NumberKey)keys[$i]).shortValue()));
#elseif($pktype == "Integer")
- set${pk.JavaName}(new Integer(((NumberKey)keys[$i]).intValue()));
+ ${pk.SetterName}(new Integer(((NumberKey)keys[$i]).intValue()));
#elseif($pktype == "Long")
- set${pk.JavaName}(new Long(((NumberKey)keys[$i]).longValue()));
+ ${pk.SetterName}(new Long(((NumberKey)keys[$i]).longValue()));
#elseif($pktype == "Byte")
- set${pk.JavaName}(new Byte(((NumberKey)keys[$i]).byteValue()));
+ ${pk.SetterName}(new Byte(((NumberKey)keys[$i]).byteValue()));
#elseif($pktype == "Float")
- set${pk.JavaName}(new Float(((NumberKey)keys[$i]).floatValue()));
+ ${pk.SetterName}(new Float(((NumberKey)keys[$i]).floatValue()));
#elseif($pktype == "Double")
- set${pk.JavaName}(new Double(((NumberKey)keys[$i]).doubleValue()));
+ ${pk.SetterName}(new Double(((NumberKey)keys[$i]).doubleValue()));
#elseif($pktype == "String")
- set${pk.JavaName}(keys[$i].toString());
+ ${pk.SetterName}(keys[$i].toString());
#elseif($pktype == "Date")
- set${pk.JavaName}(((DateKey)keys[$i]).getDate());
+ ${pk.SetterName}(((DateKey)keys[$i]).getDate());
#end
#set ( $i = $i + 1 )
#end
@@ -1366,7 +1366,7 @@
$throwsClause
{
#foreach ($col in $table.PrimaryKey)
- set${col.JavaName}($col.UncapitalisedJavaName);
+ ${col.SetterName}($col.UncapitalisedJavaName);
#end
}
@@ -1386,11 +1386,11 @@
public ObjectKey getPrimaryKey()
{
#if ($table.PrimaryKey.size() == 1)
- return SimpleKey.keyFor(get${table.PrimaryKey.get(0).JavaName}());
+ return SimpleKey.keyFor(${table.PrimaryKey.get(0).GetterName}());
#elseif ($table.PrimaryKey.size() > 1)
#set ($i = 0)
#foreach ($pk in $table.PrimaryKey)
- pks[$i] = SimpleKey.keyFor(get${pk.JavaName}());
+ pks[$i] = SimpleKey.keyFor(${pk.GetterName}());
#set ($i = $i +1)
#end
return comboPK;
@@ -1449,7 +1449,7 @@
protected $table.JavaName copyInto($table.JavaName copyObj) throws TorqueException
{
#foreach ($col in $table.Columns)
- copyObj.set${col.JavaName}($col.UncapitalisedJavaName);
+ copyObj.${col.SetterName}($col.UncapitalisedJavaName);
#end
#foreach ($col in $table.Columns)
@@ -1464,11 +1464,11 @@
#end
#set ($coldefval = "0")
#set ($coldefval = $col.DefaultValue)
- copyObj.set${col.JavaName}($casttype $coldefval);
+ copyObj.${col.SetterName}($casttype $coldefval);
#else
#set ( $pkid = "null" )
#set ( $cjtype = $col.JavaNative )
- copyObj.set${col.JavaName}((${cjtype})${pkid});
+ copyObj.${col.SetterName}((${cjtype})${pkid});
#end
#end
#end
@@ -1530,7 +1530,7 @@
str.append("$table.JavaName:\n");
#foreach ($col in $table.Columns)
str.append("$col.JavaName = ")
- .append(get${col.JavaName}())
+ .append(${col.GetterName}())
.append("\n");
#end
return(str.toString());
Index: src/templates/om/Peer.vm
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Peer.vm,v
retrieving revision 1.5.2.3
diff -u -r1.5.2.3 Peer.vm
--- src/templates/om/Peer.vm 6 Apr 2004 12:49:46 -0000 1.5.2.3
+++ src/templates/om/Peer.vm 20 Aug 2004 23:45:29 -0000
@@ -371,7 +371,7 @@
{
#set ( $n=0 )
#foreach ($col in $table.Columns)
- obj.set${col.JavaName}(row.getValue(offset + $n).$col.VillageMethod);
+ obj.${col.SetterName}(row.getValue(offset + $n).$col.VillageMethod);
#set ( $n = $n + 1 )
#end
}
@@ -932,7 +932,7 @@
#if ($col.isPrimaryKey() && !$table.IdMethod.equals("none"))
if (!obj.isNew())
#end
- criteria.add($cup, obj.get${cfc}());
+ criteria.add($cup, obj.${col.GetterName}());
#end
return criteria;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
