jmcnally 02/03/10 21:21:04
Modified: src/templates/om ObjectWithManager.vm
Log:
keeping a local reference in the case the related object is new and does not
have an id yet.
Revision Changes Path
1.2 +31 -0 jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm
Index: ObjectWithManager.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectWithManager.vm 8 Mar 2002 23:16:51 -0000 1.1
+++ ObjectWithManager.vm 11 Mar 2002 05:21:04 -0000 1.2
@@ -153,6 +153,21 @@
#end
#if ($complexObjectModel)
+ #if ($col.isForeignKey())
+ #set ( $tblFK = $table.Database.getTable($col.RelatedTableName) )
+ #set ( $colFK = $tblFK.getColumn($col.RelatedColumnName) )
+ #if ($col.isMultipleFK() || $col.RelatedTableName.equals($table.Name))
+ #set ( $varName = "a${tblFK.JavaName}RelatedBy$col.JavaName" )
+ #else
+ #set ( $varName = "a$tblFK.JavaName" )
+ #end
+
+ if ($varName != null && !Objects.equals(${varName}.get${colFK.JavaName}(),
v) )
+ {
+ $varName = null;
+ }
+ #end
+
#foreach ($fk in $col.Referrers)
#set ( $fkColName = $fk.ForeignLocalMapping.get($col.Name) )
#set ( $tblFK = $fk.Table )
@@ -215,6 +230,8 @@
#set ( $relCol = "RelatedBy$relCol" )
#end
#set ( $pVarName = "$className$relCol" )
+ #set ( $varName = "a$pVarName" )
+ private $className $varName;
/**
* Declares an association between this object and a $className object
@@ -229,13 +246,23 @@
#set ( $colFK = $tblFK.getColumn($colFKName) )
set${column.JavaName}(v.get${colFK.JavaName}());
#end
+ $varName = v;
}
+ #set ( $and = "" )
#set ( $comma = "" )
+ #set ( $conditional = "" )
#set ( $arglist = "" )
#set ( $argsize = 0 )
#foreach ($columnName in $fk.LocalColumns)
#set ( $column = $table.getColumn($columnName) )
+ #set ( $cjtype = $column.JavaNative )
+ #set ( $clo=$column.Name.toLowerCase() )
+ #if ($cjtype == "short" || $cjtype == "int" || $cjtype == "long")
+ #set ( $conditional = "$conditional${and}get${column.JavaName}()>0" )
+ #else
+ #set ( $conditional =
"$conditional${and}!Objects.equals(get${column.JavaName}(), null)" )
+ #end
#set ( $arglist = "$arglist${comma}get${column.JavaName}()" )
#set ( $and = " && " )
#set ( $comma = ", " )
@@ -244,6 +271,8 @@
public $className get${pVarName}() throws TorqueException
{
+ if ( $conditional )
+ {
#if ($tblFK.isAlias())
## Leaving this as is for now, though it should probably be
## changed to use the Manager like the else clause does.
@@ -256,6 +285,8 @@
return ${className}Manager.getInstance($arglist);
#end
#end
+ }
+ return $varName;
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
