db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r466087 [2/3] - in /db/torque/runtime/trunk/src/java/org/apache/torque: ./ adapter/ avalon/ dsfactory/ manager/ map/ oid/ om/ util/
Date Fri, 20 Oct 2006 12:20:05 GMT
Modified: db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/DataSourceFactory.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.dsfactory;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -32,13 +32,13 @@
     /**
      * Key for the configuration which contains DataSourceFactories
      */
-    public static final String DSFACTORY_KEY = "dsfactory";
+    String DSFACTORY_KEY = "dsfactory";
 
     /**
      *  Key for the configuration which contains the fully qualified name
      *  of the factory implementation class
      */
-    public static final String FACTORY_KEY = "factory";
+    String FACTORY_KEY = "factory";
 
     /**
      * @return the <code>DataSource</code> configured by the factory.
@@ -60,7 +60,7 @@
      * Sets the current schema for the database connection
      *
      * @param schema The current schema name
-     * @deprecated use DatabaseInfo.setSchema() instead. Will be removed 
+     * @deprecated use DatabaseInfo.setSchema() instead. Will be removed
      *             in a future version of Torque.
      */
     void setSchema(String schema);
@@ -71,7 +71,7 @@
      * @return The current schema name. Null means, no schema has been set.
      * @throws TorqueException Any exceptions caught during processing will be
      *         rethrown wrapped into a TorqueException.
-     * @deprecated use DatabaseInfo.getSchema() instead. Will be removed 
+     * @deprecated use DatabaseInfo.getSchema() instead. Will be removed
      *             in a future version of Torque.
      */
     String getSchema();
@@ -90,5 +90,4 @@
      */
     void close()
         throws TorqueException;
-
 }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.dsfactory;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@
     public static final String PATH_KEY = "path";
 
     /**
-     *  Key for the configuration property which contains the 
+     *  Key for the configuration property which contains the
      *  time between two jndi lookups.
      */
     public static final String TIME_BETWEEN_LOOKUPS_KEY = "ttl";
@@ -70,7 +70,7 @@
      * which should be bound into jndi.
      */
     public static final String DATASOURCE_KEY = "datasource";
-    
+
     /**
      *  Key for the configuration property which contains the class name
      *  of the datasource to be bound into jndi.
@@ -149,7 +149,7 @@
         try
         {
             Hashtable env = new Hashtable();
-            for (Iterator i = c.getKeys(); i.hasNext(); )
+            for (Iterator i = c.getKeys(); i.hasNext();)
             {
                 String key = (String) i.next();
                 if (key.equals(PATH_KEY))
@@ -207,7 +207,7 @@
             Configuration c = configuration.subset(DATASOURCE_KEY);
             if (c != null)
             {
-                for (Iterator i = c.getKeys(); i.hasNext(); )
+                for (Iterator i = c.getKeys(); i.hasNext();)
                 {
                     String key = (String) i.next();
                     if (key.equals(CLASSNAME_KEY))
@@ -233,7 +233,7 @@
                         }
                         else
                         {
-                            log.error("Tried to set property " + key 
+                            log.error("Tried to set property " + key
                                     + " without Datasource definition!");
                         }
                     }
@@ -274,7 +274,7 @@
         log.debug("Environment properties:" + env.size());
         while (qw.hasNext())
         {
-            Map.Entry entry = (Map.Entry)qw.next(); 
+            Map.Entry entry = (Map.Entry)qw.next();
             log.debug("    " + entry.getKey() + ": " + entry.getValue());
         }
         log.debug("----------------------------------------------");

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.dsfactory;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.dsfactory;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -107,7 +107,7 @@
     {
         try
         {
-        	ds.close();
+            ds.close();
         }
         catch (Exception e)
         {

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.manager;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -223,7 +223,7 @@
 
     /**
      * Remove an object from the cache
-     * 
+     *
      * @param key the cache key for the object
      * @return the object one last time
      * @throws TorqueException Any exceptions caught during processing will be
@@ -255,7 +255,7 @@
 
     /**
      * Put an object into the cache
-     * 
+     *
      * @param om the object
      * @return if an object with the same key already is in the cache
      *         this object will be returned, else null
@@ -271,7 +271,7 @@
 
     /**
      * Put an object into the cache
-     * 
+     *
      * @param key the cache key for the object
      * @param om the object
      * @return if an object with this key already is in the cache
@@ -311,7 +311,7 @@
 
     /**
      * Retrieve an object from persistent storage
-     * 
+     *
      * @param id the primary key of the object
      * @return the object
      * @throws TorqueException Any exceptions caught during processing will be
@@ -462,7 +462,7 @@
         {
             throw new TorqueException("Cache could not be initialized", e);
         }
-        
+
         if (cache == null)
         {
             log.info("Cache could not be initialized for region: " + v);

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/manager/CacheListener.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/manager/CacheListener.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.manager;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodCacheKey.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodCacheKey.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodCacheKey.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodCacheKey.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.manager;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodResultCache.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodResultCache.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodResultCache.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodResultCache.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.manager;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/manager/NoOpMethodResultCache.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/manager/NoOpMethodResultCache.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/manager/NoOpMethodResultCache.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/manager/NoOpMethodResultCache.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.manager;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/manager/package.html
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/manager/package.html?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/manager/package.html (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/manager/package.html Fri Oct 20 05:20:01 2006
@@ -1,5 +1,5 @@
 <!--
- Copyright 2001-2005 The Apache Software Foundation.
+ Copyright 2001-2006 The Apache Software Foundation.
 
  Licensed under the Apache License, Version 2.0 (the "License")
  you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/map/ColumnMap.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/map/ColumnMap.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/map/ColumnMap.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/map/ColumnMap.java Fri Oct 20 05:20:01 2006
@@ -28,7 +28,7 @@
  * Note that this information should be set via the <Table>MapBuilder class and
  * not changed by applications. The set methods are only public because this
  * class needs them.
- * 
+ *
  * @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
  * @author <a href="mailto:greg.monroe@dukece.com">Greg Monroe</a>
  * @version $Id$
@@ -120,7 +120,7 @@
 
     /**
      * Constructor.
-     * 
+     *
      * @param name The name of the column.
      * @param containingTable TableMap of the table this column is in.
      */
@@ -133,7 +133,7 @@
     /**
      * Makes sure that the column names don't include table prefixes. E.g.,
      * SCARAB_PROJECT.PROJECT_ID should be PROJECT_ID.
-     * 
+     *
      * @param name The name to check
      * @return The corrected name if needed or the same name if not.
      */
@@ -148,7 +148,7 @@
 
     /**
      * Get the name of a column.
-     * 
+     *
      * @return A String with the column name.
      */
     public String getColumnName()
@@ -158,7 +158,7 @@
 
     /**
      * Get the table name + column name.
-     * 
+     *
      * @return A String with the full column name.
      */
     public String getFullyQualifiedName()
@@ -168,7 +168,7 @@
 
     /**
      * Get the name of the table this column is in.
-     * 
+     *
      * @return A String with the table name.
      */
     public String getTableName()
@@ -178,7 +178,7 @@
 
     /**
      * Set the type of this column.
-     * 
+     *
      * @param type An Object specifying the type.
      */
     public void setType(Object type)
@@ -188,7 +188,7 @@
 
     /**
      * Set the Torque type of this column.
-     * 
+     *
      * @param torqueType the Torque type of the column.
      */
     public void setTorqueType(String torqueType)
@@ -198,7 +198,7 @@
 
     /**
      * Set the size of this column.
-     * 
+     *
      * @param size An int specifying the size.
      */
     public void setSize(int size)
@@ -208,7 +208,7 @@
 
     /**
      * Set if this column is a primary key or not.
-     * 
+     *
      * @param pk True if column is a primary key.
      */
     public void setPrimaryKey(boolean pk)
@@ -218,7 +218,7 @@
 
     /**
      * Set if this column may be null.
-     * 
+     *
      * @param nn True if column may be null.
      */
     public void setNotNull(boolean nn)
@@ -228,7 +228,7 @@
 
     /**
      * Set the foreign key for this column.
-     * 
+     *
      * @param fullyQualifiedName The name of the table.column that is
      * foreign.
      */
@@ -250,7 +250,7 @@
 
     /**
      * Set the foreign key for this column.
-     * 
+     *
      * @param tableName The name of the table that is foreign.
      * @param columnName The name of the column that is foreign.
      */
@@ -272,7 +272,7 @@
     /**
      * Get the type of this column. Note that if usePrimitive is true, this may
      * need to be converted.
-     * 
+     *
      * @return An Object specifying the type.
      */
     public Object getType()
@@ -281,8 +281,8 @@
     }
 
     /**
-     * Get the name of the Torque type of this column. 
-     * 
+     * Get the name of the Torque type of this column.
+     *
      * @return The name of the Torque type of this column.
      */
     public String getTorqueType()
@@ -293,14 +293,14 @@
     /**
      * The "precision" value from the XML
      * size="&lt;precision&gt;[,&lt;scale&gt;]"
-     * attribute. Where [,&lt;scale&gt;] is optional. 
-     * 
+     * attribute. Where [,&lt;scale&gt;] is optional.
+     *
      * If the size attribute has not been set in the XML, it will return 0.
      * <p>
-     * 
+     *
      * Note that the size="P,S" format should be replaced with size="P"
      * scale="S".
-     * 
+     *
      * @return An int specifying the size.
      */
     public int getSize()
@@ -310,7 +310,7 @@
 
     /**
      * Is this column a primary key?
-     * 
+     *
      * @return True if column is a primary key.
      */
     public boolean isPrimaryKey()
@@ -320,7 +320,7 @@
 
     /**
      * Is null value allowed ?
-     * 
+     *
      * @return True if column may be null.
      */
     public boolean isNotNull()
@@ -330,7 +330,7 @@
 
     /**
      * Is this column a foreign key?
-     * 
+     *
      * @return True if column is a foreign key.
      */
     public boolean isForeignKey()
@@ -340,7 +340,7 @@
 
     /**
      * Get the table.column that this column is related to.
-     * 
+     *
      * @return A String with the full name for the related column.
      */
     public String getRelatedName()
@@ -350,7 +350,7 @@
 
     /**
      * Get the table name that this column is related to.
-     * 
+     *
      * @return A String with the name for the related table.
      */
     public String getRelatedTableName()
@@ -360,7 +360,7 @@
 
     /**
      * Get the column name that this column is related to.
-     * 
+     *
      * @return A String with the name for the related column.
      */
     public String getRelatedColumnName()
@@ -373,7 +373,7 @@
      * definition. E.g., the value of the scale attribute or the scale portion
      * of a size="P,S" attribute. (Note: size="P,S" format is being
      * deprecated!).
-     * 
+     *
      * @return Returns the scale.
      */
     public int getScale()
@@ -392,7 +392,7 @@
     /**
      * Gets the Java Name for this column as defined in XML or created by
      * generator code.
-     * 
+     *
      * @return the Java Name.
      */
     public String getJavaName()
@@ -402,7 +402,7 @@
 
     /**
      * Sets the Java Name for this column.
-     * 
+     *
      * @param name the Java Name.
      */
     public void setJavaName(String name)
@@ -412,7 +412,7 @@
 
     /**
      * Returns whether this column is an autoincrement column.
-     * 
+     *
      * @return true if this column is an autoIncrement column, false otherwise.
      */
     public boolean isAutoIncrement()
@@ -422,7 +422,7 @@
 
     /**
      * Sets whether this column is an autoincrement column.
-     * 
+     *
      * @param autoIncrement whether this colimn is an autoincrement column.
      */
     public void setAutoIncrement(boolean autoIncrement)
@@ -432,7 +432,7 @@
 
     /**
      * A string representing the default value defined for this column.
-     * 
+     *
      * @return The default value of this column, if any.
      */
     public String getDefault()
@@ -442,7 +442,7 @@
 
     /**
      * Sets the default value for this column.
-     * 
+     *
      * @param defaultValue The defaultValue to set.
      */
     public void setDefault(String defaultValue)
@@ -452,7 +452,7 @@
 
     /**
      * Returns the column description info.
-     * 
+     *
      * @return the description, if any.
      */
     public String getDescription()
@@ -462,7 +462,7 @@
 
     /**
      * Sets the description for this column.
-     * 
+     *
      * @param description The description to set.
      */
     public void setDescription(String description)
@@ -472,8 +472,8 @@
 
     /**
      * Get the inheritance information associated with this column,
-     * 
-     * @return Returns an array of associated inheritanceMap. 
+     *
+     * @return Returns an array of associated inheritanceMap.
      *         The array is in XML order.
      */
     public InheritanceMap[] getInheritanceMaps()
@@ -493,7 +493,7 @@
 
     /**
      * Add an associated inheritance mapping.
-     * 
+     *
      * @param map The inheritanceMap to associate with this column.
      */
     public void addInheritanceMap(InheritanceMap map)
@@ -504,7 +504,7 @@
 
     /**
      * Gets the inheritance type used.
-     * 
+     *
      * @return the inheritance type used.
      */
     public String getInheritance()
@@ -514,7 +514,7 @@
 
     /**
      * Sets the inheritance type.
-     * 
+     *
      * @param inheritanceType The inheritance type to set.
      */
     public void setInheritance(String inheritanceType)
@@ -523,9 +523,9 @@
     }
 
     /**
-     * Returns the input validator class name. 
+     * Returns the input validator class name.
      * (This property is in the DTD, but currently not used by Torque?)
-     * 
+     *
      * @return Returns the inputValidator.
      */
     public String getInputValidator()
@@ -535,7 +535,7 @@
 
     /**
      * Sets the input validator class name.
-     * 
+     *
      * @param inputValidator The inputValidator to set.
      */
     public void setInputValidator(String inputValidator)
@@ -544,9 +544,9 @@
     }
 
     /**
-     * Returns whether getters and setters are generated with the 
+     * Returns whether getters and setters are generated with the
      * access modifier "protected" rather than "public".
-     * 
+     *
      * @return whether the accessors should be protected rather than public.
      */
     public boolean isProtected()
@@ -555,9 +555,9 @@
     }
 
     /**
-     * Sets whether getters and setters should be generated with the 
+     * Sets whether getters and setters should be generated with the
      * access modifier "protected" rather than "public".
-     * 
+     *
      * @param isProtected whether getters and setters for this column
      *        are protected.
      */
@@ -568,7 +568,7 @@
 
     /**
      * Returns whether this column is a primary key.
-     * 
+     *
      * @return whether this column is a primary key.
      */
     public boolean isPk()
@@ -578,7 +578,7 @@
 
     /**
      * Sets whether this column is a primary key.
-     * 
+     *
      * @param pk whether this column is a primary key.
      */
     public void setPk(boolean pk)
@@ -588,7 +588,7 @@
 
     /**
      * Returns whether this column uses inheritance subclasses.
-     * 
+     *
      * @return true if inheritance subclasses are used, false otherwise.
      */
     public boolean isUseInheritance()
@@ -598,7 +598,7 @@
 
     /**
      * Sets whether this column uses inheritance subclasses.
-     * 
+     *
      * @param useInheritance whether this column uses Inheritance subclasses.
      */
     public void setUseInheritance(boolean useInheritance)
@@ -608,10 +608,10 @@
 
     /**
      * Get the inheritance map with the specified key.
-     * 
+     *
      * @param key the key of the inheritance map.
-     * @return the inheritance map with the specified key, or null if no 
-     *         inheritance map with the specified key exists in this column. 
+     * @return the inheritance map with the specified key, or null if no
+     *         inheritance map with the specified key exists in this column.
      */
     public InheritanceMap getInheritanceMap(String key)
     {
@@ -620,7 +620,7 @@
 
     /**
      * Returns whether this colum uses primitive values rather than objects.
-     * 
+     *
      * @return true if this colum uses primitive values, false if it uses
      *         objects.
      */
@@ -631,8 +631,8 @@
 
     /**
      * Sets whether this colum uses primitive values rather than objects.
-     * 
-     * @param usePrimitive whether primitive objects are used 
+     *
+     * @param usePrimitive whether primitive objects are used
      *        rather than objects.
      */
     public void setUsePrimitive(boolean usePrimitive)
@@ -642,7 +642,7 @@
 
     /**
      * Returns the Java naming method for this column.
-     * 
+     *
      * @return the javaNamingMethod for this column.
      */
     public String getJavaNamingMethod()
@@ -652,7 +652,7 @@
 
     /**
      * Sets the java naming method for this column.
-     * 
+     *
      * @param javaNamingMethod The javaNamingMethod to set.
      */
     public void setJavaNamingMethod(String javaNamingMethod)
@@ -662,7 +662,7 @@
 
     /**
      * Returns the map for the table this column belongs to.
-     * 
+     *
      * @return the table map for this column.
      */
     public TableMap getTable()
@@ -671,9 +671,9 @@
     }
 
     /**
-     * Returns the position (one based) of this column in the table. 
+     * Returns the position (one based) of this column in the table.
      * XML order is preserved.
-     * 
+     *
      * @return The position of this column, one-based.
      */
     public int getPosition()
@@ -683,7 +683,7 @@
 
     /**
      * Sets the position (one based) of this column in the table.
-     * 
+     *
      * @param position The position to set.
      */
     public void setPosition(int position)
@@ -693,7 +693,7 @@
 
     /**
      * Returns the java type of this column.
-     * 
+     *
      * @return the javaType.
      */
     public String getJavaType()
@@ -703,11 +703,11 @@
 
     /**
      * Sets the java type of this column.
-     * 
+     *
      * @param javaType The javaType to set.
      */
     public void setJavaType(String javaType)
     {
         this.javaType = javaType;
     }
-}
\ No newline at end of file
+}

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/map/DatabaseMap.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/map/DatabaseMap.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/map/DatabaseMap.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/map/DatabaseMap.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.map;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -51,28 +51,28 @@
      * The character which separates the schema name from the table name
      */
     char SCHEMA_SEPARATOR_CHAR = '.';
-    
-    /** 
-     * Format used to create create the class name for initializing a DB 
-     * specific map 
+
+    /**
+     * Format used to create create the class name for initializing a DB
+     * specific map
      */
-    public static final String INIT_CLASS_NAME_FORMAT = 
+    public static final String INIT_CLASS_NAME_FORMAT =
                                 "org.apache.torque.linkage.{0}MapInit";
-    
-    public static String[] eMsgs = { 
-        "Invalid Torque OM setup for Database \"{0}\".\n"+
-            "Database Map initialization class, \"{1}\","+" " +
-            "could not be found in your classpath.",
-        "Invalid Torque OM setup for Database \"{0}\".\n"+
-            "A class that the Database Map initialization class, \"{1}\", "+
-            "depends on could not be found.",
-        "Invalid Torque OM setup for Database \"{0}\".\n"+
-            "Something unexpected happened doing Class.forName(\"{1}\").  "+
-            "See the nested exception for details.",
-        "Invalid Torque OM setup for Database \"{0}\".\n"+
-            "An error occured invoking the init() method in class, \"{1}\""
+
+    public static String[] eMsgs = {
+        "Invalid Torque OM setup for Database \"{0}\".\n"
+        + "Database Map initialization class, \"{1}\"," + " " 
+        + "could not be found in your classpath.",
+        "Invalid Torque OM setup for Database \"{0}\".\n"
+        + "A class that the Database Map initialization class, \"{1}\", "
+        + "depends on could not be found.",
+        "Invalid Torque OM setup for Database \"{0}\".\n"
+        + "Something unexpected happened doing Class.forName(\"{1}\").  "
+        + "See the nested exception for details.",
+        "Invalid Torque OM setup for Database \"{0}\".\n"
+        + "An error occured invoking the init() method in class, \"{1}\""
     };
-    
+
     /** The serialVersionUID for this class. */
     private static final long serialVersionUID = 955251837095032274L;
 
@@ -93,7 +93,7 @@
 
     /** The IdGenerators, keyed by type of idMethod. */
     private HashMap idGenerators;
-    
+
     /** Flag indicating that all tables have been loaded via initialize() */
     boolean isInitialized = false;
 
@@ -176,7 +176,7 @@
      *
      * @return An IDBroker.
      * @deprecated Will be removed in a future version of Torque.
-     *             Use DatabaseInfo#getIdBroker() instead 
+     *             Use DatabaseInfo#getIdBroker() instead
      *             to access the IDBroker.
      */
     public IDBroker getIDBroker()
@@ -188,7 +188,7 @@
      * Get the name of this database.
      *
      * @return A String.
-     * @deprecated Will be removed in a future version of Torque. 
+     * @deprecated Will be removed in a future version of Torque.
      *             Use the name of the corresponding database instead.
      */
     public String getName()
@@ -200,8 +200,8 @@
      * Get a TableMap for the table by name. <p>
      *
      * Note that by default Torque uses lazy initialization to minimize
-     * memory usage and startup time.  However, if an OM or PEER class 
-     * has not called the table's MapBuilder class, it will not be here. 
+     * memory usage and startup time.  However, if an OM or PEER class
+     * has not called the table's MapBuilder class, it will not be here.
      * See the optional initialize method if you need full OM Mapping.<p>
      *
      * @param name Name of the table.
@@ -214,10 +214,10 @@
 
     /**
      * Get a TableMap[] of all of the tables in the database.<P>
-     * 
+     *
      * Note that by default Torque uses lazy initialization to minimize
-     * memory usage and startup time.  However, if an OM or PEER class 
-     * has not called the table's MapBuilder class, it will not be here. 
+     * memory usage and startup time.  However, if an OM or PEER class
+     * has not called the table's MapBuilder class, it will not be here.
      * See the optional initialize method if you need full OM Mapping.<p>
      *
      * @return A TableMap[].
@@ -231,7 +231,7 @@
             int i = 0;
             while (it.hasNext())
             {
-                dbTables[i++] = (TableMap) it.next() ;
+                dbTables[i++] = (TableMap) it.next();
             }
         }
         return dbTables;
@@ -320,13 +320,13 @@
     {
         return (IdGenerator) idGenerators.get(type);
     }
-    
+
     /**
      * Creates the Idbroker for this DatabaseMap.
-     * If an IDBroker already exists for the DatabaseMap, the method 
+     * If an IDBroker already exists for the DatabaseMap, the method
      * does nothing.
      * @return true if a new IdBroker was created, false otherwise.
-     * @deprecated Will be removed in a future version of Torque. 
+     * @deprecated Will be removed in a future version of Torque.
      *             Use DatabaseInfo.startIdBroker() instead.
      */
     public synchronized boolean startIdBroker()
@@ -345,14 +345,14 @@
         }
         return false;
     }
-    
+
     /**
      * Fully populate this DatabaseMap with all the TablesMaps.  This
      * is only needed if the application needs to use the complete OM
      * mapping information.  Otherwise, the OM Mapping information
      * will be populated as needed by OM and Peer classes.  An example
      * of how to initialize the map info from the application:<p>
-     * 
+     *
      *   <code>
      *   DatabaseMap dbMap = Torque.getDatabaseMap( dbName );
      *   try {
@@ -361,54 +361,54 @@
      *      ... error handling
      *   }
      *   </code>
-     * 
-     * Note that Torque database names are case sensitive and this DB 
+     *
+     * Note that Torque database names are case sensitive and this DB
      * map must be retrieved with the exact name used in the XML schema.<p>
-     * 
-     * This uses Java reflection methods to locate and run the 
+     *
+     * This uses Java reflection methods to locate and run the
      * init() method of a class generated in the org.apache.torque.linkage
      * package with a name based on the XML Database name value, e.g.
-     * org.apache.torque.linkage.DefaultMapInit<p>  
-     * 
+     * org.apache.torque.linkage.DefaultMapInit<p>
+     *
      * Some misconfiguration situations that could cause this method to fail
      * are:<p>
-     * 
+     *
      * It was used with a Torque OM set of classes generated by V3.2 or older;
      * <br>
-     * The class(es) in the org.apache.torque.linkage package were not included 
+     * The class(es) in the org.apache.torque.linkage package were not included
      * with the other generated class files (e.g. the jar file creation process
      * only included com.* and not org.* files).<p>
-     * 
-     * @throws TorqueException If an error is encountered locating and calling 
+     *
+     * @throws TorqueException If an error is encountered locating and calling
      *                          the init method.
      */
     public synchronized void initialize() throws TorqueException
     {
-        if (isInitialized) 
+        if (isInitialized)
         {
             return;
-        }        
-        String initClassName = MessageFormat.format(INIT_CLASS_NAME_FORMAT, 
+        }
+        String initClassName = MessageFormat.format(INIT_CLASS_NAME_FORMAT,
                 new Object[] { javanameMethod(getName()) });
-        
+
         Class initClass = null;
-        try 
+        try
         {
             initClass = Class.forName(initClassName);
         }
         catch (ClassNotFoundException e)
         {
-            throw new TorqueException(MessageFormat.format(eMsgs[0], 
+            throw new TorqueException(MessageFormat.format(eMsgs[0],
                     new Object[] { getName(), initClassName }), e);
         }
         catch (LinkageError e)
         {
-            throw new TorqueException(MessageFormat.format(eMsgs[1], 
+            throw new TorqueException(MessageFormat.format(eMsgs[1],
                     new Object[] { getName(), initClassName }), e);
         }
         catch (Throwable e)
         {
-            throw new TorqueException(MessageFormat.format(eMsgs[2], 
+            throw new TorqueException(MessageFormat.format(eMsgs[2],
                     new Object[] { getName(), initClassName }), e);
         }
         try
@@ -418,21 +418,21 @@
         }
         catch (Exception e)
         {
-            throw new TorqueException(MessageFormat.format(eMsgs[3], 
+            throw new TorqueException(MessageFormat.format(eMsgs[3],
                     new Object[] { getName(), initClassName }), e);
         }
         isInitialized = true;
     }
-    
+
     /**
      * Converts a database schema name to java object name.  Operates
      * same as underscoreMethod but does not convert anything to
-     * lowercase.  This must match the javaNameMethod in the 
-     * JavaNameGenerator class in Generator code. 
+     * lowercase.  This must match the javaNameMethod in the
+     * JavaNameGenerator class in Generator code.
      *
      * @param schemaName name to be converted.
      * @return converted name.
-     * 
+     *
      * @see org.apache.torque.engine.database.model.NameGenerator
      */
     protected String javanameMethod(String schemaName)
@@ -460,4 +460,4 @@
         }
         return name.toString();
     }
-}
\ No newline at end of file
+}

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/map/InheritanceMap.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/map/InheritanceMap.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/map/InheritanceMap.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/map/InheritanceMap.java Fri Oct 20 05:20:01 2006
@@ -18,15 +18,15 @@
 
 /**
  * InheritanceMap is used to model OM inheritance classes.
- * 
+ *
  * @author <a href="mailto:greg.monroe@dukece.com">Greg Monroe</a>
  * @version $Id$
  */
 public class InheritanceMap
 {
-    /** 
-     * The value in the related column that is associated with 
-     * this information. 
+    /**
+     * The value in the related column that is associated with
+     * this information.
      */
     private String key;
 
@@ -35,8 +35,8 @@
      */
     private String className;
 
-    /** 
-     * The name of class which class name extends. 
+    /**
+     * The name of class which class name extends.
      * Retrieved via getExtends().
      */
     private String ancestor;
@@ -46,7 +46,7 @@
 
     /**
      * Create an inheritance map object.
-     * 
+     *
      * @param column The column this inheritance map belongs to.
      * @param key Key to determine which subclass applies
      * @param className package.Name of sub class to use for record.
@@ -64,7 +64,7 @@
     /**
      * Returns the ancestor class for the class described by this
      * InheritanceMap.
-     * 
+     *
      * @return the ancestor class for the class described by this
      *         InheritanceMap.
      */
@@ -75,8 +75,8 @@
 
     /**
      * Sets the ancestor class for the class described by this InheritanceMap.
-     * 
-     * @param ancestor The ancestor for the class described by this 
+     *
+     * @param ancestor The ancestor for the class described by this
      *        InheritanceMap.
      */
     public void setExtends(String ancestor)
@@ -86,7 +86,7 @@
 
     /**
      * Returns the class name for this InheritanceMap.
-     * 
+     *
      * @return The class name for this InheritanceMap.
      */
     public String getClassName()
@@ -96,7 +96,7 @@
 
     /**
      * Sets the class name for this InheritanceMap.
-     * 
+     *
      * @param className The className for this InheritanceMap.
      */
     public void setClassName(String className)
@@ -106,7 +106,7 @@
 
     /**
      * Returns the column this inheritance map belongs to.
-     * 
+     *
      * @return the column this inheritance map belongs to.
      */
     public ColumnMap getColumn()
@@ -116,7 +116,7 @@
 
     /**
      * Sets the column this inheritance map belongs to.
-     * 
+     *
      * @param column the column this inheritance map belongs to.
      */
     public void setColumn(ColumnMap column)
@@ -126,7 +126,7 @@
 
     /**
      * Returns the key by which this inheritanceMap is activated.
-     * 
+     *
      * @return The key by which this inheritanceMap is activated.
      */
     public String getKey()
@@ -136,11 +136,11 @@
 
     /**
      * Sets the key by which this inheritanceMap is activated.
-     * 
+     *
      * @param key The key by which this inheritanceMap is activated.
      */
     public void setKey(String key)
     {
         this.key = key;
     }
-}
\ No newline at end of file
+}

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/map/MapBuilder.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/map/MapBuilder.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/map/MapBuilder.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/map/MapBuilder.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.map;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/map/TableMap.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/map/TableMap.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/map/TableMap.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/map/TableMap.java Fri Oct 20 05:20:01 2006
@@ -42,7 +42,7 @@
     /** The list of valid ID generation methods. */
     protected static final String[] VALID_ID_METHODS =
     {
-            NATIVE, AUTO_INCREMENT, SEQUENCE, ID_BROKER, NO_ID_METHOD
+        NATIVE, AUTO_INCREMENT, SEQUENCE, ID_BROKER, NO_ID_METHOD
     };
 
     /** The columns in the table. XML Order is preserved. */
@@ -132,7 +132,7 @@
      * @param containingDB A DatabaseMap that this table belongs to.
      */
     public TableMap(String tableName,
-                    String prefix, 
+                    String prefix,
                     DatabaseMap containingDB)
     {
         this.tableName = tableName;
@@ -338,7 +338,7 @@
      *
      * @param columnName A String with the column name.
      * @param type An Object specifying the type.
-     * @deprecated Associated Column maps should be populated using it's 
+     * @deprecated Associated Column maps should be populated using it's
      *             set methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
@@ -354,7 +354,7 @@
      * @param type An Object specifying the type.
      * @param size An int specifying the size.
      * @param scale An int specifying the scale.
-     * @deprecated Associated Column maps should be populated using it's set 
+     * @deprecated Associated Column maps should be populated using it's set
      *             methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
@@ -369,7 +369,7 @@
      * @param columnName A String with the column name.
      * @param type An Object specifying the type.
      * @param size An int specifying the size.
-     * @deprecated Associated Column maps should be populated using it's set 
+     * @deprecated Associated Column maps should be populated using it's set
      *             methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
@@ -383,7 +383,7 @@
      *
      * @param columnName A String with the column name.
      * @param type An Object specifying the type.
-     * @deprecated Associated Column maps should be populated using it's set 
+     * @deprecated Associated Column maps should be populated using it's set
      *             methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
@@ -398,7 +398,7 @@
      * @param columnName A String with the column name.
      * @param type An Object specifying the type.
      * @param size An int specifying the size.
-     * @deprecated Associated Column maps should be populated using it's set 
+     * @deprecated Associated Column maps should be populated using it's set
      *             methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
@@ -414,12 +414,12 @@
      * @param type An Object specifying the type.
      * @param fkTable A String with the foreign key table name.
      * @param fkColumn A String with the foreign key column name.
-     * @deprecated Associated Column maps should be populated using it's set 
+     * @deprecated Associated Column maps should be populated using it's set
      *             methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
-    public void addForeignKey(String columnName, 
-                              Object type, 
+    public void addForeignKey(String columnName,
+                              Object type,
                               String fkTable,
                               String fkColumn)
     {
@@ -434,12 +434,12 @@
      * @param fkTable A String with the foreign key table name.
      * @param fkColumn A String with the foreign key column name.
      * @param size An int specifying the size.
-     * @deprecated Associated Column maps should be populated using it's set 
+     * @deprecated Associated Column maps should be populated using it's set
      *             methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
-    public void addForeignKey(String columnName, 
-                              Object type, 
+    public void addForeignKey(String columnName,
+                              Object type,
                               String fkTable,
                                String fkColumn,
                                int size)
@@ -454,13 +454,13 @@
      * @param type An Object specifying the type.
      * @param fkTable A String with the foreign key table name.
      * @param fkColumn A String with the foreign key column name.
-     * @deprecated Associated Column maps should be populated using it's set 
+     * @deprecated Associated Column maps should be populated using it's set
      *             methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
-    public void addForeignPrimaryKey(String columnName, 
+    public void addForeignPrimaryKey(String columnName,
                                      Object type,
-                                     String fkTable, 
+                                     String fkTable,
                                      String fkColumn)
     {
         addColumn(columnName, type, true, fkTable, fkColumn, 0);
@@ -474,14 +474,14 @@
      * @param fkTable A String with the foreign key table name.
      * @param fkColumn A String with the foreign key column name.
      * @param size An int specifying the size.
-     * @deprecated Associated Column maps should be populated using it's set 
+     * @deprecated Associated Column maps should be populated using it's set
      *             methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
-    public void addForeignPrimaryKey(String columnName, 
+    public void addForeignPrimaryKey(String columnName,
                                      Object type,
-                                     String fkTable, 
-                                     String fkColumn, 
+                                     String fkTable,
+                                     String fkColumn,
                                      int size)
     {
         addColumn(columnName, type, true, fkTable, fkColumn, size);
@@ -496,15 +496,15 @@
      * @param fkTable A String with the foreign key table name.
      * @param fkColumn A String with the foreign key column name.
      * @param size An int specifying the size.
-     * @deprecated Associated Column maps should be populated using it's set 
+     * @deprecated Associated Column maps should be populated using it's set
      *             methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
-    private void addColumn(String name, 
-                           Object type, 
+    private void addColumn(String name,
+                           Object type,
                            boolean pk,
-                           String fkTable, 
-                           String fkColumn, 
+                           String fkTable,
+                           String fkColumn,
                            int size)
     {
         addColumn(name, type, pk, fkTable, fkColumn, size, 0);
@@ -520,16 +520,16 @@
      * @param fkColumn A String with the foreign key column name.
      * @param size An int specifying the size.
      * @param scale An int specifying the scale.
-     * @deprecated Associated Column maps should be populated using it's set 
+     * @deprecated Associated Column maps should be populated using it's set
      *             methods, then added to table via addColumn(ColumnMap).
      *             This method will be removed in a future version of Torque.
      */
-    private void addColumn(String name, 
-                           Object type, 
+    private void addColumn(String name,
+                           Object type,
                            boolean pk,
-                           String fkTable, 
-                           String fkColumn, 
-                           int size, 
+                           String fkTable,
+                           String fkColumn,
+                           int size,
                            int scale)
     {
         // If the tablename is prefixed with the name of the column,
@@ -600,7 +600,7 @@
      * @param data A String.
      * @return True if prefix is contained in data.
      */
-    private final boolean hasPrefix(String data)
+    private boolean hasPrefix(String data)
     {
         return (data.indexOf(getPrefix()) != -1);
     }
@@ -611,7 +611,7 @@
      * @param data A String.
      * @return A String with data, but with prefix removed.
      */
-    private final String removePrefix(String data)
+    private String removePrefix(String data)
     {
         return data.substring(getPrefix().length());
     }
@@ -649,7 +649,7 @@
 
     /**
      * Returns the table description info.
-     * 
+     *
      * @return Returns the description.
      */
     public String getDescription()
@@ -659,7 +659,7 @@
 
     /**
      * Sets the table description.
-     * 
+     *
      * @param description The description to set.
      */
     public void setDescription(String description)
@@ -668,8 +668,8 @@
     }
 
     /**
-     * Returns the OM class for this table. 
-     * 
+     * Returns the OM class for this table.
+     *
      * @return the OM class.
      */
     public Class getOMClass()
@@ -679,7 +679,7 @@
 
     /**
      * Sets the OM root class for this table.
-     * 
+     *
      * @param omClass The OM root class for this table.
      */
     public void setOMClass(Class omClass)
@@ -689,7 +689,7 @@
 
     /**
      * Returns the Peer Class for this table.
-     * 
+     *
      * @return The peerClass for this table.
      */
     public Class getPeerClass()
@@ -699,7 +699,7 @@
 
     /**
      * Sets the Peer class for this table.
-     * 
+     *
      * @param peerClass The peerClass to set.
      */
     public void setPeerClass(Class peerClass)
@@ -709,7 +709,7 @@
 
     /**
      * Returns the database map for this table.
-     * 
+     *
      * @return the database map for this table.
      */
     public DatabaseMap getDbMap()
@@ -719,7 +719,7 @@
 
     /**
      * Returns whether this table uses inheritance.
-     * 
+     *
      * @return whether inheritance is used.
      */
     public boolean isUseInheritance()
@@ -729,7 +729,7 @@
 
     /**
      * Sets whether this table uses inheritance.
-     * 
+     *
      * @param useInheritance whether this table uses inheritance.
      */
     public void setUseInheritance(boolean useInheritance)
@@ -739,7 +739,7 @@
 
     /**
      * Returns whether managers are used for this table.
-     * 
+     *
      * @return whether managers are used for this table.
      */
     public boolean isUseManager()
@@ -749,7 +749,7 @@
 
     /**
      * Sets whether managers are used for this table.
-     * 
+     *
      * @param useManager whether managers are used for this table.
      */
     public void setUseManager(boolean useManager)
@@ -759,7 +759,7 @@
 
     /**
      * Returns the manager class for this table.
-     * 
+     *
      * @return the managerClass.
      */
     public Class getManagerClass()
@@ -769,11 +769,11 @@
 
     /**
      * Sets the manager class for this table.
-     * 
+     *
      * @param managerClass the manager class for this table.
      */
     public void setManagerClass(Class managerClass)
     {
         this.managerClass = managerClass;
     }
-}
\ No newline at end of file
+}

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/map/package.html
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/map/package.html?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/map/package.html (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/map/package.html Fri Oct 20 05:20:01 2006
@@ -1,5 +1,5 @@
 <!--
- Copyright 2001-2005 The Apache Software Foundation.
+ Copyright 2001-2006 The Apache Software Foundation.
 
  Licensed under the Apache License, Version 2.0 (the "License")
  you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/oid/AutoIncrementIdGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/oid/AutoIncrementIdGenerator.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/oid/AutoIncrementIdGenerator.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/oid/AutoIncrementIdGenerator.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.oid;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/oid/IDBroker.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/oid/IDBroker.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/oid/IDBroker.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/oid/IDBroker.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.oid;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -181,13 +181,13 @@
 
     /**
      * constructs an IdBroker for the given Database.
-     * @param database the database where this IdBroker is running in. 
+     * @param database the database where this IdBroker is running in.
      */
     public IDBroker(Database database)
     {
         this(database.getName());
     }
-    
+
     /**
      * Creates an IDBroker for the ID table.
      *
@@ -199,9 +199,9 @@
     {
         this(tMap.getDatabaseMap().getName());
     }
-    
+
     /**
-     * Constructor. 
+     * Constructor.
      * Provided as long as both Constructors, IDBroker(DatabaseInfo) and
      * IDBroker(TableMap), are around.
      * @param databaseName the name of the database for which this IdBroker
@@ -235,7 +235,7 @@
         }
         catch (Throwable t)
         {
-            log.error("Could not open a connection to the database " 
+            log.error("Could not open a connection to the database "
                     + databaseName,
                     t);
             transactionsSupported = false;

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/oid/IDGeneratorFactory.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/oid/IDGeneratorFactory.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/oid/IDGeneratorFactory.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/oid/IDGeneratorFactory.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.oid;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/oid/IdGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/oid/IdGenerator.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/oid/IdGenerator.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/oid/IdGenerator.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.oid;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/oid/SequenceIdGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/oid/SequenceIdGenerator.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/oid/SequenceIdGenerator.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/oid/SequenceIdGenerator.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.oid;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/om/BaseObject.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/om/BaseObject.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/om/BaseObject.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/om/BaseObject.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.om;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -163,10 +163,10 @@
     /**
      * Retrieves a field from the object by name. Must be overridden if called.
      * BaseObject's implementation will throw an Error.
-     * 
+     *
      * @param field The name of the field to retrieve.
      * @return The retrieved field value
-     * 
+     *
      */
     public Object getByName(String field)
     {
@@ -175,7 +175,7 @@
 
     /**
      * Set a field in the object by field (Java) name.
-     * 
+     *
      * @param name field name
      * @param value field value
      * @return True if value was set, false if not (invalid name / protected
@@ -193,7 +193,7 @@
     /**
      * Retrieves a field from the object by name passed in as a String. Must be
      * overridden if called. BaseObject's implementation will throw an Error.
-     * 
+     *
      * @param name field name
      * @return value of the field
      */
@@ -204,7 +204,7 @@
 
     /**
      * Set field values by Peer Field Name
-     * 
+     *
      * @param name field name
      * @param value field value
      * @return True if value was set, false if not (invalid name / protected
@@ -223,7 +223,7 @@
      * Retrieves a field from the object by position as specified in a database
      * schema for example. Must be overridden if called. BaseObject's
      * implementation will throw an Error.
-     * 
+     *
      * @param pos field position
      * @return value of the field
      */
@@ -234,7 +234,7 @@
 
     /**
      * Set field values by it's position (zero based) in the XML schema.
-     * 
+     *
      * @param position The field position
      * @param value field value
      * @return True if value was set, false if not (invalid position / protected
@@ -248,13 +248,13 @@
     {
         throw new Error("BaseObject.setByPosition: " + NOT_IMPLEMENTED);
     }
-    
+
     /**
      * Compares this with another <code>BaseObject</code> instance. If
      * <code>obj</code> is an instance of <code>BaseObject</code>,
      * delegates to <code>equals(BaseObject)</code>. Otherwise, returns
      * <code>false</code>.
-     * 
+     *
      * @param obj The object to compare to.
      * @return Whether equal to the object specified.
      */
@@ -274,7 +274,7 @@
      * Compares the primary key of this instance with the key of another.
      *
      * @param bo The object to compare to.
-     * @return   Whether the primary keys are equal and the object have the 
+     * @return   Whether the primary keys are equal and the object have the
      *           same class.
      */
     public boolean equals(BaseObject bo)
@@ -346,10 +346,10 @@
      * @see org.apache.torque.om.Persistent#save(Connection)
      */
     public abstract void save(Connection con) throws Exception;
-    
+
     /**
-     * Retrieves the TableMap object related to this Table data. 
-     * Must be overridden in generated classes.  If BaseObject's 
+     * Retrieves the TableMap object related to this Table data.
+     * Must be overridden in generated classes.  If BaseObject's
      * implementation is called it will throw an Error.
      *
      * @return The associated TableMap object.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/om/ComboKey.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/om/ComboKey.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/om/ComboKey.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/om/ComboKey.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.om;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/om/DateKey.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/om/DateKey.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/om/DateKey.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/om/DateKey.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.om;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/om/NumberKey.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/om/NumberKey.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/om/NumberKey.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/om/NumberKey.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.om;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/om/ObjectKey.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/om/ObjectKey.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/om/ObjectKey.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/om/ObjectKey.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.om;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/om/Persistent.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/om/Persistent.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/om/Persistent.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/om/Persistent.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.om;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/om/SimpleKey.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/om/SimpleKey.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.om;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/om/StringKey.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/om/StringKey.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/om/StringKey.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/om/StringKey.java Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.om;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/om/package.html
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/om/package.html?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/om/package.html (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/om/package.html Fri Oct 20 05:20:01 2006
@@ -1,5 +1,5 @@
 <!--
- Copyright 2001-2005 The Apache Software Foundation.
+ Copyright 2001-2006 The Apache Software Foundation.
 
  Licensed under the Apache License, Version 2.0 (the "License")
  you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/BasePeer.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/util/BasePeer.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.util;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -485,7 +485,7 @@
         DatabaseMap dbMap = database.getDatabaseMap();
         TableMap tableMap = dbMap.getTable(table);
         Object keyInfo = tableMap.getPrimaryKeyMethodInfo();
-        IdGenerator keyGen 
+        IdGenerator keyGen
                 = database.getIdGenerator(tableMap.getPrimaryKeyMethod());
 
         ColumnMap pk = getPrimaryKey(criteria);
@@ -730,8 +730,8 @@
     {
         Query query = createQuery(criteria);
         DB dbadapter = Torque.getDB(criteria.getDbName());
-        
-        // Call Village depending on the capabilities of the DB 
+
+        // Call Village depending on the capabilities of the DB
         return executeQuery(query.toString(),
                 dbadapter.supportsNativeOffset() ? 0 : criteria.getOffset(),
                 dbadapter.supportsNativeLimit() ? -1 : criteria.getLimit(),
@@ -1525,10 +1525,10 @@
      * If yes, the query values are mapped onto values the database
      * does understand, i.e. 0 and 1 for booleanints and N and Y for
      * booleanchar columns.
-     * 
+     *
      * Limitations: The method does not yet check for criterions which contain
      * other criterions.
-     * 
+     *
      * @param criteria The criteria to be checked for booleanint and booleanchar
      *        columns.
      * @param defaultTableMap the table map to be used if the table name is
@@ -1537,7 +1537,7 @@
      *         retrieved.
      */
     public static void correctBooleans(
-            Criteria criteria, 
+            Criteria criteria,
             TableMap defaultTableMap)
         throws TorqueException
     {
@@ -1573,7 +1573,7 @@
                     Map aliases = criteria.getAliases();
                     if (aliases != null && aliases.get(tableName) != null)
                     {
-                        tableName = (String)aliases.get(tableName);
+                        tableName = (String) aliases.get(tableName);
                         tableMap = databaseMap.getTable(tableName);
                     }
                 }
@@ -1583,7 +1583,7 @@
                     break;
                 }
             }
-            
+
             ColumnMap columnMap = tableMap.getColumn(columnName);
             if (columnMap != null)
             {
@@ -1594,7 +1594,7 @@
                     {
                         Boolean booleanValue = (Boolean) criterionValue;
                         criteria.add(
-                                key, 
+                                key,
                                 Boolean.TRUE.equals(booleanValue) ? 1 : 0);
                     }
                 }
@@ -1605,7 +1605,7 @@
                     {
                         Boolean booleanValue = (Boolean) criterionValue;
                         criteria.add(
-                                key, 
+                                key,
                                 Boolean.TRUE.equals(booleanValue) ? "Y" : "N");
                     }
                 }
@@ -1635,7 +1635,7 @@
         DatabaseMap dbMap = Torque.getDatabaseMap(dbName);
 
         // create the statements for the tables
-        for (Iterator it = tables.iterator(); it.hasNext(); )
+        for (Iterator it = tables.iterator(); it.hasNext();)
         {
             String table = (String) it.next();
             KeyDef kd = new KeyDef();

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/CountHelper.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/util/CountHelper.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.util;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -47,9 +47,9 @@
      * @return number of rows matching the query provided
      * @throws TorqueException if the query could not be executed
      */
-    public int count( Criteria c ) throws TorqueException
+    public int count(Criteria c) throws TorqueException
     {
-        return count( c, null, "*" );
+        return count(c, null, "*");
     }
 
     /**
@@ -64,9 +64,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 ) throws TorqueException
+    public int count(Criteria c, Connection conn) throws TorqueException
     {
-        return count( c, conn, "*" );
+        return count(c, conn, "*");
     }
 
     /**
@@ -78,10 +78,10 @@
      * @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 );
+        return count(c, null, columnName);
     }
 
     /**
@@ -94,7 +94,7 @@
      * @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. */
@@ -106,35 +106,38 @@
         criteriaSelectModifiers = c.getSelectModifiers();
 
         boolean distinct = false;
-        if( criteriaSelectModifiers != null &&
-            criteriaSelectModifiers.size() > 0 &&
-            criteriaSelectModifiers.contains( SqlEnum.DISTINCT.toString() ) )
-    	{
-            criteriaSelectModifiers.remove( SqlEnum.DISTINCT.toString() );
+        if (criteriaSelectModifiers != null
+            && criteriaSelectModifiers.size() > 0
+            && criteriaSelectModifiers.contains(SqlEnum.DISTINCT.toString()))
+        {
+            criteriaSelectModifiers.remove(SqlEnum.DISTINCT.toString());
             distinct = true;
         }
 
-        StringBuffer countStr = new StringBuffer( "COUNT(" );
-        countStr.append( distinct == true ? SqlEnum.DISTINCT.toString() : "" );
-        countStr.append( columnName );
-        countStr.append( ")" );
+        StringBuffer countStr = new StringBuffer("COUNT(");
+        countStr.append(distinct ? SqlEnum.DISTINCT.toString() : "");
+        countStr.append(columnName);
+        countStr.append(")");
 
-        c.addSelectColumn( countStr.toString() );
+        c.addSelectColumn(countStr.toString());
 
         List result;
-        if( conn == null )
+        if (conn == null)
         {
-            result = BasePeer.doSelect( c );
+            result = BasePeer.doSelect(c);
         }
         else
-    	{
-            result = BasePeer.doSelect( c, conn );
+        {
+            result = BasePeer.doSelect(c, conn);
         }
+
         Record record = (Record) result.get(0);
-        try {
+        try
+        {
             return record.getValue(1).asInt();
         }
-        catch (DataSetException e) {
+        catch (DataSetException e)
+        {
             throw new TorqueException(e);
         }
     }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.util;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -1354,7 +1354,7 @@
         {
             joins = new ArrayList(3);
         }
-        joins.add(new Join(left,right, operator));
+        joins.add(new Join(left, right, operator));
 
         return this;
     }

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/JoinBuilder.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/util/JoinBuilder.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.util;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/util/LargeSelect.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.util;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -136,7 +136,7 @@
 {
     /** Serial version */
     private static final long serialVersionUID = -1166842932571491942L;
-    
+
     /** The number of records that a page consists of.  */
     private int pageSize;
     /** The maximum number of records to maintain in memory. */
@@ -674,9 +674,9 @@
         boolean dbSupportsNativeOffset;
         try
         {
-            dbSupportsNativeLimit 
+            dbSupportsNativeLimit
                     = (Torque.getDB(dbName).supportsNativeLimit());
-            dbSupportsNativeOffset 
+            dbSupportsNativeOffset
                     = (Torque.getDB(dbName).supportsNativeOffset());
         }
         catch (TorqueException e)
@@ -686,17 +686,17 @@
             // correctly
             return;
         }
-        
+
         int size;
         if (dbSupportsNativeLimit && dbSupportsNativeOffset)
         {
             // retrieve one page at a time
             size = pageSize;
         }
-        else 
+        else
         {
             // retrieve the whole block at once and add the offset,
-            // and add one record to check if we have reached the end of the 
+            // and add one record to check if we have reached the end of the
             // data
             size = blockBegin + memoryLimit + 1;
         }
@@ -717,7 +717,7 @@
                 if (dbSupportsNativeOffset)
                 {
                     criteria.setOffset(blockBegin);
-                    // Add 1 to memory limit to check if the query ends on a 
+                    // Add 1 to memory limit to check if the query ends on a
                     // page break.
                     criteria.setLimit(memoryLimit + 1);
                 }
@@ -768,7 +768,7 @@
                 List tempResults
                         = BasePeer.getSelectResults(qds, size, false);
 
-                int startIndex = dbSupportsNativeOffset ? 0 : blockBegin;  
+                int startIndex = dbSupportsNativeOffset ? 0 : blockBegin;
 
                 synchronized (results)
                 {
@@ -786,14 +786,14 @@
                 {
                     currentlyFilledTo = tempResults.size() - 1 - blockBegin;
                 }
-                
+
                 boolean perhapsLastPage = true;
 
                 // If the extra record was indeed found then we know we are not
                 // on the last page but we must now get rid of it.
-                if ((dbSupportsNativeLimit 
+                if ((dbSupportsNativeLimit
                         && (results.size() == memoryLimit + 1))
-                    || (!dbSupportsNativeLimit 
+                    || (!dbSupportsNativeLimit
                             && currentlyFilledTo >= memoryLimit))
                 {
                     synchronized (results)
@@ -810,7 +810,7 @@
                     totalRecords = blockBegin + currentlyFilledTo + 1;
                 }
 
-                // if the db has limited the datasets, we must retrieve all 
+                // if the db has limited the datasets, we must retrieve all
                 // datasets. If not, we are always finished because we fetch
                 // the whole block at once.
                 if (qds.allRecordsRetrieved()
@@ -1299,8 +1299,8 @@
             throws IOException, ClassNotFoundException
     {
         inputStream.defaultReadObject();
-        
-        // avoid NPE because of Tomcat de-serialization of sessions 
+
+        // avoid NPE because of Tomcat de-serialization of sessions
         if (Torque.isInit())
         {
             startQuery(pageSize);

Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/Query.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/util/Query.java?view=diff&rev=466087&r1=466086&r2=466087
==============================================================================
--- 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 Fri Oct 20 05:20:01 2006
@@ -1,7 +1,7 @@
 package org.apache.torque.util;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -316,7 +316,7 @@
             .append(FROM);
 
         boolean first = true;
-        for (Iterator it = fromTables.iterator(); it.hasNext(); )
+        for (Iterator it = fromTables.iterator(); it.hasNext();)
         {
             FromElement fromElement = (FromElement) it.next();
 
@@ -447,11 +447,13 @@
         public String toString()
         {
             StringBuffer result = new StringBuffer();
-            if (joinType != null) {
+            if (joinType != null)
+            {
                 result.append(joinType);
             }
             result.append(tableName);
-            if (joinCondition != null) {
+            if (joinCondition != null)
+            {
                 result.append(SqlEnum.ON);
                 result.append(joinCondition);
             }



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