db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1333972 - in /db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates: bean/base/baseBean.vm dbObject/base/bean/objectBeanMethods.vm
Date Fri, 04 May 2012 14:12:56 GMT
Author: tfischer
Date: Fri May  4 14:12:56 2012
New Revision: 1333972

URL: http://svn.apache.org/viewvc?rev=1333972&view=rev
Log:
TORQUE-72: generating getters and setters for beans if complexObjectModel is true but objectIsCaching
is false
Also fix general behavior if complexObjectModel is true but objectIsCaching 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/dbObject/base/bean/objectBeanMethods.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=1333972&r1=1333971&r2=1333972&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
Fri May  4 14:12:56 2012
@@ -79,10 +79,8 @@ $torqueGen.mergepoint("fieldDefinitions"
 ## field definitions for referenced objects
 #if ($torqueGen.booleanOption("torque.om.complexObjectModel"))
 $torqueGen.mergepoint("fieldDefinitionsReferencedObjects")
-#end
 ##
 ## field definitions for referencing objects
-#if ($torqueGen.booleanOption("torque.om.complexObjectModel") && $torqueGen.booleanOption("torque.om.objectIsCaching"))
 $torqueGen.mergepoint("fieldDefinitionsReferencingObjects")
 #end
 
@@ -128,9 +126,6 @@ $torqueGen.mergepoint("gettersSetters")
 ##
 #if ($torqueGen.option("torque.om.complexObjectModel"))
 $torqueGen.mergepoint("gettersSettersReferencedObjects")
-#end
-##
-#if ($torqueGen.booleanOption("torque.om.complexObjectModel") && $torqueGen.booleanOption("torque.om.objectIsCaching"))
 $torqueGen.mergepoint("gettersSettersReferencingObjects")
 #end
 }

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm?rev=1333972&r1=1333971&r2=1333972&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/bean/objectBeanMethods.vm
Fri May  4 14:12:56 2012
@@ -62,9 +62,9 @@
         result.${setter}(${getter}());
 #end
 
-#if ($complexObjectModel)
+#if ($complexObjectModel == "true")
   ## foreign references to this Object
-  #if ($objectIsCaching)
+  #if ($objectIsCaching == "true")
     #foreach ($foreignKeyElement in $referencingForeignKeyElements)
       #set ( $foreignTableElement = $foreignKeyElement.getParent() )
       #set ( $foreignTableName = $foreignTableElement.getAttribute("name") )
@@ -168,9 +168,9 @@
         result.${setter}(bean.${getter}());
 #end
 
-#if ($complexObjectModel)
+#if ($complexObjectModel == "true")
   ## foreign references to this Object
-  #if ($objectIsCaching)
+  #if ($objectIsCaching == "true")
     #foreach ($foreignKeyElement in $referencingForeignKeyElements)
       #set ( $foreignTableElement = $foreignKeyElement.getParent() )
       #set ( $foreignTableName = $foreignTableElement.getAttribute("name") )
@@ -225,9 +225,9 @@
         return result;
     }
 
-#if ($complexObjectModel)
+#if ($complexObjectModel == "true")
   ## foreign references to this Object
-  #if ($objectIsCaching)
+  #if ($objectIsCaching == "true")
     #foreach ($foreignKeyElement in $referencingForeignKeyElements)
       #set ( $foreignFieldElement = $foreignKeyElement.getChild("foreign-field") )
       ## if the referencing table is in an external schema, 



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message