dlr         02/03/01 08:30:12

  Modified:    src/java/org/apache/torque/util Criteria.java
  Log:
  I bit off more than I bargained for with my last commit (didn't pay
  proper attention to the diff).  Reverting the parts not mentioned in
  the commit log -- John will get those later.
  
  Revision  Changes    Path
  1.14      +7 -8      
jakarta-turbine-torque/src/java/org/apache/torque/util/Criteria.java
  
  Index: Criteria.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/Criteria.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -u -r1.13 -r1.14
  --- Criteria.java     1 Mar 2002 14:16:01 -0000       1.13
  +++ Criteria.java     1 Mar 2002 16:30:12 -0000       1.14
  @@ -69,7 +69,6 @@
   import java.util.Set;
   import java.util.Vector;
   import org.apache.torque.Torque;
  -import org.apache.torque.TorqueException;
   import org.apache.torque.adapter.DB;
   import org.apache.torque.map.DatabaseMap;
   import org.apache.torque.map.TableMap;
  @@ -92,7 +91,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Eric Dobbs</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Henning P. Schmiedehausen</a>
  - * @version $Id: Criteria.java,v 1.13 2002/03/01 14:16:01 mpoeschl Exp $
  + * @version $Id: Criteria.java,v 1.14 2002/03/01 16:30:12 dlr Exp $
    */
   public class Criteria extends Hashtable
   {
  @@ -383,10 +382,10 @@
        * Object column.
        *
        * @return A boolean.
  -     * @throws TorqueException Any exceptions caught during processing will be
  -     *         rethrown wrapped into a TorqueException.
  +     * @throws Exception Any exceptions caught during processing will be
  +     *         rethrown wrapped into a Exception.
        */
  -    public boolean containsObjectColumn() throws TorqueException
  +    public boolean containsObjectColumn() throws Exception
       {
           return containsObjectColumn(dbName);
       }
  @@ -397,11 +396,11 @@
        *
        * @param databaseMapName A String.
        * @return A boolean.
  -     * @throws TorqueException Any exceptions caught during processing will be
  -     *         rethrown wrapped into a TorqueException.
  +     * @throws Exception Any exceptions caught during processing will be
  +     *         rethrown wrapped into a Exception.
        */
       public boolean containsObjectColumn(String databaseMapName)
  -        throws TorqueException
  +        throws Exception
       {
           // Peer or application may have noted the existence of a blob
           // so we can save the lookup.
  
  
  

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

Reply via email to