You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tf...@apache.org on 2007/01/28 19:52:43 UTC
svn commit: r500854 - in /db/torque/templates/trunk/src/templates/om:
Control.vm ControlBase.vm
Author: tfischer
Date: Sun Jan 28 10:52:43 2007
New Revision: 500854
URL: http://svn.apache.org/viewvc?view=rev&rev=500854
Log:
Fixed problems in commit 499556 (different output directories for base and non-base classes possible) regarding managers
- the manager classes are now in the correct file
- the Non-Base-Manager classes are not generated twice (they were generated once in the base dir and once in the non-base dir)
Modified:
db/torque/templates/trunk/src/templates/om/Control.vm
db/torque/templates/trunk/src/templates/om/ControlBase.vm
Modified: db/torque/templates/trunk/src/templates/om/Control.vm
URL: http://svn.apache.org/viewvc/db/torque/templates/trunk/src/templates/om/Control.vm?view=diff&rev=500854&r1=500853&r2=500854
==============================================================================
--- db/torque/templates/trunk/src/templates/om/Control.vm (original)
+++ db/torque/templates/trunk/src/templates/om/Control.vm Sun Jan 28 10:52:43 2007
@@ -114,9 +114,9 @@
#set ( $firstcap=$tbl.JavaName )
#if ($useManagers && $tbl.PrimaryKey.size() > 0)
- #set ($interfaceName = $table.JavaName)
- #if ($table.Interface)
- #set ($interfaceName = $table.Interface)
+ #set ($interfaceName = $tbl.JavaName)
+ #if ($tbl.Interface)
+ #set ($interfaceName = $tbl.Interface)
#end
#set ( $fname = "${interfaceName}Manager.java" )
Modified: db/torque/templates/trunk/src/templates/om/ControlBase.vm
URL: http://svn.apache.org/viewvc/db/torque/templates/trunk/src/templates/om/ControlBase.vm?view=diff&rev=500854&r1=500853&r2=500854
==============================================================================
--- db/torque/templates/trunk/src/templates/om/ControlBase.vm (original)
+++ db/torque/templates/trunk/src/templates/om/ControlBase.vm Sun Jan 28 10:52:43 2007
@@ -140,20 +140,14 @@
#end
#if ($useManagers && $tbl.PrimaryKey.size() > 0)
- #set ($interfaceName = $table.JavaName)
- #if ($table.Interface)
- #set ($interfaceName = $table.Interface)
+ #set ($interfaceName = $tbl.JavaName)
+ #if ($tbl.Interface)
+ #set ($interfaceName = $tbl.Interface)
#end
#set ( $fname = "${basePrefix}${interfaceName}Manager.java" )
#set ( $path = "${strings.getPackageAsPath($packageBaseManager)}$fname" )
$generator.parse("om/BaseManager.vm",$path,"table",$tbl)
-
- #set ( $fname = "${interfaceName}Manager.java" )
- #set ( $path = "${strings.getPackageAsPath($packageManager)}$fname" )
- #if (!$files.file($basePath,$path).exists())
- $generator.parse("om/ExtensionManager.vm",$path,"table",$tbl)
- #end
#end
#if ($useManagers)
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org