Return-Path: Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: (qmail 27919 invoked from network); 19 Aug 2007 13:23:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Aug 2007 13:23:12 -0000 Received: (qmail 38877 invoked by uid 500); 19 Aug 2007 13:23:09 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 38856 invoked by uid 500); 19 Aug 2007 13:23:09 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 38845 invoked by uid 500); 19 Aug 2007 13:23:09 -0000 Received: (qmail 38840 invoked by uid 99); 19 Aug 2007 13:23:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Aug 2007 06:23:09 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Aug 2007 13:23:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 278E41A981A; Sun, 19 Aug 2007 06:22:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r567399 - in /db/torque/templates/trunk/src/templates/om: Object.vm ObjectWithManager.vm Peer.vm Date: Sun, 19 Aug 2007 13:22:47 -0000 To: torque-commits@db.apache.org From: tv@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070819132248.278E41A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tv Date: Sun Aug 19 06:22:47 2007 New Revision: 567399 URL: http://svn.apache.org/viewvc?view=rev&rev=567399 Log: Fix JDK 1.3 compatibility for generated classes Modified: db/torque/templates/trunk/src/templates/om/Object.vm db/torque/templates/trunk/src/templates/om/ObjectWithManager.vm db/torque/templates/trunk/src/templates/om/Peer.vm Modified: db/torque/templates/trunk/src/templates/om/Object.vm URL: http://svn.apache.org/viewvc/db/torque/templates/trunk/src/templates/om/Object.vm?view=diff&rev=567399&r1=567398&r2=567399 ============================================================================== --- db/torque/templates/trunk/src/templates/om/Object.vm (original) +++ db/torque/templates/trunk/src/templates/om/Object.vm Sun Aug 19 06:22:47 2007 @@ -1100,7 +1100,7 @@ #elseif ($cjtype == "double") return new Double(${col.GetterName}()); #elseif ($cjtype == "boolean") - return Boolean.valueOf(${col.GetterName}()); + return new Boolean(${col.GetterName}()); #elseif ($cjtype == "short") return new Short(${col.GetterName}()); #elseif ($cjtype == "byte") @@ -1223,7 +1223,7 @@ #elseif ($cjtype == "double") return new Double(${col.GetterName}()); #elseif ($cjtype == "boolean") - return Boolean.valueOf(${col.GetterName}()); + return new Boolean(${col.GetterName}()); #elseif ($cjtype == "short") return new Short(${col.GetterName}()); #elseif ($cjtype == "byte") @@ -1282,7 +1282,7 @@ #elseif ($cjtype == "double") return new Double(${col.GetterName}()); #elseif ($cjtype == "boolean") - return Boolean.valueOf(${col.GetterName}()); + return new Boolean(${col.GetterName}()); #elseif ($cjtype == "short") return new Short(${col.GetterName}()); #elseif ($cjtype == "byte") Modified: db/torque/templates/trunk/src/templates/om/ObjectWithManager.vm URL: http://svn.apache.org/viewvc/db/torque/templates/trunk/src/templates/om/ObjectWithManager.vm?view=diff&rev=567399&r1=567398&r2=567399 ============================================================================== --- db/torque/templates/trunk/src/templates/om/ObjectWithManager.vm (original) +++ db/torque/templates/trunk/src/templates/om/ObjectWithManager.vm Sun Aug 19 06:22:47 2007 @@ -1117,7 +1117,7 @@ #elseif ($cjtype == "double") return new Double(${col.GetterName}()); #elseif ($cjtype == "boolean") - return Boolean.valueOf(${col.GetterName}()); + return new Boolean(${col.GetterName}()); #elseif ($cjtype == "short") return new Short(${col.GetterName}()); #elseif ($cjtype == "byte") @@ -1240,7 +1240,7 @@ #elseif ($cjtype == "double") return new Double(${col.GetterName}()); #elseif ($cjtype == "boolean") - return Boolean.valueOf(${col.GetterName}()); + return new Boolean(${col.GetterName}()); #elseif ($cjtype == "short") return new Short(${col.GetterName}()); #elseif ($cjtype == "byte") @@ -1299,7 +1299,7 @@ #elseif ($cjtype == "double") return new Double(${col.GetterName}()); #elseif ($cjtype == "boolean") - return Boolean.valueOf(${col.GetterName}()); + return new Boolean(${col.GetterName}()); #elseif ($cjtype == "short") return new Short(${col.GetterName}()); #elseif ($cjtype == "byte") Modified: db/torque/templates/trunk/src/templates/om/Peer.vm URL: http://svn.apache.org/viewvc/db/torque/templates/trunk/src/templates/om/Peer.vm?view=diff&rev=567399&r1=567398&r2=567399 ============================================================================== --- db/torque/templates/trunk/src/templates/om/Peer.vm (original) +++ db/torque/templates/trunk/src/templates/om/Peer.vm Sun Aug 19 06:22:47 2007 @@ -29,6 +29,7 @@ import org.apache.torque.TooManyRowsException; import org.apache.torque.Torque; import org.apache.torque.TorqueException; +import org.apache.torque.TorqueRuntimeException; import org.apache.torque.map.MapBuilder; import org.apache.torque.map.TableMap; import org.apache.torque.om.DateKey; @@ -133,7 +134,7 @@ catch (TorqueException e) { log.error("Could not initialize Peer", e); - throw new RuntimeException(e); + throw new TorqueRuntimeException(e); } } else --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org