mpoeschl    2002/07/16 11:05:38

  Modified:    src/templates/om Object.vm ObjectWithManager.vm
  Log:
  change commons.lang.Objects to ObjectUtils
  
  Revision  Changes    Path
  1.39      +9 -9      jakarta-turbine-torque/src/templates/om/Object.vm
  
  Index: Object.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/Object.vm,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Object.vm 23 Jun 2002 03:19:26 -0000      1.38
  +++ Object.vm 16 Jul 2002 18:05:38 -0000      1.39
  @@ -20,7 +20,7 @@
   import org.apache.torque.util.Criteria;
   import java.sql.Connection;
   #if ($addSaveMethod)
  -import org.apache.commons.lang.Objects;
  +import org.apache.commons.lang.ObjectUtils;
   #end
   #if ($addIntakeRetrievable)
   import org.apache.fulcrum.intake.Retrievable;
  @@ -31,7 +31,7 @@
      #set ( $className = $tblFK.JavaName )
      #if ($tblFK.Interface)
          #set ($className = $tblFK.Interface)
  -   #end 
  +   #end
   
      #if ($tblFK.Package != $package)
   import ${tblFK.Package}.${className};
  @@ -155,7 +155,7 @@
           if (this.$clo != v)
           {
    #else
  -        if (!Objects.equals(this.$clo, v))
  +        if (!ObjectUtils.equals(this.$clo, v))
           {
    #end
               this.$clo = v;
  @@ -171,7 +171,7 @@
               #set ( $colFK = $tblFK.getColumn($col.RelatedColumnName) )
               #if ($col.isMultipleFK() || $col.RelatedTableName.equals($table.Name))
                   #set ( $relCol = "" )
  -                  #foreach ($columnName in $col.foreignKey.LocalColumns)  
  +                  #foreach ($columnName in $col.foreignKey.LocalColumns)
                         #set ( $column = $table.getColumn($columnName) )
                         #set ( $relCol = "$relCol$column.JavaName" )
                     #end
  @@ -183,7 +183,7 @@
                 #set ( $varName = "a$tblFK.JavaName" )
               #end
   
  -        if ($varName != null && !Objects.equals(${varName}.get${colFK.JavaName}(), 
v))
  +        if ($varName != null && 
!ObjectUtils.equals(${varName}.get${colFK.JavaName}(), v))
           {
               $varName = null;
           }
  @@ -287,7 +287,7 @@
       #if ($cjtype == "short" || $cjtype == "int" || $cjtype == "long")
           #set ( $conditional = "$conditional${and}this.${clo}>0" )
       #else
  -        #set ( $conditional = "$conditional${and}!Objects.equals(this.${clo}, 
null)" )
  +        #set ( $conditional = "$conditional${and}!ObjectUtils.equals(this.${clo}, 
null)" )
       #end
       #set ( $arglist = "$arglist${comma}this.$clo" )
       #set ( $and = " && " )
  @@ -487,7 +487,7 @@
        * the collection. Otherwise returns the results of
        * get${relCol}(new Criteria(),Connection)
        * This method takes in the Connection also as input so that
  -     * referenced objects can also be obtained using a Connection 
  +     * referenced objects can also be obtained using a Connection
        * that is taken as input
        */
       public List get${relCol}(Connection con) throws TorqueException
  @@ -508,7 +508,7 @@
        * an empty collection or the current collection, the criteria
        * is ignored on a new object.
        * This method takes in the Connection also as input so that
  -     * referenced objects can also be obtained using a Connection 
  +     * referenced objects can also be obtained using a Connection
        * that is taken as input
        */
       public List get${relCol}(Criteria criteria,Connection con) throws 
TorqueException
  @@ -922,7 +922,7 @@
                }
                catch (Exception rollBackEx)
                {
  -                 throw new TorqueException(e.getMessage() 
  +                 throw new TorqueException(e.getMessage()
                        + "; a rollback exception ocurred when rolling back the error: 
"
                        + rollBackEx.getMessage(),
                        e);
  
  
  
  1.17      +101 -101  jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm
  
  Index: ObjectWithManager.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ObjectWithManager.vm      23 Jun 2002 03:19:26 -0000      1.16
  +++ ObjectWithManager.vm      16 Jul 2002 18:05:38 -0000      1.17
  @@ -21,7 +21,7 @@
   import org.apache.torque.util.Criteria;
   import java.sql.Connection;
   #if ($addSaveMethod)
  -import org.apache.commons.lang.Objects;
  +import org.apache.commons.lang.ObjectUtils;
   #end
   #if ($addIntakeRetrievable)
   import org.apache.fulcrum.intake.Retrievable;
  @@ -32,7 +32,7 @@
      #set ( $className = $tblFK.JavaName )
      #if ($tblFK.Interface)
          #set ($className = $tblFK.Interface)
  -   #end 
  +   #end
   
      #if ($tblFK.Package != $package)
   import ${tblFK.Package}.${className};
  @@ -41,7 +41,7 @@
      #end
   #end
   
  -/** 
  +/**
   #if ($addTimeStamp)
    * This class was autogenerated by Torque on:
    *
  @@ -49,7 +49,7 @@
    *
   #end
    * You should not use this class directly.  It should not even be
  - * extended all references should be to $table.JavaName 
  + * extended all references should be to $table.JavaName
    */
   public abstract class $basePrefix$table.JavaName $extendsBaseClass
   #if ($addIntakeRetrievable)
  @@ -57,8 +57,8 @@
   #end
   {
       /** The Peer class */
  -    private static final ${table.JavaName}Peer peer = 
  -        new ${table.JavaName}Peer(); 
  +    private static final ${table.JavaName}Peer peer =
  +        new ${table.JavaName}Peer();
   
       #if (!$table.isAlias())
         #foreach ($col in $table.Columns)
  @@ -67,7 +67,7 @@
           #set ($defVal = "")
           #if ($col.DefaultValue && !$col.DefaultValue.equalsIgnoreCase("NULL") )
             #set ( $quote = '' )
  -          #if ( $cjtype == "String" ) 
  +          #if ( $cjtype == "String" )
               #set ( $quote = '"' )
             #end
             #set ( $defaultValue = $col.DefaultValue )
  @@ -91,11 +91,11 @@
                     #set ( $defaultValue = "new ${cjtype}($defaultValue)" )
                 #end
                 #set ($defVal = "=$quote$defaultValue$quote")
  -          #end            
  +          #end
           #end
  -      
  -        /** 
  -         * The value for the $clo field 
  +
  +        /**
  +         * The value for the $clo field
            */
           private $cjtype $clo$defVal;
         #end
  @@ -104,7 +104,7 @@
           #set ( $cfc=$col.JavaName )
           #set ( $clo=$col.Name.toLowerCase() )
           #set ( $cjtype = $col.JavaNative )
  -    
  +
           /**
            * Get the $cfc
            * @return $cjtype
  @@ -118,7 +118,7 @@
           #if ($complexObjectModel)
             #if ($col.isForeignKey())
               #set ( $throwsClause = "throws TorqueException" )
  -          #end    
  +          #end
             #if ( $col.Referrers.size() > 0 )
               #if ($throwsClause == "")
                 #set ( $throwsClause = "throws TorqueException" )
  @@ -131,7 +131,7 @@
            */
           public void set${cfc}($cjtype v ) $throwsClause
           {
  -          #if ( ($cjtype == "NumberKey") 
  +          #if ( ($cjtype == "NumberKey")
                  || ($cjtype == "StringKey")
                  || ($cjtype == "DateKey") )
   
  @@ -145,18 +145,18 @@
                   // object is associated or defined.
                   v = null;
               }
  -          #end 
  +          #end
   
   
   #if ($addSaveMethod)
   
  - #if ( ($cjtype == "int") || ($cjtype == "long") || ($cjtype == "boolean") 
  + #if ( ($cjtype == "int") || ($cjtype == "long") || ($cjtype == "boolean")
       || ($cjtype == "short") || ($cjtype == "float") || ($cjtype == "double")
       || ($cjtype == "char") || ($cjtype == "byte") )
           if (this.$clo != v)
           {
    #else
  -        if ( !Objects.equals(this.$clo, v) )
  +        if ( !ObjectUtils.equals(this.$clo, v) )
           {
    #end
               this.$clo = v;
  @@ -172,11 +172,11 @@
               #set ($interfaceName = $tblFK.JavaName)
               #if ($tblFK.Interface)
                   #set ($interfaceName = $tblFK.Interface)
  -            #end    
  +            #end
               #set ( $colFK = $tblFK.getColumn($col.RelatedColumnName) )
               #if ($col.isMultipleFK() || $col.RelatedTableName.equals($table.Name))
                   #set ( $relCol = "" )
  -                  #foreach ($columnName in $col.foreignKey.LocalColumns)  
  +                  #foreach ($columnName in $col.foreignKey.LocalColumns)
                         #set ( $column = $table.getColumn($columnName) )
                         #set ( $relCol = "$relCol$column.JavaName" )
                     #end
  @@ -188,7 +188,7 @@
                 #set ( $varName = "a$interfaceName" )
               #end
   
  -        if ($varName != null &&  !Objects.equals(${varName}.get${colFK.JavaName}(), 
v) )
  +        if ($varName != null && 
!ObjectUtils.equals(${varName}.get${colFK.JavaName}(), v))
           {
               $varName = null;
           }
  @@ -215,7 +215,7 @@
                     }
                 }
               #end
  -          #end 
  +          #end
           #end
        }
   
  @@ -248,7 +248,7 @@
      #set ($interfaceName = $tblFK.JavaName)
      #if ($tblFK.Interface)
          #set ($interfaceName = $tblFK.Interface)
  -   #end    
  +   #end
   
      #set ( $relCol = "" )
      #foreach ($columnName in $fk.LocalColumns)
  @@ -293,7 +293,7 @@
       #if ($cjtype == "short" || $cjtype == "int" || $cjtype == "long")
           #set ( $conditional = "$conditional${and}get${column.JavaName}()>0" )
       #else
  -        #set ( $conditional = 
"$conditional${and}!Objects.equals(get${column.JavaName}(), null)" )
  +        #set ( $conditional = 
"$conditional${and}!ObjectUtils.equals(get${column.JavaName}(), null)" )
       #end
       #set ( $arglist = "$arglist${comma}get${column.JavaName}()" )
       #set ( $and = " && " )
  @@ -322,15 +322,15 @@
       }
   
       /**
  -     * Provides convenient way to set a relationship based on a 
  -     * ObjectKey.  e.g. 
  +     * Provides convenient way to set a relationship based on a
  +     * ObjectKey.  e.g.
        * <code>bar.setFooKey(foo.getPrimaryKey())</code>
        *
   #if ($fk.LocalColumns.size() > 1)
        * Note: It is important that the xml schema used to create this class
        * maintains consistency in the order of related columns between
  -     * $table.Name and ${tblFK.Name}.  
  -     * If for some reason this is impossible, this method should be 
  +     * $table.Name and ${tblFK.Name}.
  +     * If for some reason this is impossible, this method should be
        * overridden in <code>$table.JavaName</code>.
   #end
        */
  @@ -347,15 +347,15 @@
       #else
           #set ($colName = $fk.LocalColumns.get(0))
           #set ($col = $table.getColumn($colName) )
  -        set${col.JavaName}(($col.JavaNative)key);        
  +        set${col.JavaName}(($col.JavaNative)key);
       #end
       }
   
    #end   ## end of foreach loop over foreign keys
   
  - ## 
  + ##
    ## setup foreign key associations
  - ## 
  + ##
    #foreach ($fk in $table.Referrers)
     #set ( $tblFK = $fk.Table )
     #if ( !($tblFK.Name.equals($table.Name)) )
  @@ -400,7 +400,7 @@
      #set ($interfaceName = $table.JavaName)
      #if ($table.Interface)
          #set ($interfaceName = $table.Interface)
  -   #end    
  +   #end
   
       /**
        * Method called to associate a $tblFK.JavaName object to this object
  @@ -421,7 +421,7 @@
   
       /**
        * If this collection has already been initialized, returns
  -     * the collection. Otherwise returns the results of 
  +     * the collection. Otherwise returns the results of
        * get${relCol}(new Criteria())
        */
       public List get${relCol}() throws TorqueException
  @@ -435,28 +435,28 @@
   
       /**
        * If this collection has already been initialized with
  -     * an identical criteria, it returns the collection. 
  +     * an identical criteria, it returns the collection.
        * Otherwise if this $table.JavaName has previously
        * been saved, it will retrieve related ${relCol} from storage.
        * If this $table.JavaName is new, it will return
        * an empty collection or the current collection, the criteria
  -     * is ignored on a new object. 
  +     * is ignored on a new object.
        */
       public List get${relCol}(Criteria criteria) throws TorqueException
       {
           if ($collName == null)
           {
  -            if ( isNew() ) 
  +            if ( isNew() )
               {
  -               $collName = new ArrayList();       
  -            } 
  +               $collName = new ArrayList();
  +            }
               else
               {
      #foreach ($columnName in $fk.ForeignColumns)
          #set ( $column = $table.getColumn($columnName) )
          #set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
          #set ( $colFK = $tblFK.getColumn($colFKName) )
  -                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );               
  +                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );
      #end
                   $collName = ${className}Peer.doSelect(criteria);
               }
  @@ -464,7 +464,7 @@
           else
           {
               // criteria has no effect for a new object
  -            if ( !isNew() ) 
  +            if ( !isNew() )
               {
                   // the following code is to determine if a new query is
                   // called for.  If the criteria is the same as the last
  @@ -473,15 +473,15 @@
          #set ( $column = $table.getColumn($columnName) )
          #set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
          #set ( $colFK = $tblFK.getColumn($colFKName) )
  -                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );               
  +                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );
      #end
                   if ( !last${relCol}Criteria.equals(criteria)  )
                   {
  -                    $collName = ${className}Peer.doSelect(criteria);  
  +                    $collName = ${className}Peer.doSelect(criteria);
                   }
               }
           }
  -        last${relCol}Criteria = criteria; 
  +        last${relCol}Criteria = criteria;
   
           return $collName;
       }
  @@ -491,7 +491,7 @@
        * the collection. Otherwise returns the results of
        * get${relCol}(new Criteria(),Connection)
        * This method takes in the Connection also as input so that
  -     * referenced objects can also be obtained using a Connection 
  +     * referenced objects can also be obtained using a Connection
        * that is taken as input
        */
       public List get${relCol}(Connection con) throws TorqueException
  @@ -512,7 +512,7 @@
        * an empty collection or the current collection, the criteria
        * is ignored on a new object.
        * This method takes in the Connection also as input so that
  -     * referenced objects can also be obtained using a Connection 
  +     * referenced objects can also be obtained using a Connection
        * that is taken as input
        */
       public List get${relCol}(Criteria criteria,Connection con) throws 
TorqueException
  @@ -565,12 +565,12 @@
    #end
   
   ## ------------------------------------------------------------
  -## 
  +##
   
     #if ($countFK >= 1)
  -   #set ( $lastTable = "" ) 
  +   #set ( $lastTable = "" )
      #foreach ($fk2 in $tblFK.ForeignKeys)
  -   
  +
      ## Add join methods if the fk2 table is not this table or
      ## the fk2 table references this table multiple times.
   
  @@ -593,14 +593,14 @@
           #if ($column.isMultipleFK())
               #set($relatedByCol2 = "$relatedByCol2$column.JavaName")
           #end
  -    #end 
  +    #end
   
       #set ( $fkClassName = $tblFK2.JavaName )
       ## do not generate code for self-referencing fk's, it would be
       ## good to do, but it is just not implemented yet.
       #if ($className == $fkClassName)
           #set ( $doJoinGet = false )
  -    #end        
  +    #end
   
       #if ($relatedByCol2 == "")
           #set ( $relCol2 = $fkClassName )
  @@ -608,9 +608,9 @@
           #set ($relCol2 = "${fkClassName}RelatedBy$relatedByCol2")
       #end
   
  -    #if ( $relatedByCol == "") 
  -    #else   
  -        #if ( $relatedByCol.equals($relatedByCol2) ) 
  +    #if ( $relatedByCol == "")
  +    #else
  +        #if ( $relatedByCol.equals($relatedByCol2) )
              #set ( $doJoinGet = false )
           #end
       #end
  @@ -619,7 +619,7 @@
   
       /**
        * If this collection has already been initialized with
  -     * an identical criteria, it returns the collection. 
  +     * an identical criteria, it returns the collection.
        * Otherwise if this $table.JavaName is new, it will return
        * an empty collection; or if this $table.JavaName has previously
        * been saved, it will retrieve related ${relCol} from storage.
  @@ -628,22 +628,22 @@
        * api reasonable.  You can provide public methods for those you
        * actually need in ${table.JavaName}.
        */
  -    protected List get${relCol}Join${relCol2}(Criteria criteria) 
  +    protected List get${relCol}Join${relCol2}(Criteria criteria)
           throws TorqueException
       {
           if ($collName == null)
           {
  -            if ( isNew() ) 
  +            if ( isNew() )
               {
  -               $collName = new ArrayList();       
  -            } 
  +               $collName = new ArrayList();
  +            }
               else
               {
      #foreach ($columnName in $fk.ForeignColumns)
          #set ( $column = $table.getColumn($columnName) )
          #set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
          #set ( $colFK = $tblFK.getColumn($colFKName) )
  -                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );               
  +                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );
      #end
                   $collName = ${className}Peer.doSelectJoin${relCol2}(criteria);
               }
  @@ -658,14 +658,14 @@
          #set ( $column = $table.getColumn($columnName) )
          #set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
          #set ( $colFK = $tblFK.getColumn($colFKName) )
  -                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );               
  +                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );
      #end
               if ( !last${relCol}Criteria.equals(criteria)  )
               {
                   $collName = ${className}Peer.doSelectJoin${relCol2}(criteria);
               }
           }
  -        last${relCol}Criteria = criteria; 
  +        last${relCol}Criteria = criteria;
   
           return $collName;
       }
  @@ -677,7 +677,7 @@
   
       /**
        * If this collection has already been initialized with
  -     * an identical criteria, it returns the collection. 
  +     * an identical criteria, it returns the collection.
        * Otherwise if this $table.JavaName is new, it will return
        * an empty collection; or if this $table.JavaName has previously
        * been saved, it will retrieve related ${relCol} from storage.
  @@ -686,22 +686,22 @@
        * api reasonable.  You can provide public methods for those you
        * actually need in ${table.JavaName}.
        */
  -    protected List get${relCol}JoinAllExcept${table.JavaName}(Criteria criteria) 
  +    protected List get${relCol}JoinAllExcept${table.JavaName}(Criteria criteria)
           throws TorqueException
       {
           if ($collName == null)
           {
  -            if ( isNew() ) 
  +            if ( isNew() )
               {
  -               $collName = new ArrayList();       
  -            } 
  +               $collName = new ArrayList();
  +            }
               else
               {
      #foreach ($columnName in $fk.ForeignColumns)
          #set ( $column = $table.getColumn($columnName) )
          #set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
          #set ( $colFK = $tblFK.getColumn($colFKName) )
  -                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );               
  +                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );
      #end
                   $collName = 
${className}Peer.doSelectJoinAllExcept${table.JavaName}${suffix}(criteria);
               }
  @@ -716,20 +716,20 @@
          #set ( $column = $table.getColumn($columnName) )
          #set ( $colFKName = $fk.ForeignLocalMapping.get($columnName) )
          #set ( $colFK = $tblFK.getColumn($colFKName) )
  -                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );               
  +                criteria.add(${className}Peer.${colFK.Name.toUpperCase()}, 
get${column.JavaName}() );
      #end
               if ( !last${relCol}Criteria.equals(criteria)  )
               {
                   $collName = 
${className}Peer.doSelectJoinAllExcept${table.JavaName}${suffix}(criteria);
               }
           }
  -        last${relCol}Criteria = criteria; 
  +        last${relCol}Criteria = criteria;
   
           return $collName;
       }
   
     #end
  -  
  +
   *#
   ## ------------------------------------------------------------
   
  @@ -792,7 +792,7 @@
         #end
       }
       #end
  -        return null; 
  +        return null;
       }
       /**
        * Retrieves a field from the object by name passed in
  @@ -828,7 +828,7 @@
         #end
       }
       #end
  -        return null; 
  +        return null;
       }
   
       /**
  @@ -865,11 +865,11 @@
       }
       #set ($i = $i + 1)
       #end
  -        return null; 
  +        return null;
       }
   
   #end     ## ends the if(addGetByNameMethod)
  -    
  +
   
   #if (!$table.isAlias() && $addSaveMethod)
   
  @@ -902,7 +902,7 @@
        * Stores the object in the database.  If the object is new,
        * it inserts it; otherwise an update is performed.
   #if ($complexObjectModel)
  -     * Note: this code is here because the method body is 
  +     * Note: this code is here because the method body is
        * auto-generated conditionally and therefore needs to be
        * in this file instead of in the super class, BaseObject.
   #end
  @@ -924,7 +924,7 @@
                }
                catch (Exception rollBackEx)
                {
  -                 throw new TorqueException(e.getMessage() 
  +                 throw new TorqueException(e.getMessage()
                        + "; a rollback exception ocurred when rolling back the error: 
"
                        + rollBackEx.getMessage(),
                        e);
  @@ -956,7 +956,7 @@
                   BasePeer.closeConnection(con);
               }
           }
  -      
  +
    #end
       }
   
  @@ -981,7 +981,7 @@
   
   #* FIXME! the following code can cause an infinite loop, needs more thought
   shows the infinite loop: System.out.println("Entering save for " + this);
  -     #if ($pVars.size() != 0)
  +    #if ($pVars.size() != 0)
   
           // We call the save method on the following object(s) if they
           // were passed to this object by their coresponding set
  @@ -994,10 +994,10 @@
         #foreach ($aVarName in $aVars)
           #set($i = $velocityCount - 1)
           if ($aVarName != null)
  -        {   
  +        {
               ${aVarName}.save(con);
               set$pVars.get($i)($aVarName);
  -        }   
  +        }
         #end
       #end
   *#
  @@ -1057,12 +1057,12 @@
                 }
             }
        #end
  -  #end      
  +  #end
    #end
     #if ($complexObjectModel)
           alreadyInSave = false;
         }
  -  #end      
  +  #end
       }
   #end
   
  @@ -1096,25 +1096,25 @@
       #set ($argList = "${argList}$comma $cjtype $clo")
       #set ($argList2 = "${argList2}$comma String $clo")
   
  -    #set ( $comma = "," )            
  -#end    
  +    #set ( $comma = "," )
  +#end
   
   #if ($table.PrimaryKeys.size() == 1)
   
       #set ($col = $table.PrimaryKeys.get(0) )
       #set ( $clo=$col.Name.toLowerCase() )
       #set ( $cjtype= $col.JavaNative )
  -    /** 
  +    /**
        * Set the PrimaryKey using ObjectKey.
        *
        * @param ObjectKey $clo
        */
  -    public void setPrimaryKey(ObjectKey $clo) 
  +    public void setPrimaryKey(ObjectKey $clo)
           $throwsClause {
            set${col.JavaName}(($cjtype)$clo);
       }
   
  -    /** 
  +    /**
        * Set the PrimaryKey using a String.
        */
       public void setPrimaryKey(String key) $throwsClause
  @@ -1126,7 +1126,7 @@
   
       private final SimpleKey[] pks = new SimpleKey[$table.PrimaryKeys.size()];
       private final ComboKey comboPK = new ComboKey(pks);
  -    /** 
  +    /**
        * Set the PrimaryKey with an ObjectKey
        */
       public void setPrimaryKey(ObjectKey key) throws TorqueException
  @@ -1139,7 +1139,7 @@
       #end
       }
   
  -    /** 
  +    /**
        * Set the PrimaryKey using SimpleKeys.
        *
   #foreach ($col in $table.PrimaryKeys)
  @@ -1148,14 +1148,14 @@
        * @param $cjtype $clo
   #end
        */
  -    public void setPrimaryKey($argList) 
  +    public void setPrimaryKey($argList)
           $throwsClause {
   #foreach ($col in $table.PrimaryKeys)
            set${col.JavaName}($col.Name.toLowerCase());
   #end
       }
   
  -    /** 
  +    /**
        * Set the PrimaryKey with Strings.
        *
   #foreach ($col in $table.PrimaryKeys)
  @@ -1163,14 +1163,14 @@
        * @param String $clo
   #end
        */
  -    public void setPrimaryKey($argList2) 
  +    public void setPrimaryKey($argList2)
           $throwsClause {
   #foreach ($col in $table.PrimaryKeys)
            set${col.JavaName}(new ${col.JavaNative}($col.Name.toLowerCase()));
   #end
       }
   
  -    /** 
  +    /**
        * Set the PrimaryKey using a String.
        */
       public void setPrimaryKey(String key) throws TorqueException
  @@ -1189,7 +1189,7 @@
   #end
   
   
  -    /** 
  +    /**
        * returns an id that differentiates this object from others
        * of its class.
        */
  @@ -1212,11 +1212,11 @@
   #end ##ends if(!$table.isAlias())
   
   #if ($addIntakeRetrievable)
  -    /** 
  +    /**
        * get an id that differentiates this object from others
        * of its class.
        */
  -    public String getQueryKey() 
  +    public String getQueryKey()
       {
           if (getPrimaryKey() == null)
           {
  @@ -1228,11 +1228,11 @@
           }
       }
   
  -    /** 
  +    /**
        * set an id that differentiates this object from others
        * of its class.
        */
  -    public void setQueryKey(String key) 
  +    public void setQueryKey(String key)
           throws TorqueException
       {
           setPrimaryKey(key);
  @@ -1241,14 +1241,14 @@
   
   #if (!$table.isAlias())
       /**
  -     * Makes a copy of this object.  
  +     * Makes a copy of this object.
        * It creates a new object filling in the simple attributes.
   #if ($complexObjectModel)
        * It then fills all the association collections and sets the
        * related objects to isNew=true.
   #end
        */
  -#if ($table.ChildrenColumn || $table.isAbstract()) 
  +#if ($table.ChildrenColumn || $table.isAbstract())
       public $table.JavaName copyInto($table.JavaName copyObj) throws TorqueException
       {
   #else
  @@ -1258,7 +1258,7 @@
   #end
   #foreach ($col in $table.Columns)
           copyObj.set${col.JavaName}($col.Name.toLowerCase());
  -#end 
  +#end
   
   #if ($complexObjectModel)
     copyObj.setNew(false);
  @@ -1302,7 +1302,7 @@
           #set ( $cjtype = $col.JavaNative )
           copyObj.set${col.JavaName}((${cjtype})${pkid});
       #end
  -#end 
  +#end
           return copyObj;
       }
   #end
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to