Author: tfischer
Date: Sat Sep 6 18:29:41 2014
New Revision: 1622902
URL: http://svn.apache.org/r1622902
Log:
TORQUE-317 revert the change to using getBoolenOption() for useManagers
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/saveMethods.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/tableConstantInit.vm
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm?rev=1622902&r1=1622901&r2=1622902&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/baseDbObject.vm
Sat Sep 6 18:29:41 2014
@@ -107,7 +107,7 @@ $torqueGen.mergepoint("tableMapGetter")
#if ($torqueGen.booleanOption("torque.om.generateBeans"))
$torqueGen.mergepoint("objectBeanMethods")
#end
-#if ($torqueGen.booleanOption("torque.om.useManagers"))
+#if (${useManagers} == "true")
$torqueGen.mergepoint("isCacheOnSave")
#end
$torqueGen.mergepoint("getCurrentDate")##
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm?rev=1622902&r1=1622901&r2=1622902&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/getterReferencedObject.vm
Sat Sep 6 18:29:41 2014
@@ -51,13 +51,13 @@
#set ( $conditional =
"$conditional${and}!org.apache.commons.lang.ObjectUtils.equals(this.${localColumnField},
null)" )
#end
#if ($arglist != "" )
- #if ($torqueGen.booleanOption("torque.om.useManagers"))
+ #if (${useManagers} == "true")
#set ( $arglist = "${arglist}, SimpleKey.keyFor(this.$localColumnField)"
)
#else
#set ( $arglist = "${arglist}, this.$localColumnField" )
#end
#else
- #if ($torqueGen.booleanOption("torque.om.useManagers"))
+ #if (${useManagers} == "true")
#set ( $arglist = "SimpleKey.keyFor(this.$localColumnField)" )
#else
#set ( $arglist = "this.$localColumnField" )
@@ -86,14 +86,14 @@
if ($field == null$conditional)
{
#if ($argsize > 1)
- #if ($torqueGen.booleanOption("torque.om.useManagers"))
+ #if (${useManagers} == "true")
SimpleKey[] keys = { $arglist };
$field = ${foreignTableManagerClass}.getInstance(new
ComboKey(keys));
#else
$field = ${foreignTablePeerClass}.retrieveByPK($arglist);
#end
#else
- #if ($torqueGen.booleanOption("torque.om.useManagers"))
+ #if (${useManagers} == "true")
$field = ${foreignTableManagerClass}.getInstance($arglist);
#else
$field =
${foreignTablePeerClass}.retrieveByPK(SimpleKey.keyFor($arglist));
@@ -130,7 +130,7 @@
if ($field == null$conditional)
{
#if ($argsize > 1)
- #if ($torqueGen.booleanOption("torque.om.useManagers"))
+ #if (${useManagers} == "true")
SimpleKey[] keys = { $arglist };
ComboKey comboid = new ComboKey(keys);
@@ -144,7 +144,7 @@
$field = ${foreignTablePeerClass}.retrieveByPK($arglist,
connection);
#end
#else
- #if ($torqueGen.booleanOption("torque.om.useManagers"))
+ #if (${useManagers} == "true")
$field = ${foreignTableManagerClass}.getCachedInstance($arglist);
if ($field == null)
{
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/saveMethods.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/saveMethods.vm?rev=1622902&r1=1622901&r2=1622902&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/saveMethods.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/general/saveMethods.vm
Sat Sep 6 18:29:41 2014
@@ -172,7 +172,7 @@
{
${peerClassName}.doUpdate($toSaveVariable, con);
}
-#if ($torqueGen.booleanOption("torque.om.useManagers"))
+#if (${useManagers} == "true")
#set ( $primaryKeyColumnElements =
$torqueGen.getChild("primary-keys").getChildren("column") )
#if ( $primaryKeyColumnElements.size() != 0)
if (isCacheOnSave())
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/tableConstantInit.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/tableConstantInit.vm?rev=1622902&r1=1622901&r2=1622902&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/tableConstantInit.vm
(original)
+++
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/tableConstantInit.vm
Sat Sep 6 18:29:41 2014
@@ -54,7 +54,7 @@
TABLE.setPrimaryKeyMethodInfo(IDMethod.AUTO_INCREMENT, "$name");
#end
#set ( $primaryKeyColumnElements =
$torqueGen.getChild("primary-keys").getChildren("column") )
-#if ($torqueGen.booleanOption("torque.om.useManagers") &&
$primaryKeyColumnElements.size() > 0)
+#if (${useManagers} == "true" && $primaryKeyColumnElements.size() > 0)
TABLE.setUseManager(true);
TABLE.setManagerClass(${managerPackage}.${managerClassName}.class);
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
