dlr 2005/01/06 11:01:35
Modified: src/generator/src/templates/om Object.vm
ObjectWithManager.vm
Log:
Previous commit did not include re-throw of Exception as
TorqueException. Backing out commits to correct in a single change
set.
* src/generator/src/templates/om/Object.vm
Reverting to CVS rev 1.17.
* src/generator/src/templates/om/ObjectWithManager.vm
Reverting to CVS rev 1.12.
Revision Changes Path
1.19 +0 -13 db-torque/src/generator/src/templates/om/Object.vm
Index: Object.vm
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Object.vm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- Object.vm 6 Jan 2005 18:36:47 -0000 1.18
+++ Object.vm 6 Jan 2005 19:01:35 -0000 1.19
@@ -1424,20 +1424,7 @@
public void setQueryKey(String key)
throws TorqueException
{
- ## Work around the fact that BaseObject.setPrimaryKey() declares
- ## that it throws Exception instead of TorqueException.
- #set ($tableHasPrimaryKey = $table.PrimaryKey.size() > 0)
- #if (!$tableHasPrimaryKey)
- try
- {
- #end
setPrimaryKey(key);
- #if (!$tableHasPrimaryKey)
- }
- catch (Exception e)
- {
- }
- #end
}
#end
1.14 +1 -14
db-torque/src/generator/src/templates/om/ObjectWithManager.vm
Index: ObjectWithManager.vm
===================================================================
RCS file:
/home/cvs/db-torque/src/generator/src/templates/om/ObjectWithManager.vm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- ObjectWithManager.vm 6 Jan 2005 18:36:47 -0000 1.13
+++ ObjectWithManager.vm 6 Jan 2005 19:01:35 -0000 1.14
@@ -1110,8 +1110,7 @@
${table.JavaName}Peer.doUpdate(($table.JavaName) this,
con);
}
- #set ($tableHasPrimaryKey = $table.PrimaryKey.size() > 0)
- #if ($tableHasPrimaryKey)
+ #if ($table.PrimaryKey.size() > 0)
#set ($interfaceName = $table.JavaName)
#if ($table.Interface)
#set ($interfaceName = $table.Interface)
@@ -1401,19 +1400,7 @@
public void setQueryKey(String key)
throws TorqueException
{
- ## Work around the fact that BaseObject.setPrimaryKey() declares
- ## that it throws Exception instead of TorqueException.
- #if (!$tableHasPrimaryKey)
- try
- {
- #end
setPrimaryKey(key);
- #if (!$tableHasPrimaryKey)
- }
- catch (Exception e)
- {
- }
- #end
}
#end
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
