mpoeschl 2002/06/13 11:09:15
Modified: src/templates/om ObjectWithManager.vm Object.vm
Log:
patch by Stephen Haberman <[EMAIL PROTECTED]>
I generated with complexObjectModel=false and an error because the
Object.vm/ObjectWithManager.vm still refer to BasePeer.getConnection,
which as far as I can tell, got replaced by Torque.getConnection.
Revision Changes Path
1.10 +1 -1 jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm
Index: ObjectWithManager.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ObjectWithManager.vm 21 May 2002 19:51:45 -0000 1.9
+++ ObjectWithManager.vm 13 Jun 2002 18:09:15 -0000 1.10
@@ -832,7 +832,7 @@
{
try
{
- con = BasePeer.getConnection( dbName );
+ con = Torque.getConnection( dbName );
if (isNew())
{
${table.JavaName}Peer
1.32 +9 -3 jakarta-turbine-torque/src/templates/om/Object.vm
Index: Object.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/Object.vm,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Object.vm 28 May 2002 01:00:16 -0000 1.31
+++ Object.vm 13 Jun 2002 18:09:15 -0000 1.32
@@ -183,7 +183,7 @@
{
for (int i = 0; i < ${collName}.size(); i++)
{
- ((${tblFK.JavaName})${collName}.get(i))
+ ((${tblFK.JavaName}) ${collName}.get(i))
.set${colFK.JavaName}(v);
}
}
@@ -241,6 +241,7 @@
* Declares an association between this object and a $className object
*
* @param v $className
+ * @throws TorqueException
*/
public void set${pVarName}($className v) throws TorqueException
{
@@ -375,11 +376,12 @@
* through the $className foreign key attribute
*
* @param l $className
+ * @throws TorqueException
*/
public void add${relColMs}($className l) throws TorqueException
{
get${relCol}().add(l);
- l.set${table.JavaName}${suffix}(($table.JavaName)this);
+ l.set${table.JavaName}${suffix}(($table.JavaName) this);
}
/**
@@ -391,6 +393,8 @@
* If this collection has already been initialized, returns
* the collection. Otherwise returns the results of
* get${relCol}(new Criteria())
+ *
+ * @throws TorqueException
*/
public List get${relCol}() throws TorqueException
{
@@ -409,6 +413,8 @@
* If this $table.JavaName is new, it will return
* an empty collection or the current collection, the criteria
* is ignored on a new object.
+ *
+ * @throws TorqueException
*/
public List get${relCol}(Criteria criteria) throws TorqueException
{
@@ -822,7 +828,7 @@
{
try
{
- con = BasePeer.getConnection(dbName);
+ con = Torque.getConnection(dbName);
if (isNew())
{
${table.JavaName}Peer
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
