db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r239636 [1/4] - in /db/torque/runtime/trunk: ./ conf/ src/conf/ src/java/org/apache/torque/ src/java/org/apache/torque/adapter/ src/java/org/apache/torque/avalon/ src/java/org/apache/torque/dsfactory/ src/java/org/apache/torque/manager/ src...
Date Wed, 24 Aug 2005 12:38:54 GMT
Author: henning
Date: Wed Aug 24 05:38:09 2005
New Revision: 239636

URL: http://svn.apache.org/viewcvs?rev=239636&view=rev
Log:
Removed trailing blanks


Modified:
    db/torque/runtime/trunk/build-test.xml
    db/torque/runtime/trunk/conf/driver-adapter-map.xml
    db/torque/runtime/trunk/maven.xml
    db/torque/runtime/trunk/project.xml
    db/torque/runtime/trunk/src/conf/Torque.properties
    db/torque/runtime/trunk/src/java/org/apache/torque/Torque.java
    db/torque/runtime/trunk/src/java/org/apache/torque/TorqueInstance.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DB.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMM.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOracle.java
    db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBPostgres.java
    db/torque/runtime/trunk/src/java/org/apache/torque/avalon/TorqueComponent.java
    db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/DataSourceFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java
    db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java
    db/torque/runtime/trunk/src/java/org/apache/torque/manager/CacheListener.java
    db/torque/runtime/trunk/src/java/org/apache/torque/om/SimpleKey.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/BasePeer.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/CountHelper.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/JoinBuilder.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/LimitHelper.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/Query.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/SQLBuilder.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlEnum.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlExpression.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/Transaction.java
    db/torque/runtime/trunk/src/java/org/apache/torque/util/VillageUtils.java
    db/torque/runtime/trunk/src/rttest/bookstore-schema.xml
    db/torque/runtime/trunk/src/rttest/id-table-schema.xml
    db/torque/runtime/trunk/src/rttest/org/apache/torque/BeanTest.java
    db/torque/runtime/trunk/src/rttest/org/apache/torque/DataTest.java
    db/torque/runtime/trunk/src/rttest/org/apache/torque/DocsTest.java
    db/torque/runtime/trunk/src/rttest/org/apache/torque/util/CopyTest.java
    db/torque/runtime/trunk/src/rttest/schema.sql
    db/torque/runtime/trunk/src/rttest/test-schema.xml
    db/torque/runtime/trunk/src/sqltest/type-test-schema.xml
    db/torque/runtime/trunk/src/test/TurbineResources.properties
    db/torque/runtime/trunk/src/test/org/apache/torque/BaseTestCase.java
    db/torque/runtime/trunk/src/test/org/apache/torque/om/ComboKeyTest.java
    db/torque/runtime/trunk/src/test/org/apache/torque/om/NumberKeyTest.java
    db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java
    db/torque/runtime/trunk/xdocs/beans-howto.xml
    db/torque/runtime/trunk/xdocs/changes.xml
    db/torque/runtime/trunk/xdocs/configuration-howto.xml
    db/torque/runtime/trunk/xdocs/criteria-howto.xml
    db/torque/runtime/trunk/xdocs/database-layout-howto.xml
    db/torque/runtime/trunk/xdocs/developer-guide.xml
    db/torque/runtime/trunk/xdocs/download.xml
    db/torque/runtime/trunk/xdocs/index.xml
    db/torque/runtime/trunk/xdocs/jar-guide.xml
    db/torque/runtime/trunk/xdocs/managers-cache.xml
    db/torque/runtime/trunk/xdocs/maven-howto.xml
    db/torque/runtime/trunk/xdocs/mssql-howto.xml
    db/torque/runtime/trunk/xdocs/oracle-howto.xml
    db/torque/runtime/trunk/xdocs/peers-howto.xml
    db/torque/runtime/trunk/xdocs/postgres-howto.xml
    db/torque/runtime/trunk/xdocs/references.xml
    db/torque/runtime/trunk/xdocs/release-changes.xml
    db/torque/runtime/trunk/xdocs/schema-howto.xml
    db/torque/runtime/trunk/xdocs/status.xml
    db/torque/runtime/trunk/xdocs/sybase-howto.xml
    db/torque/runtime/trunk/xdocs/tutorial/index.xml
    db/torque/runtime/trunk/xdocs/tutorial/step1.xml
    db/torque/runtime/trunk/xdocs/tutorial/step2.xml
    db/torque/runtime/trunk/xdocs/tutorial/step3.xml
    db/torque/runtime/trunk/xdocs/tutorial/step4.xml
    db/torque/runtime/trunk/xdocs/tutorial/step6.xml
    db/torque/runtime/trunk/xdocs/user-guide.xml

Modified: db/torque/runtime/trunk/build-test.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/build-test.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/build-test.xml (original)
+++ db/torque/runtime/trunk/build-test.xml Wed Aug 24 05:38:09 2005
@@ -49,7 +49,7 @@
     <property name="templatePath" value="no_templatePath"/>
     <antcall target="test"/>
   </target>
-  
+
   <target
     name="test-ojb"
     description="run the testbed using ojb">
@@ -245,7 +245,7 @@
       target="ojb">
     </ant>
   </target>
-  
+
   <target
     name="test-ojb-compile">
     <mkdir dir="${torque.distDir}/bin/ojb"/>
@@ -258,9 +258,9 @@
       srcdir="${torque.distDir}/src/ojb">
       <classpath refid="classpath"/>
     </javac>
-    
+
   </target>
-  
+
 
   <!-- ============================================================== -->
   <!-- R U N T I M E  T E S T S                                       -->

Modified: db/torque/runtime/trunk/conf/driver-adapter-map.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/conf/driver-adapter-map.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/conf/driver-adapter-map.xml (original)
+++ db/torque/runtime/trunk/conf/driver-adapter-map.xml Wed Aug 24 05:38:09 2005
@@ -14,88 +14,88 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<driverAdapterMap>  
-  <entries>  
-    
-    <entry>  
+<driverAdapterMap>
+  <entries>
+
+    <entry>
       <key>com.ibm.as400.access.AS400JDBCDriver</key>
       <value>DBDB2400</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>COM.ibm.db2.jdbc.app.DB2Driver</key>
       <value>DBDB2App</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>COM.ibm.db2.jdbc.net.DB2Driver</key>
       <value>DBDB2Net</value>
-    </entry>  
+    </entry>
 
-    <entry>  
+    <entry>
       <key>COM.cloudscape.core.JDBCDriver</key>
       <value>DBCloudscape</value>
-    </entry>  
-   
-    <entry>  
+    </entry>
+
+    <entry>
       <key>org.hsql.jdbcDriver</key>
       <value>DBHypersonicSQL</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>org.hsqldb.jdbcDriver</key>
       <value>DBHypersonicSQL</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>interbase.interclient.Driver</key>
       <value>DBInterbase</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>org.enhydra.instantdb.jdbc.idbDriver</key>
       <value>DBInstantDB</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>com.microsoft.jdbc.sqlserver.SQLServerDriver</key>
       <value>DBMSSQL</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>org.gjt.mm.mysql.Driver</key>
       <value>DBMM</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>oracle.jdbc.driver.OracleDriver</key>
       <value>DBOracle</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>org.postgresql.Driver</key>
       <value>DBPostgres</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>com.sap.dbtech.jdbc.DriverSapDB</key>
       <value>DBSapDB</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>com.sybase.jdbc.SybDriver</key>
       <value>DBSybase</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>com.sybase.jdbc2.jdbc.SybDriver</key>
       <value>DBSybase</value>
-    </entry>  
-  
-    <entry>  
+    </entry>
+
+    <entry>
       <key>weblogic.jdbc.pool.Driver</key>
       <value>DBWeblogic</value>
-    </entry>  
-  
+    </entry>
+
   </entries>
-</driverAdapterMap>  
+</driverAdapterMap>

Modified: db/torque/runtime/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/maven.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/maven.xml (original)
+++ db/torque/runtime/trunk/maven.xml Wed Aug 24 05:38:09 2005
@@ -67,7 +67,7 @@
   <!-- ================================================================== -->
   <!-- includes common files                                              -->
   <!-- This is necessary as long as maven does not resolves the extends   -->
-  <!-- property of the pom upon generation of the source distribution     -->                                           
+  <!-- property of the pom upon generation of the source distribution     -->
   <!-- ================================================================== -->
   <preGoal name="dist:build-src">
       <copy todir="${maven.dist.src.assembly.dir}/common">
@@ -75,7 +75,7 @@
         <include name="project.xml"/>
         <include name="project.properties"/>
       </fileset>
-    </copy>  
+    </copy>
   </preGoal>
 
   <!-- ================================================================== -->
@@ -150,7 +150,7 @@
 | Runtime Test Configuration Error                                       |
 --------------------------------------------------------------------------
 
- For executing the runtime tests, you must set the property 
+ For executing the runtime tests, you must set the property
  'torque.testProfile' by defining it on the command line of your
  maven command or putting it into the build.properties file.
 
@@ -254,11 +254,11 @@
       overwrite="yes"
     />
   </goal>
-  
+
   <!-- ================================================================== -->
   <!-- O J B   R U N T I M E T E S T                                      -->
   <!-- ================================================================== -->
-  
+
   <goal
     name="runtime:test-ojb"
     prereqs="runtime:prepare-ojb"
@@ -268,7 +268,7 @@
          target="test-ojb"
          inheritAll="false"/>
   </goal>
-  
+
   <goal
     name="runtime:prepare-ojb"
     prereqs="jar:jar">
@@ -333,5 +333,5 @@
     <copy file="${ojb.jar}" todir="${test.ojb.distDir}/lib"/>
     <copy file="${commons-collections}" todir="${test.ojb.distDir}/lib"/>
   </goal>
-  
+
 </project>

Modified: db/torque/runtime/trunk/project.xml
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/project.xml?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/project.xml (original)
+++ db/torque/runtime/trunk/project.xml Wed Aug 24 05:38:09 2005
@@ -213,5 +213,5 @@
     <defaultGoal>jar:jar</defaultGoal>
     <resources/>
   </build>
-  
+
 </project>

Modified: db/torque/runtime/trunk/src/conf/Torque.properties
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/conf/Torque.properties?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/conf/Torque.properties (original)
+++ db/torque/runtime/trunk/src/conf/Torque.properties Wed Aug 24 05:38:09 2005
@@ -61,8 +61,8 @@
 # Time to wait for a connection to the database in milliseconds.
 torque.defaults.pool.maxWait = 10000
 
-# Maximum number of idle and active connections cached in a database 
-# definition. 
+# Maximum number of idle and active connections cached in a database
+# definition.
 # Note that, if you have multiple database definitions which access the
 # same database URL, they don't share the connections but you have
 # multiple pools and each has this maximum number. So if you have a
@@ -71,7 +71,7 @@
 torque.defaults.pool.maxIdle = 8
 torque.defaults.pool.maxActive = 10
 
-# How often the pool is checked for connection which stayed in the pool 
+# How often the pool is checked for connection which stayed in the pool
 # for too long. Defaults to 5 minutes (5 * 60 * 1000)
 # remove property if the idle object evictor should not be run
 torque.defaults.pool.timeBetweenEvictionRunsMillis= 300000
@@ -105,7 +105,7 @@
 torque.database.default=bookstore
 torque.database.bookstore.adapter=mysql
 
-# # Using commons-dbcp 
+# # Using commons-dbcp
 torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory
 # torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.PerUserPoolDataSourceFactory
 torque.dsfactory.bookstore.pool.maxIdle=8

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/Torque.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/Torque.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/Torque.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/Torque.java Wed Aug 24 05:38:09 2005
@@ -57,10 +57,10 @@
 
     /**
      * Name of property that specifies the default map builder and map.
-     * @deprecated is not used any more. Use DATABASE_KEY and 
+     * @deprecated is not used any more. Use DATABASE_KEY and
      *             DEFAULT_KEY instead
      */
-    public static final String DATABASE_DEFAULT 
+    public static final String DATABASE_DEFAULT
             = DATABASE_KEY + "." + DEFAULT_KEY;
 
     /**
@@ -196,8 +196,8 @@
      * This method halts the IDBroker's daemon thread in all of
      * the DatabaseMap's. It also closes all SharedPoolDataSourceFactories
      * and PerUserPoolDataSourceFactories initialized by Torque.
-     * @exception TorqueException if a DataSourceFactory could not be closed 
-     *            cleanly. Only the first exception is rethrown, any following 
+     * @exception TorqueException if a DataSourceFactory could not be closed
+     *            cleanly. Only the first exception is rethrown, any following
      *            exceptions are logged but ignored.
      */
     public static void shutdown()

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/TorqueInstance.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/TorqueInstance.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/TorqueInstance.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/TorqueInstance.java Wed Aug 24 05:38:09 2005
@@ -136,7 +136,7 @@
         if (subConf == null || subConf.isEmpty())
         {
             String error = ("Invalid configuration. No keys starting with "
-                    + Torque.TORQUE_KEY 
+                    + Torque.TORQUE_KEY
                     + " found in configuration");
             log.error(error);
             throw new TorqueException(error);
@@ -161,11 +161,11 @@
 
         isInit = true;
     }
-    
-    
+
+
     /**
      * initializes the name of the default database
-     * @param conf the configuration representing the torque section 
+     * @param conf the configuration representing the torque section
      *        of the properties file
      * @throws TorqueException if the appropriate key is not set
      */
@@ -175,7 +175,7 @@
         // Determine default database name.
         defaultDBName =
                 conf.getString(
-                        Torque.DATABASE_KEY 
+                        Torque.DATABASE_KEY
                         + "."
                         + Torque.DEFAULT_KEY);
         if (defaultDBName == null)
@@ -183,7 +183,7 @@
             String error = "Invalid configuration: Key "
                     + Torque.TORQUE_KEY
                     + "."
-                    + Torque.DATABASE_KEY 
+                    + Torque.DATABASE_KEY
                     + "."
                     + Torque.DEFAULT_KEY
                     + " not set";
@@ -217,7 +217,7 @@
             log.error(error);
             throw new TorqueException(error);
         }
-        
+
         try
         {
             for (Iterator it = c.getKeys(); it.hasNext(); )
@@ -240,7 +240,7 @@
                       + "adapters", e);
             throw new TorqueException(e);
         }
-        
+
         if (adapterMap.get(Torque.getDefaultDB()) == null)
         {
             String error = "Invalid configuration : "
@@ -269,7 +269,7 @@
     {
         log.debug("initDataSourceFactories(" + conf + ")");
         dsFactoryMap = new HashMap();
-        
+
         Configuration c = conf.subset(DataSourceFactory.DSFACTORY_KEY);
         if (c == null || c.isEmpty())
         {
@@ -545,11 +545,11 @@
      * This method halts the IDBroker's daemon thread in all of
      * the DatabaseMap's. It also closes all SharedPoolDataSourceFactories
      * and PerUserPoolDataSourceFactories initialized by Torque.
-     * @exception TorqueException if a DataSourceFactory could not be closed 
-     *            cleanly. Only the first exception is rethrown, any following 
+     * @exception TorqueException if a DataSourceFactory could not be closed
+     *            cleanly. Only the first exception is rethrown, any following
      *            exceptions are logged but ignored.
      */
-    public synchronized void shutdown() 
+    public synchronized void shutdown()
         throws TorqueException
     {
         if (dbMaps != null)
@@ -568,9 +568,9 @@
         for (Iterator it = dsFactoryMap.keySet().iterator(); it.hasNext();)
         {
             Object dsfKey = it.next();
-            DataSourceFactory dsf 
+            DataSourceFactory dsf
                     = (DataSourceFactory) dsFactoryMap.get(dsfKey);
-            try 
+            try
             {
                 dsf.close();
                 it.remove();
@@ -578,7 +578,7 @@
             catch (TorqueException e)
             {
                 log.error("Error while closing the DataSourceFactory "
-                        + dsfKey, 
+                        + dsfKey,
                         e);
                 if (exception == null)
                 {
@@ -782,7 +782,7 @@
     }
 
     /**
-     * Returns a DataSourceFactory 
+     * Returns a DataSourceFactory
      *
      * @param name Name of the DSF to get
      * @return A DataSourceFactory object
@@ -790,9 +790,9 @@
     protected DataSourceFactory getDataSourceFactory(String name)
             throws TorqueException
     {
-    	if (!isInit()) 
+    	if (!isInit())
     	{
-            throw new TorqueException("Torque is not initialized.");    		
+            throw new TorqueException("Torque is not initialized.");
     	}
 
     	DataSourceFactory dsf = null;
@@ -805,7 +805,7 @@
         {
             throw new TorqueException(e);
         }
-            
+
         if (dsf == null)
         {
             throw new NullPointerException(

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DB.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DB.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DB.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DB.java Wed Aug 24 05:38:09 2005
@@ -74,7 +74,7 @@
     public static final int LIMIT_STYLE_DB2 = 5;
 
 	/**
-	 * Key for the configuration which contains database adapters 
+	 * Key for the configuration which contains database adapters
 	 */
 	public static final String ADAPTER_KEY = "adapter";
 

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMM.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMM.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMM.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBMM.java Wed Aug 24 05:38:09 2005
@@ -40,7 +40,7 @@
  */
 public class DBMM extends DB
 {
-    
+
     /** A specialized date format for MySQL. */
     private static final String DATE_FORMAT = "yyyyMMddHHmmss";
 

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOracle.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOracle.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOracle.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBOracle.java Wed Aug 24 05:38:09 2005
@@ -71,7 +71,7 @@
      * @param date the Date to format
      * @return The date formatted String for Oracle.
      */
-    public String getDateString(Date date) 
+    public String getDateString(Date date)
     {
         return "TO_DATE('" + new SimpleDateFormat(DATE_FORMAT).format(date)
                 + "', 'DD-MM-YYYY HH24:MI:SS')";

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBPostgres.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBPostgres.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBPostgres.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/adapter/DBPostgres.java Wed Aug 24 05:38:09 2005
@@ -157,9 +157,9 @@
 
     /**
      * This method overrides the JDBC escapes used to format dates
-     * using a <code>DateFormat</code>. 
+     * using a <code>DateFormat</code>.
      *
-     * This generates the timedate format defined in 
+     * This generates the timedate format defined in
      * http://www.postgresql.org/docs/7.3/static/datatype-datetime.html
      * which defined PostgreSQL dates as YYYY-MM-DD hh:mm:ss
      * @param date the date to format

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/avalon/TorqueComponent.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/avalon/TorqueComponent.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/avalon/TorqueComponent.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/avalon/TorqueComponent.java Wed Aug 24 05:38:09 2005
@@ -115,7 +115,7 @@
 
         try
         {
-            appRoot = (context == null) 
+            appRoot = (context == null)
                     ? null : (String) context.get("componentAppRoot");
         }
         catch (ContextException ce)
@@ -136,12 +136,12 @@
                 configFile = configFile.substring(1);
                 getLogger().debug("Config File changes to " + configFile);
             }
-            
+
             StringBuffer sb = new StringBuffer();
             sb.append(appRoot);
             sb.append('/');
             sb.append(configFile);
-            
+
             configFile = sb.toString();
         }
 
@@ -183,7 +183,7 @@
     public void stop()
     {
         getLogger().debug("stop()");
-        try 
+        try
         {
         	getTorque().shutdown();
         }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/AbstractDataSourceFactory.java Wed Aug 24 05:38:09 2005
@@ -60,15 +60,15 @@
     public static final String DEFAULTS_KEY = "defaults";
 
     /** "defaults.pool" Key for the configuration */
-    public static final String DEFAULT_POOL_KEY 
+    public static final String DEFAULT_POOL_KEY
             = DEFAULTS_KEY + "." + POOL_KEY;
 
     /** "defaults.connection" Key for the configuration */
-    public static final String DEFAULT_CONNECTION_KEY 
+    public static final String DEFAULT_CONNECTION_KEY
             = DEFAULTS_KEY + "." + CONNECTION_KEY;
 
     /** default schema name for the configuration */
-    public static final String DEFAULT_SCHEMA_KEY 
+    public static final String DEFAULT_SCHEMA_KEY
             = DEFAULTS_KEY + "." + SCHEMA_KEY;
 
 
@@ -131,7 +131,7 @@
             }
             else
             {
-                if ("password".equals(key)) 
+                if ("password".equals(key))
                 {
                     // do not log value of password
                     // for this, ConvertUtils.convert cannot be used
@@ -155,7 +155,7 @@
                     Object value =
                         ConvertUtils.convert(c.getString(property), propertyType);
                     PropertyUtils.setSimpleProperty(ds, property, value);
-    
+
                     if (log.isDebugEnabled())
                     {
                         log.debug("setSimpleProperty("
@@ -210,7 +210,7 @@
             }
         }
     }
-    
+
     /**
      * Initializes the ConnectionPoolDataSource.
      *
@@ -235,10 +235,10 @@
             Configuration conf = c.subset(DEFAULT_CONNECTION_KEY);
             applyConfiguration(conf, cpds);
         }
-            
+
         Configuration conf = configuration.subset(CONNECTION_KEY);
         applyConfiguration(conf, cpds);
-        
+
         return cpds;
     }
 
@@ -278,7 +278,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    public void initialize(Configuration configuration) 
+    public void initialize(Configuration configuration)
         throws TorqueException
     {
         if (configuration == null)

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/DataSourceFactory.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/DataSourceFactory.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/DataSourceFactory.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/DataSourceFactory.java Wed Aug 24 05:38:09 2005
@@ -36,10 +36,10 @@
 
     /**
      *  Key for the configuration which contains the fully qualified name
-     *  of the factory implementation class 
+     *  of the factory implementation class
      */
     public static final String FACTORY_KEY = "factory";
-    
+
     /**
      * @return the <code>DataSource</code> configured by the factory.
      * @throws TorqueException if the source can't be returned
@@ -53,7 +53,7 @@
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
-    void initialize(Configuration configuration) 
+    void initialize(Configuration configuration)
         throws TorqueException;
 
     /**
@@ -73,18 +73,18 @@
     String getSchema();
 
     /**
-     * A hook which is called when the resources of the associated DataSource 
+     * A hook which is called when the resources of the associated DataSource
      * can be released.
-     * After close() is called, the other methods may not work any more 
+     * After close() is called, the other methods may not work any more
      * (e.g. getDataSource() might return null).
-     * It is not guaranteed that this method does anything. For example, 
+     * It is not guaranteed that this method does anything. For example,
      * we do not want to close connections retrieved via JNDI, so the
-     * JndiDataSouurceFactory does not close these connections  
-     * 
+     * JndiDataSouurceFactory does not close these connections
+     *
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
     void close()
         throws TorqueException;
-    
+
 }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java Wed Aug 24 05:38:09 2005
@@ -74,7 +74,7 @@
     public DataSource getDataSource() throws TorqueException
     {
         long time = System.currentTimeMillis();
-        
+
         if (ds == null || time - lastLookup > ttl)
         {
             try
@@ -191,7 +191,7 @@
                         {
                             log.debug("Datasource class: " + classname);
                         }
-                        
+
                         Class dsClass = Class.forName(classname);
                         ds = dsClass.newInstance();
                     }
@@ -233,7 +233,7 @@
     {
         // do nothing
     }
-    
+
     /**
      *
      * @param ctx the context

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java Wed Aug 24 05:38:09 2005
@@ -42,7 +42,7 @@
 {
 
     /** The log. */
-    private static Log log 
+    private static Log log
             = LogFactory.getLog(PerUserPoolDataSourceFactory.class);
 
     /** The wrapped <code>DataSource</code>. */
@@ -98,14 +98,14 @@
         applyConfiguration(conf, ds);
         return ds;
     }
-    
+
     /**
      * Closes the pool associated with this factory and releases it.
      * @throws TorqueException if the pool cannot be closed properly
      */
     public void close() throws TorqueException
     {
-        try 
+        try
         {
             ds.close();
         }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java Wed Aug 24 05:38:09 2005
@@ -42,7 +42,7 @@
 {
 
     /** The log. */
-    private static Log log 
+    private static Log log
             = LogFactory.getLog(SharedPoolDataSourceFactory.class);
 
     /** The wrapped <code>DataSource</code>. */
@@ -98,15 +98,15 @@
         applyConfiguration(conf, ds);
         return ds;
     }
-    
-    
+
+
     /**
      * Closes the pool associated with this factory and releases it.
      * @throws TorqueException if the pool cannot be closed properly
      */
     public void close() throws TorqueException
     {
-        try 
+        try
         {
         	ds.close();
         }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java Wed Aug 24 05:38:09 2005
@@ -189,7 +189,7 @@
     }
 
     /**
-     * 
+     *
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
      */
@@ -211,7 +211,7 @@
     }
 
     /**
-     * 
+     *
      * @param key
      * @return
      * @throws TorqueException Any exceptions caught during processing will be
@@ -242,7 +242,7 @@
     }
 
     /**
-     * 
+     *
      * @param om
      * @return
      * @throws TorqueException Any exceptions caught during processing will be
@@ -256,7 +256,7 @@
     }
 
     /**
-     * 
+     *
      * @param key
      * @param om
      * @return
@@ -294,7 +294,7 @@
     }
 
     /**
-     * 
+     *
      * @param id
      * @return
      * @throws TorqueException Any exceptions caught during processing will be
@@ -397,7 +397,7 @@
     }
 
     /**
-     * 
+     *
      * @param ids
      * @return
      * @throws TorqueException Any exceptions caught during processing will be
@@ -408,7 +408,7 @@
 
     /**
      * Get the value of region.
-     * 
+     *
      * @return value of region.
      */
     public String getRegion()
@@ -477,7 +477,7 @@
     }
 
     /**
-     * 
+     *
      * @param listener A new listener for cache events.
      */
     public void addCacheListenerImpl(CacheListener listener)
@@ -524,7 +524,7 @@
     }
 
     /**
-     * 
+     *
      * @param key
      * @return A subset of the list identified by <code>key</code>.
      */
@@ -545,7 +545,7 @@
     }
 
     /**
-     * 
+     *
      * @param listeners
      * @param oldOm
      * @param om
@@ -588,7 +588,7 @@
 
     /**
      * helper methods for the Serializable interface
-     * 
+     *
      * @param out
      * @throws IOException
      */
@@ -600,7 +600,7 @@
 
     /**
      * Helper methods for the <code>Serializable</code> interface.
-     * 
+     *
      * @param in The stream to read a <code>Serializable</code> from.
      * @throws IOException
      * @throws ClassNotFoundException

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/manager/CacheListener.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/manager/CacheListener.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/manager/CacheListener.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/manager/CacheListener.java Wed Aug 24 05:38:09 2005
@@ -28,21 +28,21 @@
 public interface CacheListener
 {
     /**
-     * 
+     *
      * @param om
      */
     void addedObject(Persistent om);
-    
+
     /**
-     * 
+     *
      * @param om
      */
     void refreshedObject(Persistent om);
-    
+
     //public void removedObject(Persistent om);
-    
+
     /**
-     * 
+     *
      */
     List getInterestedFields();
 }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/om/SimpleKey.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/om/SimpleKey.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/om/SimpleKey.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/om/SimpleKey.java Wed Aug 24 05:38:09 2005
@@ -18,7 +18,7 @@
 
 /**
  * This empty class  marks an ObjectKey as being capable of being
- * represented as a single column in a database.  
+ * represented as a single column in a database.
  *
  * @author <a href="mailto:jmcnally@apache.org">John McNally</a>
  * @author <a href="mailto:drfish@cox.net">J. Russell Smyth</a>
@@ -30,7 +30,7 @@
      * Creates a SimpleKey equivalent to key
      * @param key the key value
      * @return a SimpleKey
-     */    
+     */
     public static SimpleKey keyFor(java.math.BigDecimal key)
     {
         return new NumberKey(key);
@@ -40,7 +40,7 @@
      * Creates a SimpleKey equivalent to key
      * @param key the key value
      * @return a SimpleKey
-     */    
+     */
     public static SimpleKey keyFor(int key)
     {
         return new NumberKey(key);
@@ -50,7 +50,7 @@
      * Creates a SimpleKey equivalent to key
      * @param key the key value
      * @return a SimpleKey
-     */    
+     */
     public static SimpleKey keyFor(long key)
     {
         return new NumberKey(key);
@@ -60,7 +60,7 @@
      * Creates a SimpleKey equivalent to key
      * @param key the key value
      * @return a SimpleKey
-     */    
+     */
     public static SimpleKey keyFor(double key)
     {
         return new NumberKey(key);
@@ -70,7 +70,7 @@
      * Creates a SimpleKey equivalent to key
      * @param key the key value
      * @return a SimpleKey
-     */    
+     */
     public static SimpleKey keyFor(Number key)
     {
         return new NumberKey(key);
@@ -80,7 +80,7 @@
      * Creates a SimpleKey equivalent to key
      * @param key the key value
      * @return a SimpleKey
-     */    
+     */
     public static SimpleKey keyFor(NumberKey key)
     {
         return new NumberKey(key);
@@ -90,7 +90,7 @@
      * Creates a SimpleKey equivalent to key
      * @param key the key value
      * @return a SimpleKey
-     */    
+     */
     public static SimpleKey keyFor(String key)
     {
         return new StringKey(key);
@@ -100,7 +100,7 @@
      * Creates a SimpleKey equivalent to key
      * @param key the key value
      * @return a SimpleKey
-     */    
+     */
     public static SimpleKey keyFor(StringKey key)
     {
         return new StringKey(key);
@@ -110,7 +110,7 @@
      * Creates a SimpleKey equivalent to key
      * @param key the key value
      * @return a SimpleKey
-     */    
+     */
     public static SimpleKey keyFor(java.util.Date key)
     {
         return new DateKey(key);
@@ -120,7 +120,7 @@
      * Creates a SimpleKey equivalent to key
      * @param key the key value
      * @return a SimpleKey
-     */    
+     */
     public static SimpleKey keyFor(DateKey key)
     {
         return new DateKey(key);

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/BasePeer.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/BasePeer.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/BasePeer.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/BasePeer.java Wed Aug 24 05:38:09 2005
@@ -70,7 +70,7 @@
  * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
  * @version $Id$
  */
-public abstract class BasePeer 
+public abstract class BasePeer
         implements Serializable
 {
     /** Constant criteria key to reference ORDER BY columns. */
@@ -94,11 +94,11 @@
     private static void throwTorqueException(Exception e)
         throws TorqueException
     {
-        if (e instanceof TorqueException) 
+        if (e instanceof TorqueException)
         {
             throw (TorqueException) e;
         }
-        else 
+        else
         {
             throw new TorqueException(e);
         }
@@ -335,7 +335,7 @@
         final DB db = Torque.getDB(dbName);
         final DatabaseMap dbMap = Torque.getDatabaseMap(dbName);
 
-        // This Callback adds all tables to the Table set which 
+        // This Callback adds all tables to the Table set which
         // are referenced from a cascading criteria. As a result, all
         // data that is referenced through foreign keys will also be
         // deleted.
@@ -499,7 +499,7 @@
                     throw new TorqueException(
                             "IdGenerator for table '" + table + "' is null");
                 }
-                
+
                 id = getId(pk, keyGen, con, keyInfo);
                 criteria.add(pk.getFullyQualifiedName(), id);
             }
@@ -888,7 +888,7 @@
             qds = new QueryDataSet(con, queryString);
             if (log.isDebugEnabled())
             {
-                log.debug("Elapsed time=" 
+                log.debug("Elapsed time="
                         + (System.currentTimeMillis() - startTime) + " ms");
             }
             results = getSelectResults(
@@ -1384,7 +1384,7 @@
             }
             catch (Exception e)
             {
-                log.error("BasePeer.MapBuilder failed trying to instantiate: " 
+                log.error("BasePeer.MapBuilder failed trying to instantiate: "
                         + name, e);
                 throw new TorqueException(e);
             }
@@ -1521,7 +1521,7 @@
     }
 
     /**
-     * Process the result of a Table list generation. 
+     * Process the result of a Table list generation.
      * This runs the statements onto the list of tables and
      * provides a callback hook to add functionality.
      *
@@ -1624,9 +1624,9 @@
             }
         }
     }
-    
+
     /**
-     * Inner Interface that defines the Callback method for 
+     * Inner Interface that defines the Callback method for
      * the Record Processing
      */
     protected interface ProcessCallback

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/CountHelper.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/CountHelper.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/CountHelper.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/CountHelper.java Wed Aug 24 05:38:09 2005
@@ -33,16 +33,16 @@
 import com.workingdogs.village.DataSetException;
 import com.workingdogs.village.Record;
 
-public class CountHelper 
-{  
+public class CountHelper
+{
     /**
-     * The COUNT function returns the number of rows in a query. 
-     * Does not use a connection, hardcode the column to "*" and 
+     * The COUNT function returns the number of rows in a query.
+     * Does not use a connection, hardcode the column to "*" and
      * set the distinct qualifier to false.
      * Only use this function if you have added additional constraints to
      * the criteria, otherwise Torque does not know which table it should
      * count the datasets in.
-     * 
+     *
      * @param c Criteria to get the count for.
      * @return number of rows matching the query provided
      * @throws TorqueException if the query could not be executed
@@ -53,40 +53,40 @@
     }
 
     /**
-     * The COUNT function returns the number of rows in a query. 
+     * The COUNT function returns the number of rows in a query.
      * Hard code the distinct parameter to false and set the column to "*".
      * Only use this function if you have added additional constraints to
      * the criteria, otherwise Torque does not know which table it should
      * count the datasets in.
-     * 
+     *
      * @param c Criteria to get the count for.
      * @param conn Connection to use
      * @return number of rows matching the query provided
      * @throws TorqueException if the query could not be executed
-     */    
+     */
     public int count( Criteria c, Connection conn ) throws TorqueException
     {
-        return count( c, conn, "*" );       
+        return count( c, conn, "*" );
     }
 
     /**
      * Returns the number of rows in a query.
-     * 
+     *
      * @param c Criteria to get the count for.
      * @param columnName Name of database Column which is counted. Preferably,
      *        use the primary key here.
      * @return number of rows matching the query provided
      * @throws TorqueException if the query could not be executed
      */
-    public int count( Criteria c, String columnName ) 
+    public int count( Criteria c, String columnName )
         throws TorqueException
     {
         return count( c, null, columnName );
     }
 
     /**
-     * Returns the number of rows in a query. 
-     * 
+     * Returns the number of rows in a query.
+     *
      * @param c Criteria to get the count for.
      * @param conn Connection to use
      * @param columnName Name of database Column which is counted. Preferably,
@@ -94,9 +94,9 @@
      * @return number of rows matching the query provided
      * @throws TorqueException if the query could not be executed
      */
-    public int count( Criteria c, Connection conn, String columnName ) 
+    public int count( Criteria c, Connection conn, String columnName )
         throws TorqueException
-    {        
+    {
         /* Clear the select columns. */
         c.getSelectColumns().clear();
         c.getOrderByColumns().clear();
@@ -106,8 +106,8 @@
         criteriaSelectModifiers = c.getSelectModifiers();
 
         boolean distinct = false;
-        if( criteriaSelectModifiers != null && 
-            criteriaSelectModifiers.size() > 0 && 
+        if( criteriaSelectModifiers != null &&
+            criteriaSelectModifiers.size() > 0 &&
             criteriaSelectModifiers.contains( SqlEnum.DISTINCT.toString() ) )
     	{
             criteriaSelectModifiers.remove( SqlEnum.DISTINCT.toString() );
@@ -129,7 +129,7 @@
         else
     	{
             result = BasePeer.doSelect( c, conn );
-        } 
+        }
         Record record = (Record) result.get(0);
         try {
             return record.getValue(1).asInt();

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java Wed Aug 24 05:38:09 2005
@@ -133,10 +133,10 @@
 
     /** &quot;RIGHT JOIN&quot; SQL statement */
     public static final SqlEnum RIGHT_JOIN = SqlEnum.RIGHT_JOIN;
-  
+
     /** &quot;INNER JOIN&quot; SQL statement */
     public static final SqlEnum INNER_JOIN = SqlEnum.INNER_JOIN;
-    
+
     private static final int DEFAULT_CAPACITY = 10;
 
     private boolean ignoreCase = false;
@@ -1336,7 +1336,7 @@
             joins = new ArrayList(3);
         }
         joins.add(new Join(left,right, operator));
-  
+
         return this;
     }
 
@@ -3590,77 +3590,77 @@
             }
         }
     }
-    
+
     /**
      * Data object to describe a join between two tables, for example
      * <pre>
      * table_a LEFT JOIN table_b ON table_a.id = table_b.a_id
      * </pre>
-     * The class is immutable. Because the class is also used by 
+     * The class is immutable. Because the class is also used by
      * {@link org.apache.torque.util.BasePeer}, it is visible from the package.
      */
     public static class Join
     {
         /** the left column of the join condition */
         private String leftColumn = null;
-      
+
         /** the right column of the join condition */
         private String rightColumn = null;
-      
+
         /** the type of the join (LEFT JOIN, ...), or null */
         private SqlEnum joinType = null;
-      
+
         /**
          * Constructor
-         * @param leftColumn the left column of the join condition; 
+         * @param leftColumn the left column of the join condition;
          *        might contain an alias name
          * @param rightColumn the right column of the join condition
          *        might contain an alias name
-         * @param joinType the type of the join. Valid join types are 
+         * @param joinType the type of the join. Valid join types are
          *        null (adding the join condition to the where clause),
          *        SqlEnum.LEFT_JOIN, SqlEnum.RIGHT_JOIN, and SqlEnum.INNER_JOIN
          */
         public Join(
-                final String leftColumn, 
-                final String rightColumn, 
+                final String leftColumn,
+                final String rightColumn,
                 final SqlEnum joinType)
         {
             this.leftColumn = leftColumn;
             this.rightColumn = rightColumn;
             this.joinType = joinType;
         }
-      
+
         /**
-         * @return the type of the join, i.e. SqlEnum.LEFT_JOIN, ..., 
+         * @return the type of the join, i.e. SqlEnum.LEFT_JOIN, ...,
          *         or null for adding the join condition to the where Clause
          */
-        public final SqlEnum getJoinType() 
+        public final SqlEnum getJoinType()
         {
             return joinType;
         }
-  
+
         /**
          * @return the left column of the join condition
          */
-        public final String getLeftColumn() 
+        public final String getLeftColumn()
         {
             return leftColumn;
         }
-  
+
         /**
          * @return the right column of the join condition
          */
-        public final String getRightColumn() 
+        public final String getRightColumn()
         {
             return rightColumn;
         }
-        
+
         /**
          * returns a String representation of the class,
          * mainly for debuggung purposes
          * @return a String representation of the class
          */
-        public String toString() 
+        public String toString()
         {
             StringBuffer result = new StringBuffer();
             if (joinType != null)

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/JoinBuilder.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/JoinBuilder.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/JoinBuilder.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/JoinBuilder.java Wed Aug 24 05:38:09 2005
@@ -39,10 +39,10 @@
      * adds the Joins from the criteria to the query
      * @param criteria the criteria from which the Joins are taken
      * @param query the query to which the Joins should be added
-     * @throws TorqueException if the Joins can not be processed 
+     * @throws TorqueException if the Joins can not be processed
      */
     public static final void processJoins(
-            final DB db, 
+            final DB db,
             final DatabaseMap dbMap,
             final Criteria criteria,
             final Query query)
@@ -63,7 +63,7 @@
             Criteria.Join join = (Criteria.Join) criteriaJoins.get(i);
             String leftColumn = join.getLeftColumn();
             String rightColumn = join.getRightColumn();
-                      
+
             // check if the column names make sense
             if (leftColumn.indexOf('.') == -1)
             {
@@ -73,19 +73,19 @@
             {
                 SQLBuilder.throwMalformedColumnNameException("join", rightColumn);
             }
-      
-            // get the table names 
+
+            // get the table names
             // (and the alias names for them if necessary))
-            // Also check whether a case insensitive comparison is needed  
+            // Also check whether a case insensitive comparison is needed
             int dot = leftColumn.lastIndexOf('.');
             String leftTableName = leftColumn.substring(0, dot);
 
-            leftTableName = 
+            leftTableName =
                     SQLBuilder.getTableNameForFromClause(leftTableName, criteria);
 
             dot = rightColumn.lastIndexOf('.');
             String rightTableName = rightColumn.substring(0, dot);
-            String dbTableName 
+            String dbTableName
                     = criteria.getTableForAlias(rightTableName);
 
             if (dbTableName == null)
@@ -94,7 +94,7 @@
             }
 
             String columnName = rightColumn.substring(
-                    dot + 1, 
+                    dot + 1,
                     rightColumn.length());
 
             boolean ignoreCase = (criteria.isIgnoreCase()
@@ -103,32 +103,32 @@
                             .getColumn(columnName)
                             .getType()
                             instanceof String));
-            
+
             rightTableName = SQLBuilder.getTableNameForFromClause(
                     rightTableName, criteria);
-            
+
             // now check the join type and add the join to the
             // appropriate places in the query
             SqlEnum joinType  = join.getJoinType();
-                              
+
             if (joinType == null)
             {
-                // Do not treat join as explicit join, but add 
+                // Do not treat join as explicit join, but add
                 // the join condition to the where clauses
                 if (!SQLBuilder.fromClauseContainsTableName(
-                            queryFromClause, 
-                            leftTableName)) 
+                            queryFromClause,
+                            leftTableName))
                 {
-                    Query.FromElement fromElement 
+                    Query.FromElement fromElement
                             = new Query.FromElement(
                                     leftTableName, null, null);
                     queryFromClause.add(fromElement);
                 }
                 if (!SQLBuilder.fromClauseContainsTableName(
-                            queryFromClause, 
-                            rightTableName)) 
+                            queryFromClause,
+                            rightTableName))
                 {
-                    Query.FromElement fromElement 
+                    Query.FromElement fromElement
                             = new Query.FromElement(
                                     rightTableName, null, null);
                     queryFromClause.add(fromElement);
@@ -142,42 +142,42 @@
                 // check whether the order of the join must be "reversed"
                 // This if the case if the fromClause already contains
                 // rightTableName
-                          
+
                 if (!SQLBuilder.fromClauseContainsTableName(
-                            queryFromClause, 
-                            rightTableName)) 
+                            queryFromClause,
+                            rightTableName))
                 {
                     if (!SQLBuilder.fromClauseContainsTableName(
-                                queryFromClause, 
+                                queryFromClause,
                                 leftTableName))
                     {
-                        Query.FromElement fromElement 
+                        Query.FromElement fromElement
                                 = new Query.FromElement(
                                         leftTableName, null, null);
                         queryFromClause.add(fromElement);
                     }
-                            
+
                     Query.FromElement fromElement
                             = new Query.FromElement(
                                     rightTableName, joinType,
                                     SqlExpression.buildInnerJoin(
-                                            leftColumn, rightColumn, 
+                                            leftColumn, rightColumn,
                                             ignoreCase, db));
                     queryFromClause.add(fromElement);
                 }
                 else
                 {
                     if (SQLBuilder.fromClauseContainsTableName(
-                                queryFromClause, 
-                                leftTableName)) 
+                                queryFromClause,
+                                leftTableName))
                     {
-                        // We cannot add an explicit join if both tables 
+                        // We cannot add an explicit join if both tables
                         // are alredy present in the from clause
                         throw new TorqueException(
                                 "Unable to create a " + joinType
-                                + "because both table names " 
-                                + leftTableName + " and " + rightTableName 
-                                + " are already in use. " 
+                                + "because both table names "
+                                + leftTableName + " and " + rightTableName
+                                + " are already in use. "
                                 + "Try to create an(other) alias.");
                     }
                     // now add the join in reverse order
@@ -187,7 +187,7 @@
                             = new Query.FromElement(
                                     leftTableName, reverseJoinType(joinType),
                                     SqlExpression.buildInnerJoin(
-                                            rightColumn, leftColumn,  
+                                            rightColumn, leftColumn,
                                             ignoreCase, db));
                     queryFromClause.add(fromElement);
                 }
@@ -202,19 +202,19 @@
      * table_a left join table_b <br />
      * produces the same result as  <br />
      * table_b right join table_a<br />
-     * So "left join" is the reverse of "right join" 
+     * So "left join" is the reverse of "right join"
      * @param joinType the join type to be reversed
      * @return the reversed join type
      */
     private static final SqlEnum reverseJoinType(
-            final SqlEnum joinType) 
+            final SqlEnum joinType)
     {
-        if (SqlEnum.LEFT_JOIN.equals(joinType)) 
+        if (SqlEnum.LEFT_JOIN.equals(joinType))
         {
             return SqlEnum.RIGHT_JOIN;
         }
-        else if (SqlEnum.RIGHT_JOIN.equals(joinType)) 
-        {  
+        else if (SqlEnum.RIGHT_JOIN.equals(joinType))
+        {
             return SqlEnum.LEFT_JOIN;
         }
         else

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java Wed Aug 24 05:38:09 2005
@@ -627,7 +627,7 @@
 
         List returnResults;
 
-        synchronized (results) 
+        synchronized (results)
         {
             returnResults = new ArrayList(results.subList(fromIndex, toIndex));
         }
@@ -711,7 +711,7 @@
                 List tempResults
                         = BasePeer.getSelectResults(qds, size, false);
 
-                synchronized (results) 
+                synchronized (results)
                 {
                     for (int i = 0, n = tempResults.size(); i < n; i++)
                     {
@@ -1128,7 +1128,7 @@
         totalPages = -1;
         totalRecords = 0;
         // todo Perhaps store the oldPageNumber and immediately restart the
-        // query. 
+        // query.
         // oldPageNumber = currentPageNumber;
         currentPageNumber = 0;
         queryCompleted = false;
@@ -1173,7 +1173,7 @@
     }
 
     /**
-     * Set a search parameter.  If the value is <code>null</code> then the 
+     * Set a search parameter.  If the value is <code>null</code> then the
      * key will be removed from the parameters.
      *
      * @param name the search parameter key to set.
@@ -1213,7 +1213,7 @@
 
     /**
      * Provide something useful for debugging purposes.
-     * 
+     *
      * @return some basic information about this instance of LargeSelect.
      */
     public String toString()

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/LimitHelper.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/LimitHelper.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/LimitHelper.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/LimitHelper.java Wed Aug 24 05:38:09 2005
@@ -51,7 +51,7 @@
         {
             // If we hit a database type, that is able to do native
             // limiting, we must set the criteria values to -1 and 0
-            // afterwards. Reason is, that else theexecuteQuery 
+            // afterwards. Reason is, that else theexecuteQuery
             // method tries to do the limiting using Village
             //
             switch (db.getLimitStyle())
@@ -91,7 +91,7 @@
             int offset, int limit)
     {
         StringBuffer limitStringBuffer = new StringBuffer();
-        
+
         if (offset > 0)
         {
             limitStringBuffer.append(offset)
@@ -156,11 +156,11 @@
      *     ) B WHERE B.TORQUE$ROWNUM > offset AND B.TORQUE$ROWNUM
      *     <= offset + limit
      * </pre>
-     * 
+     *
      * @param query The query to modify
      * @param offset the offset Value
      * @param limit the limit Value
-     */ 
+     */
     private static final void generateOracleLimits(Query query,
             int offset, int limit)
     {
@@ -206,11 +206,11 @@
      *     ) B WHERE B.TORQUE$ROWNUM > offset AND B.TORQUE$ROWNUM
      *     <= offset + limit
      * </pre>
-     * 
+     *
      * @param query The query to modify
      * @param offset the offset Value
      * @param limit the limit Value
-     */ 
+     */
     private static final void generateDB2Limits(Query query,
             int offset, int limit)
     {

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/Query.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/Query.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/Query.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/Query.java Wed Aug 24 05:38:09 2005
@@ -362,7 +362,7 @@
         {
             stmt.append(postLimit);
         }
-            
+
         return stmt;
     }
 
@@ -376,16 +376,16 @@
      */
     public static class FromElement
     {
-        
+
         /** the tablename, might contain an appended alias name */
         String tableName = null;
-          
+
         /** the type of the join, e.g. SqlEnum.LEFT_JOIN */
         SqlEnum joinType = null;
-          
+
         /** the join condition, e.g. table_a.id = table_b.a_id */
         String joinCondition = null;
-          
+
         /**
          * Constructor
          * @param tableName the tablename, might contain an appended alias name
@@ -396,59 +396,59 @@
          *        or null if no excplicit join is wanted
          * @param joinCondition the join condition,
          *        e.g. table_a.id = table_b.a_id,
-         *        or null if no explicit join is wanted 
+         *        or null if no explicit join is wanted
          *        (In this case, the join condition is appended to the
          *         whereClause instead)
          */
-        public FromElement(String tableName, 
-                SqlEnum joinType, 
-                String joinCondition) 
+        public FromElement(String tableName,
+                SqlEnum joinType,
+                String joinCondition)
         {
             this.tableName = tableName;
             this.joinType = joinType;
             this.joinCondition = joinCondition;
         }
-          
-          
+
+
         /**
          * @return the join condition, e.g. table_a.id = table_b.a_id,
          *         or null if the join is not an explicit join
          */
-        public String getJoinCondition() 
+        public String getJoinCondition()
         {
             return joinCondition;
         }
-  
+
         /**
          * @return the type of the join, e.g. SqlEnum.LEFT_JOIN,
          *         or null if the join is not an explicit join
          */
-        public SqlEnum getJoinType() 
+        public SqlEnum getJoinType()
         {
             return joinType;
         }
-  
+
         /**
          * @return the tablename, might contain an appended alias name,
          *         e.g. <br />
          *         table_1<br />
          *         table_1 alias_for_table_1
-         *         
+         *
          */
-        public String getTableName() 
+        public String getTableName()
         {
             return tableName;
         }
-        
+
         /**
          * Returns a SQL representation of the element
          * @return a SQL representation of the element
-         */  
-        public String toString() 
+         */
+        public String toString()
         {
             StringBuffer result = new StringBuffer();
             if (joinType != null) {
-                result.append(joinType); 
+                result.append(joinType);
             }
             result.append(tableName);
             if (joinCondition != null) {

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/SQLBuilder.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/SQLBuilder.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/SQLBuilder.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/SQLBuilder.java Wed Aug 24 05:38:09 2005
@@ -68,12 +68,12 @@
 
             if (dotIndex == -1) // No schema given
             {
-                String targetDBName = (dbName == null) 
+                String targetDBName = (dbName == null)
                         ? Torque.getDefaultDB()
                         : dbName;
-                
+
                 String targetSchema = Torque.getSchema(targetDBName);
-                
+
                 // If we have a default schema, fully qualify the
                 // table and return.
                 if (StringUtils.isNotEmpty(targetSchema))
@@ -158,7 +158,7 @@
 
         return null; // Ugh
     }
-    
+
     /**
      * Removes possible qualifiers (like DISTINCT) from a column name
      *
@@ -185,14 +185,14 @@
             // Qualifiers are first, tablename is piece after last space
             return name.trim().substring(spacePos + 1);
         }
-        
+
         // no spaces, nothing changed
         return name;
     }
-    
+
 
     /**
-     * Returns a table name from an identifier. Each identifier is to be qualified 
+     * Returns a table name from an identifier. Each identifier is to be qualified
      * as [schema.]table.column. This could also contain FUNCTION([schema.]table.column).
      *
      * @param name The (possible fully qualified) identifier name
@@ -230,8 +230,8 @@
 
         return getFullTableName(testName.substring(0, rightDotIndex), dbName);
     }
-            
-            
+
+
 
     /**
      * Returns a set of all tables and possible aliases referenced
@@ -255,7 +255,7 @@
             Criteria.Criterion c = crit.getCriterion(key);
             List tableNames = c.getAllTables();
 
-            // Loop over all Tables referenced in this criterion. 
+            // Loop over all Tables referenced in this criterion.
             for (Iterator it2 = tableNames.iterator(); it2.hasNext(); )
             {
                 String name = (String) it2.next();
@@ -264,7 +264,7 @@
                 // If the tables have an alias, add an "<xxx> AS <yyy> statement"
                 if (StringUtils.isNotEmpty(aliasName))
                 {
-                    String newName = 
+                    String newName =
                             new StringBuffer(name.length() + aliasName.length() + 4)
                             .append(aliasName)
                             .append(" AS ")
@@ -280,7 +280,7 @@
                 tableCallback.process(tables, key, crit);
             }
         }
-        
+
         return tables;
     }
 
@@ -294,7 +294,7 @@
      * @exception TorqueException if an error occurs
      */
     public static final Query buildQueryClause(final Criteria crit,
-            final List params, 
+            final List params,
             final QueryCallback qc)
             throws TorqueException
     {
@@ -326,7 +326,7 @@
      * adds the select columns from the criteria to the query
      * @param criteria the criteria from which the select columns are taken
      * @param query the query to which the select columns should be added
-     * @throws TorqueException if the select columns can not be processed 
+     * @throws TorqueException if the select columns can not be processed
      */
     private static final void processSelectColumns(
             final Criteria criteria,
@@ -336,15 +336,15 @@
     {
         UniqueList selectClause = query.getSelectClause();
         UniqueList select = criteria.getSelectColumns();
-        
+
         for (int i = 0; i < select.size(); i++)
         {
             String identifier = (String) select.get(i);
             selectClause.add(identifier);
-            addTableToFromClause(getTableName(identifier, dbName), criteria, query); 
+            addTableToFromClause(getTableName(identifier, dbName), criteria, query);
         }
     }
-    
+
     /**
      * adds the As-columns from the criteria to the query.
      * @param criteria the criteria from which the As-columns are taken
@@ -352,11 +352,11 @@
      */
     private static final void processAsColumns(
             final Criteria criteria,
-            final Query query) 
+            final Query query)
     {
         UniqueList querySelectClause = query.getSelectClause();
         Map criteriaAsColumns = criteria.getAsColumns();
-      
+
         for (Iterator it = criteriaAsColumns.keySet().iterator(); it.hasNext(); )
         {
             String key = (String) it.next();
@@ -368,7 +368,7 @@
                     .toString());
         }
     }
-    
+
     /**
      * adds the Modifiers from the criteria to the query
      * @param criteria the criteria from which the Modifiers are taken
@@ -376,7 +376,7 @@
      */
     private static final void processModifiers(
             final Criteria criteria,
-            final Query query) 
+            final Query query)
     {
         UniqueList selectModifiers = query.getSelectModifiers();
         UniqueList modifiers = criteria.getSelectModifiers();
@@ -385,23 +385,23 @@
             selectModifiers.add(modifiers.get(i));
         }
     }
-    
+
     /**
      * adds the Criterion-objects from the criteria to the query
      * @param criteria the criteria from which the Criterion-objects are taken
      * @param query the query to which the Criterion-objects should be added
      * @param params the parameters if a prepared statement should be built,
      *        or null if a normal statement should be built.
-     * @throws TorqueException if the Criterion-objects can not be processed 
+     * @throws TorqueException if the Criterion-objects can not be processed
      */
     private static final void processCriterions(
             final DB db,
             final DatabaseMap dbMap,
             final String dbName,
-            final Criteria crit, 
+            final Criteria crit,
             final Query query,
             final List params,
-            final QueryCallback qc) 
+            final QueryCallback qc)
         throws TorqueException
     {
         UniqueList fromClause = query.getFromClause();
@@ -418,8 +418,8 @@
             for (int i = 0; i < someCriteria.length; i++)
             {
                 String tableName = someCriteria[i].getTable();
-    
-                // add the table to the from clause, if it is not already 
+
+                // add the table to the from clause, if it is not already
                 // contained there
                 // it is important that this piece of code is executed AFTER
                 // the joins are processed
@@ -439,30 +439,30 @@
 
                 someCriteria[i].setIgnoreCase(ignoreCase);
             }
-            
+
             criterion.setDB(db);
             whereClause.add(qc.process(criterion, params));
         }
     }
-    
+
     /**
      * adds the OrderBy-Columns from the criteria to the query
      * @param criteria the criteria from which the OrderBy-Columns are taken
      * @param query the query to which the OrderBy-Columns should be added
-     * @throws TorqueException if the OrderBy-Columns can not be processed 
+     * @throws TorqueException if the OrderBy-Columns can not be processed
      */
     private static final void processOrderBy(
             final DB db,
             final DatabaseMap dbMap,
             final Criteria crit,
-            final Query query) 
+            final Query query)
             throws TorqueException
     {
         UniqueList orderByClause = query.getOrderByClause();
         UniqueList selectClause = query.getSelectClause();
-  
+
         UniqueList orderBy = crit.getOrderByColumns();
-        
+
         if (orderBy != null && orderBy.size() > 0)
         {
             // Check for each String/Character column and apply
@@ -471,7 +471,7 @@
             {
                 String orderByColumn = (String) orderBy.get(i);
 
-                String strippedColumnName 
+                String strippedColumnName
                         = removeSQLFunction(orderByColumn);
                 int dotPos = strippedColumnName.lastIndexOf('.');
                 if (dotPos == -1)
@@ -504,11 +504,11 @@
                             spacePos);
                 }
                 ColumnMap column = dbMap.getTable(table).getColumn(columnName);
-                
+
                 // only ignore case in order by for string columns
                 // which do not have a function around them
                 if (column.getType() instanceof String
-                        && orderByColumn.indexOf('(') == -1) 
+                        && orderByColumn.indexOf('(') == -1)
                 {
                     // find space pos relative to orderByColumn
                     spacePos = orderByColumn.indexOf(' ');
@@ -539,11 +539,11 @@
      * adds the GroupBy-Columns from the criteria to the query
      * @param criteria the criteria from which the GroupBy-Columns are taken
      * @param query the query to which the GroupBy-Columns should be added
-     * @throws TorqueException if the GroupBy-Columns can not be processed 
+     * @throws TorqueException if the GroupBy-Columns can not be processed
      */
     private static final void processGroupBy(
             final Criteria crit,
-            final Query query) 
+            final Query query)
             throws TorqueException
     {
         UniqueList groupByClause = query.getGroupByClause();
@@ -579,11 +579,11 @@
      * adds the Having-Columns from the criteria to the query
      * @param criteria the criteria from which the Having-Columns are taken
      * @param query the query to which the Having-Columns should be added
-     * @throws TorqueException if the Having-Columns can not be processed 
+     * @throws TorqueException if the Having-Columns can not be processed
      */
     private static final void processHaving(
             final Criteria crit,
-            final Query query) 
+            final Query query)
             throws TorqueException
     {
         Criteria.Criterion having = crit.getHaving();
@@ -625,7 +625,7 @@
 
     /**
      * Returns the tablename which can be added to a From Clause.
-     * This takes care of any aliases that might be defined. 
+     * This takes care of any aliases that might be defined.
      * For example, if an alias "a" for the table AUTHOR is defined
      * in the Criteria criteria, getTableNameForFromClause("a", criteria)
      * returns "AUTHOR a".
@@ -637,8 +637,8 @@
      *         if tableOrAliasName is an alias for a table name
      */
     public static final String getTableNameForFromClause(
-            final String tableName, 
-            final Criteria criteria) 
+            final String tableName,
+            final Criteria criteria)
     {
         String shortTableName = getUnqualifiedTableName(tableName);
 
@@ -664,13 +664,13 @@
 
         return tableName;
     }
-    
+
     /**
      * Checks if the Tablename tableName is already contained in a from clause.
-     * If tableName and the tablenames in fromClause are generated by 
+     * If tableName and the tablenames in fromClause are generated by
      * getTablenameForFromClause(String, Criteria), (which they usually are),
-     * then different aliases for the same table are treated 
-     * as different tables: E.g. 
+     * then different aliases for the same table are treated
+     * as different tables: E.g.
      * fromClauseContainsTableName(fromClause, "table_a a") returns false if
      * fromClause contains only another alias for table_a ,
      * e.g. "table_a aa" and the unaliased tablename "table_a".
@@ -682,21 +682,21 @@
      *         If tableName is null, true is returned.
      */
     public static final boolean fromClauseContainsTableName(
-            final UniqueList fromClause, 
-            final String tableName) 
+            final UniqueList fromClause,
+            final String tableName)
     {
-        if (tableName == null) 
+        if (tableName == null)
         {
-            // usually this function is called to see if tableName should be 
+            // usually this function is called to see if tableName should be
             // added to the fromClause. As null should not be added,
             // true is returned.
             return true;
         }
         for ( Iterator it = fromClause.iterator(); it.hasNext();)
         {
-            Query.FromElement fromElement 
+            Query.FromElement fromElement
                     = (Query.FromElement) it.next();
-            if (tableName.equals(fromElement.getTableName())) 
+            if (tableName.equals(fromElement.getTableName()))
             {
                 return true;
             }
@@ -718,20 +718,20 @@
     private static final String addTableToFromClause(
             final String tableName,
             final Criteria criteria,
-            Query query) 
+            Query query)
     {
-        String tableNameForFromClause 
+        String tableNameForFromClause
                 = getTableNameForFromClause(tableName, criteria);
 
         UniqueList queryFromClause = query.getFromClause();
-        
+
         // it is important that this piece of code is executed AFTER
         // the joins are processed
         if (!fromClauseContainsTableName(
-            queryFromClause, 
+            queryFromClause,
             tableNameForFromClause))
         {
-            Query.FromElement fromElement 
+            Query.FromElement fromElement
                     = new Query.FromElement(
                             tableNameForFromClause, null, null);
             queryFromClause.add(fromElement);
@@ -740,7 +740,7 @@
     }
 
     /**
-     * Inner Interface that defines the Callback method for 
+     * Inner Interface that defines the Callback method for
      * the Table creation loop.
      */
     public interface TableCallback
@@ -756,7 +756,7 @@
     }
 
     /**
-     * Inner Interface that defines the Callback method for 
+     * Inner Interface that defines the Callback method for
      * the buildQuery Criterion evaluation
      */
     public interface QueryCallback

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlEnum.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlEnum.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlEnum.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlEnum.java Wed Aug 24 05:38:09 2005
@@ -30,22 +30,22 @@
 public class SqlEnum implements java.io.Serializable
 {
     private final String s;
-    
-    private SqlEnum(String s) 
-    { 
+
+    private SqlEnum(String s)
+    {
         this.s = s;
     }
 
-    public final String toString()  
-    { 
+    public final String toString()
+    {
         return s;
     }
-    
-    public static final SqlEnum EQUAL = 
+
+    public static final SqlEnum EQUAL =
         new SqlEnum("=");
-    public static final SqlEnum NOT_EQUAL = 
+    public static final SqlEnum NOT_EQUAL =
             new SqlEnum("<>");
-    public static final SqlEnum ALT_NOT_EQUAL = 
+    public static final SqlEnum ALT_NOT_EQUAL =
         new SqlEnum("!=");
     public static final SqlEnum GREATER_THAN =
         new SqlEnum(">");
@@ -54,7 +54,7 @@
     public static final SqlEnum GREATER_EQUAL =
         new SqlEnum(">=");
     public static final SqlEnum LESS_EQUAL =
-        new SqlEnum("<=");  
+        new SqlEnum("<=");
     public static final SqlEnum LIKE =
         new SqlEnum(" LIKE ");
     public static final SqlEnum NOT_LIKE =
@@ -97,20 +97,20 @@
         new SqlEnum(" ON ");
     public static final SqlEnum AS =
         new SqlEnum(" AS ");
-    
+
     /**
      * returns whether o is the same SqlEnum as this object.
      * Two SqlEnums are considered equal if they contain the same String.
      * @param o the object to compare the SqlEnum with.
      */
-    public boolean equals(Object o) 
+    public boolean equals(Object o)
     {
-        if (o == null) 
+        if (o == null)
         {
             return false;
         }
 
-        if (! (o instanceof SqlEnum)) 
+        if (! (o instanceof SqlEnum))
         {
             return false;
         }
@@ -121,17 +121,17 @@
         // both null: true
         // other null, this not null: false
         // else compare
-        return (otherEnum.s == null) 
+        return (otherEnum.s == null)
                 ? (s == null)
                 : otherEnum.s.equals(s);
     }
-    
+
     /**
      * returns a hashcode for this object which is consistent with equals()
      */
-    public int hashCode() 
+    public int hashCode()
     {
-        return (s == null) 
+        return (s == null)
                 ? 0
                 : s.hashCode();
     }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlExpression.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlExpression.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlExpression.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/SqlExpression.java Wed Aug 24 05:38:09 2005
@@ -355,7 +355,7 @@
                            DB db,
                            StringBuffer whereClause)
     {
-        // If selection is case insensitive use ILIKE for PostgreSQL or SQL 
+        // If selection is case insensitive use ILIKE for PostgreSQL or SQL
         // UPPER() function on column name for other databases.
         if (ignoreCase)
         {
@@ -363,11 +363,11 @@
             {
                 if (comparison.equals(Criteria.LIKE))
                 {
-                    comparison = Criteria.ILIKE; 
+                    comparison = Criteria.ILIKE;
                 }
                 else if (comparison.equals(Criteria.NOT_LIKE))
                 {
-                    comparison = Criteria.NOT_ILIKE; 
+                    comparison = Criteria.NOT_ILIKE;
                 }
             }
             else

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/Transaction.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/Transaction.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/Transaction.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/Transaction.java Wed Aug 24 05:38:09 2005
@@ -31,8 +31,8 @@
  *
  * <p>
  * This can be used to handle cases where transaction support is optional.
- * The second parameter of beginOptionalTransaction will determine with a 
- * transaction is used or not. 
+ * The second parameter of beginOptionalTransaction will determine with a
+ * transaction is used or not.
  * If a transaction is not used, the commit and rollback methods
  * do not have any effect. Instead it simply makes the logic easier to follow
  * by cutting down on the if statements based solely on whether a transaction
@@ -178,17 +178,17 @@
      * Roll back a transaction without throwing errors if they occur.
      * A null Connection argument is logged at the debug level and other
      * errors are logged at warn level.
-     * 
+     *
      * @param con The Connection for the transaction.
      * @see rollback
      */
-    public static void safeRollback(Connection con) 
+    public static void safeRollback(Connection con)
     {
-        if (con == null) 
+        if (con == null)
         {
             log.debug("called safeRollback with null argument");
         }
-        else 
+        else
         {
             try
             {
@@ -198,6 +198,6 @@
             {
                 log.warn("An error occured during rollback.", e);
             }
-        }   
+        }
     }
 }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/VillageUtils.java
URL: http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/VillageUtils.java?rev=239636&r1=239635&r2=239636&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/VillageUtils.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/VillageUtils.java Wed Aug 24 05:38:09 2005
@@ -162,7 +162,7 @@
      * @param rec The Village Record
      * @param colName The name of the Column in the Record
      */
-    public static final void setVillageValue(final Criteria crit, 
+    public static final void setVillageValue(final Criteria crit,
             final String key,
             final Record rec,
             final String colName)



---------------------------------------------------------------------
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