You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2001/03/27 19:32:05 UTC
cvs commit: jakarta-turbine/conf/torque/templates/om Object.vm Peer.vm
jmcnally 01/03/27 09:32:05
Modified: conf/torque/templates/om Object.vm Peer.vm
Log:
Object.vm was missing an object model conditional
Peer.vm needs to have all references to methods be forward references to
${table.JavaName}Peer, to allow one level of "overridability". Fixed for
references to row2Object.
Revision Changes Path
1.46 +6 -3 jakarta-turbine/conf/torque/templates/om/Object.vm
Index: Object.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/torque/templates/om/Object.vm,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Object.vm 2001/03/27 03:29:20 1.45
+++ Object.vm 2001/03/27 17:32:04 1.46
@@ -1040,8 +1040,10 @@
copyObj.set${col.JavaName}($col.Name.toLowerCase());
#end
-#set ( $list = "List " )
-#foreach ($fk in $table.Referrers)
+#if ($complexObjectModel)
+
+ #set ( $list = "List " )
+ #foreach ($fk in $table.Referrers)
#set ( $tblFK = $fk.Table )
#if ( !($tblFK.Name.equals($table.Name)) )
#set ( $className = $tblFK.JavaName )
@@ -1066,7 +1068,8 @@
}
#set ( $list = "" )
#end
-#end
+ #end
+#end
#foreach ($col in $table.Columns)
#if ($col.isPrimaryKey())
1.46 +11 -6 jakarta-turbine/conf/torque/templates/om/Peer.vm
Index: Peer.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/torque/templates/om/Peer.vm,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Peer.vm 2001/03/25 23:08:54 1.45
+++ Peer.vm 2001/03/27 17:32:04 1.46
@@ -419,10 +419,11 @@
{
Record row = (Record)records.elementAt(i);
#if ($table.ChildrenColumn)
- results.add(row2Object(row, 1,
+ results.add(${table.JavaName}Peer.row2Object(row, 1,
${table.JavaName}Peer.getOMClass(row, 1)));
#else
- results.add(row2Object( row,1, CLASS_DEFAULT ));
+ results.add(${table.JavaName}Peer
+ .row2Object( row,1, CLASS_DEFAULT ));
#end
}
return results;
@@ -934,9 +935,11 @@
#set ($col = $table.ChildrenColumn)
$classDecl omClass = ${table.JavaName}Peer.getOMClass(row, 1);
#set ($classDecl = "")
- $className obj1 = row2Object( row, 1, omClass);
+ $className obj1 = ${table.JavaName}Peer
+ .row2Object( row, 1, omClass);
#else
- $className obj1 = row2Object( row,1, CLASS_DEFAULT );
+ $className obj1 = ${table.JavaName}Peer
+ .row2Object( row,1, CLASS_DEFAULT );
#end
@@ -1086,9 +1089,11 @@
#set ($col = $table.ChildrenColumn)
$classDecl omClass = ${table.JavaName}Peer.getOMClass(row, 1);
#set ($classDecl = "")
- $className obj1 = row2Object( row, 1, omClass);
+ $className obj1 = ${table.JavaName}Peer
+ .row2Object( row, 1, omClass);
#else
- $className obj1 = row2Object( row,1, CLASS_DEFAULT );
+ $className obj1 = ${table.JavaName}Peer
+ .row2Object( row,1, CLASS_DEFAULT );
#end
#set ( $index = 1 )
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org