cvs commit: jakarta-turbine-torque/src/java/org/apache/torque/util BasePeer.java

[mpoeschl]

mpoeschl    2002/06/02 08:38:55

  Modified:    src/java/org/apache/torque/util BasePeer.java
  Log:
  remove unused imports
  
  Revision  Changes    Path
  1.43      +7 -11     
jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java
  
  Index: BasePeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- BasePeer.java     24 May 2002 23:44:08 -0000      1.42
  +++ BasePeer.java     2 Jun 2002 15:38:55 -0000       1.43
  @@ -78,7 +78,6 @@
   import java.util.ArrayList;
   import javax.naming.Context;
   import javax.naming.InitialContext;
  -import org.apache.torque.TorqueException;
   import org.apache.torque.om.NumberKey;
   import org.apache.torque.om.ObjectKey;
   import org.apache.torque.om.SimpleKey;
  @@ -90,9 +89,6 @@
   import org.apache.torque.map.DatabaseMap;
   import org.apache.torque.map.MapBuilder;
   import org.apache.torque.map.TableMap;
  -import org.apache.torque.util.Criteria;
  -import org.apache.torque.util.Query;
  -import org.apache.torque.util.SqlExpression;
   
   //!! no good.
   import org.apache.commons.collections.StringStack;
  @@ -110,7 +106,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
  - * @version $Id: BasePeer.java,v 1.42 2002/05/24 23:44:08 jmcnally Exp $
  + * @version $Id: BasePeer.java,v 1.43 2002/06/02 15:38:55 mpoeschl Exp $
    */
   public abstract class BasePeer implements java.io.Serializable
   {
  @@ -1215,7 +1211,7 @@
                                                    ignorCase, db) );
               }
           }
  -        
  +
           // need to allow for multiple group bys
           if ( groupBy != null && groupBy.size() > 0)
           {
  @@ -1225,19 +1221,19 @@
                   if (groupByColumn.indexOf('.') == -1)
                   {
                       throwMalformedColumnNameException("group by",groupByColumn);
  -                }          
  -                
  +                }
  +
                   groupByClause.add(groupByColumn);
               }
           }
  -        
  +
           Criteria.Criterion having = criteria.getHaving();
           if (having != null)
           {
  -            //String groupByString = null; 
  +            //String groupByString = null;
               query.setHaving(having.toString());
           }
  -        
  +
           if (orderBy != null && orderBy.size() > 0)
           {
               // Check for each String/Character column and apply
  
  
  

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