Author: tfischer
Date: Wed Sep 3 19:29:47 2014
New Revision: 1622327
URL: http://svn.apache.org/r1622327
Log:
TORQUE-317 generate correct bean code if complexObjectModel is false
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm?rev=1622327&r1=1622326&r2=1622327&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/baseBean.vm
Wed Sep 3 19:29:47 2014
@@ -125,7 +125,7 @@ $torqueGen.mergepoint("fieldDefinitionsR
$torqueGen.mergepoint("gettersSetters")
##
-#if ($torqueGen.option("torque.om.complexObjectModel"))
+#if ($complexObjectModel == "true")
$torqueGen.mergepoint("gettersSettersReferencedObjects")
$torqueGen.mergepoint("gettersSettersReferencingObjects")
#end
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm?rev=1622327&r1=1622326&r2=1622327&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/bean/base/setterMethodEnd.vm
Wed Sep 3 19:29:47 2014
@@ -24,7 +24,7 @@
## The template expects as input a "column" element from the torque schema,
## which was processed by the OMTransformer.
##
-#if ($torqueGen.option("torque.om.complexObjectModel"))
+#if ($complexObjectModel == "true")
##
## set referenced object(s) to null if the id has changed
##
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
