db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1213068 - /db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java
Date Sun, 11 Dec 2011 21:05:36 GMT
Author: tfischer
Date: Sun Dec 11 21:05:36 2011
New Revision: 1213068

URL: http://svn.apache.org/viewvc?rev=1213068&view=rev
Log:
remove methods which are now handled by autoboxing in java 5+

Modified:
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java?rev=1213068&r1=1213067&r2=1213068&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/Criteria.java
Sun Dec 11 21:05:36 2011
@@ -1159,207 +1159,6 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Convenience method to add a boolean to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * add(column, new Boolean(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A Boolean.
-     *
-     * @return A modified Criteria object.
-     */
-    public Criteria add(Column column, boolean value)
-    {
-        add(column, (value ? Boolean.TRUE : Boolean.FALSE));
-        return this;
-    }
-
-    /**
-     * Convenience method to add a boolean to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * add(column, new Boolean(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A Boolean.
-     * @param comparison String describing how to compare the column with
-     *        the value
-     * @return A modified Criteria object.
-     */
-    public Criteria add(Column column, boolean value, SqlEnum comparison)
-    {
-        add(column, new Boolean(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add an int to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * add(column, new Integer(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value An int.
-     * @return A modified Criteria object.
-     */
-    public Criteria add(Column column, int value)
-    {
-        add(column, new Integer(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add an int to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * add(column, new Integer(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value An int.
-     * @param comparison String describing how to compare the column with
-     *        the value
-     * @return A modified Criteria object.
-     */
-    public Criteria add(Column column, int value, SqlEnum comparison)
-    {
-        add(column, new Integer(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add a long to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * add(column, new Long(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A long.
-     * @return A modified Criteria object.
-     */
-    public Criteria add(Column column, long value)
-    {
-        add(column, new Long(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add a long to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * add(column, new Long(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A long.
-     * @param comparison String describing how to compare the column with
-     *        the value
-     * @return A modified Criteria object.
-     */
-    public Criteria add(Column column, long value, SqlEnum comparison)
-    {
-        add(column, new Long(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add a float to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * add(column, new Float(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A float.
-     * @return A modified Criteria object.
-     */
-    public Criteria add(Column column, float value)
-    {
-        add(column, new Float(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add a float to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * add(column, new Float(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A float.
-     * @param comparison String describing how to compare the column with
-     *        the value
-     * @return A modified Criteria object.
-     */
-    public Criteria add(Column column, float value, SqlEnum comparison)
-    {
-        add(column, new Float(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add a double to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * add(column, new Double(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A double.
-     * @return A modified Criteria object.
-     */
-    public Criteria add(Column column, double value)
-    {
-        add(column, new Double(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add a double to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * add(column, new Double(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A double.
-     * @param comparison String describing how to compare the column with
-     *        the value
-     * @return A modified Criteria object.
-     */
-    public Criteria add(Column column, double value, SqlEnum comparison)
-    {
-        add(column, new Double(value), comparison);
-        return this;
-    }
-
-    /**
      * Convenience method to add a Date object specified by
      * year, month, and date into the Criteria.
      * Equal to
@@ -1612,29 +1411,6 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Adds an 'IN' clause with the criteria supplied as an int array.
-     * For example:
-     *
-     * <p>
-     * FOO.ID IN ('2', '3', '7')
-     * <p>
-     *
-     * where 'values' contains those three integers.
-     *
-     * If a criterion for the requested column already exists, it is
-     * replaced.
-     *
-     * @param column The column to run the comparison on
-     * @param values An int[] with the allowed values.
-     * @return A modified Criteria object.
-     */
-    public Criteria addIn(Column column, int[] values)
-    {
-        add(column, values, Criteria.IN);
-        return this;
-    }
-
-    /**
      * Adds an 'IN' clause with the criteria supplied as a Collection.
      * For example:
      *
@@ -1731,29 +1507,6 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Adds a 'NOT IN' clause with the criteria supplied as an int
-     * array.  For example:
-     *
-     * <p>
-     * FOO.ID NOT IN ('2', '3', '7')
-     * <p>
-     *
-     * where 'values' contains those three integers.
-     *
-     * If a criterion for the requested column already exists, it is
-     * replaced.
-     *
-     * @param column The column to run the comparison on
-     * @param values An int[] with the disallowed values.
-     * @return A modified Criteria object.
-     */
-    public Criteria addNotIn(Column column, int[] values)
-    {
-        add(column, values, Criteria.NOT_IN);
-        return this;
-    }
-
-    /**
      * Adds a 'NOT IN' clause with the criteria supplied as a Collection.
      * For example:
      *
@@ -2498,329 +2251,130 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Convenience method to add a boolean to Criteria.
+     * Convenience method to add a Date object specified by
+     * year, month, and date into the Criteria.
      * Equal to
      *
      * <p>
      * <code>
-     * and(column, new Boolean(value), EQUAL);
+     * and(column, new GregorianCalendar(year, month,date), EQUAL);
      * </code>
      *
-     * @param column The column to run the comparison on
-     * @param value A Boolean.
+     * @param column A String value to use as column.
+     * @param year An int with the year.
+     * @param month An int with the month.
+     * @param date An int with the date.
      * @return A modified Criteria object.
      */
-    public Criteria and(Column column, boolean value)
+    public Criteria andDate(Column column, int year, int month, int date)
     {
-        and(column, new Boolean(value));
+        and(column, new GregorianCalendar(year, month, date).getTime());
         return this;
     }
 
     /**
-     * Convenience method to add a boolean to Criteria.
+     * Convenience method to add a Date object specified by
+     * year, month, and date into the Criteria.
      * Equal to
      *
      * <p>
      * <code>
-     * and(column, new Boolean(value), comparison);
+     * and(column, new GregorianCalendar(year, month,date), comparison);
      * </code>
      *
      * @param column The column to run the comparison on
-     * @param value A Boolean.
-     * @param comparison String describing how to compare the column
-     * with the value
+     * @param year An int with the year.
+     * @param month An int with the month.
+     * @param date An int with the date.
+     * @param comparison String describing how to compare the column with
+     *        the value
      * @return A modified Criteria object.
      */
-    public Criteria and(Column column, boolean value, SqlEnum comparison)
+    public Criteria andDate(Column column, int year, int month, int date,
+            SqlEnum comparison)
     {
-        and(column, new Boolean(value), comparison);
+        and(column, new GregorianCalendar(year, month, date).getTime(), comparison);
         return this;
     }
 
     /**
-     * Convenience method to add an int to Criteria.
+     * Convenience method to add a Date object specified by
+     * year, month, and date into the Criteria.
      * Equal to
      *
      * <p>
      * <code>
-     * and(column, new Integer(value), EQUAL);
+     * and(column, new GregorianCalendar(year, month,date), EQUAL);
      * </code>
      *
-     * @param column The column to run the comparison on
-     * @param value An int.
+     * @param column A String value to use as column.
+     * @param year An int with the year.
+     * @param month An int with the month.
+     * @param date An int with the date.
      * @return A modified Criteria object.
      */
-    public Criteria and(Column column, int value)
+    public Criteria andDate(String column, int year, int month, int date)
     {
-        and(column, new Integer(value));
+        and(column, new GregorianCalendar(year, month, date).getTime());
         return this;
     }
 
     /**
-     * Convenience method to add an int to Criteria.
+     * Convenience method to add a Date object specified by
+     * year, month, and date into the Criteria.
      * Equal to
      *
      * <p>
      * <code>
-     * and(column, new Integer(value), comparison);
+     * and(column, new GregorianCalendar(year, month,date), comparison);
      * </code>
      *
      * @param column The column to run the comparison on
-     * @param value An int.
-     * @param comparison String describing how to compare the column with the value
+     * @param year An int with the year.
+     * @param month An int with the month.
+     * @param date An int with the date.
+     * @param comparison String describing how to compare the column with
+     *        the value
      * @return A modified Criteria object.
      */
-    public Criteria and(Column column, int value, SqlEnum comparison)
+    public Criteria andDate(String column, int year, int month, int date,
+            SqlEnum comparison)
     {
-        and(column, new Integer(value), comparison);
+        and(column, new GregorianCalendar(year, month, date).getTime(), comparison);
         return this;
     }
 
     /**
-     * Convenience method to add a long to Criteria.
-     * Equal to
+     * Adds an 'IN' clause with the criteria supplied as an Object array.
+     * For example:
      *
      * <p>
-     * <code>
-     * and(column, new Long(value), EQUAL);
-     * </code>
+     * FOO.NAME IN ('FOO', 'BAR', 'ZOW')
+     * <p>
+     *
+     * where 'values' contains three objects that evaluate to the
+     * respective strings above when .toString() is called.
+     *
+     * If a criterion for the requested column already exists, it is
+     * &quot;AND&quot;ed to the existing criterion.
      *
      * @param column The column to run the comparison on
-     * @param value A long.
+     * @param values An Object[] with the allowed values.
      * @return A modified Criteria object.
      */
-    public Criteria and(Column column, long value)
+    public Criteria andIn(Column column, Object[] values)
     {
-        and(column, new Long(value));
+        and(column, values, Criteria.IN);
         return this;
     }
 
     /**
-     * Convenience method to add a long to Criteria.
-     * Equal to
+     * Adds an 'IN' clause with the criteria supplied as an Object array.
+     * For example:
      *
      * <p>
-     * <code>
-     * and(column, new Long(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A long.
-     * @param comparison String describing how to compare the column with
-     *        the value
-     * @return A modified Criteria object.
-     */
-    public Criteria and(Column column, long value, SqlEnum comparison)
-    {
-        and(column, new Long(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add a float to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * and(column, new Float(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A float.
-     * @return A modified Criteria object.
-     */
-    public Criteria and(Column column, float value)
-    {
-        and(column, new Float(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add a float to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * and(column, new Float(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A float.
-     * @param comparison String describing how to compare the column with
-     *        the value
-     * @return A modified Criteria object.
-     */
-    public Criteria and(Column column, float value, SqlEnum comparison)
-    {
-        and(column, new Float(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add a double to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * and(column, new Double(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A double.
-     * @return A modified Criteria object.
-     */
-    public Criteria and(Column column, double value)
-    {
-        and(column, new Double(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add a double to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * and(column, new Double(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A double.
-     * @param comparison String describing how to compare the column with
-     *        the value
-     * @return A modified Criteria object.
-     */
-    public Criteria and(Column column, double value, SqlEnum comparison)
-    {
-        and(column, new Double(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add a Date object specified by
-     * year, month, and date into the Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * and(column, new GregorianCalendar(year, month,date), EQUAL);
-     * </code>
-     *
-     * @param column A String value to use as column.
-     * @param year An int with the year.
-     * @param month An int with the month.
-     * @param date An int with the date.
-     * @return A modified Criteria object.
-     */
-    public Criteria andDate(Column column, int year, int month, int date)
-    {
-        and(column, new GregorianCalendar(year, month, date).getTime());
-        return this;
-    }
-
-    /**
-     * Convenience method to add a Date object specified by
-     * year, month, and date into the Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * and(column, new GregorianCalendar(year, month,date), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param year An int with the year.
-     * @param month An int with the month.
-     * @param date An int with the date.
-     * @param comparison String describing how to compare the column with
-     *        the value
-     * @return A modified Criteria object.
-     */
-    public Criteria andDate(Column column, int year, int month, int date,
-            SqlEnum comparison)
-    {
-        and(column, new GregorianCalendar(year, month, date).getTime(), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add a Date object specified by
-     * year, month, and date into the Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * and(column, new GregorianCalendar(year, month,date), EQUAL);
-     * </code>
-     *
-     * @param column A String value to use as column.
-     * @param year An int with the year.
-     * @param month An int with the month.
-     * @param date An int with the date.
-     * @return A modified Criteria object.
-     */
-    public Criteria andDate(String column, int year, int month, int date)
-    {
-        and(column, new GregorianCalendar(year, month, date).getTime());
-        return this;
-    }
-
-    /**
-     * Convenience method to add a Date object specified by
-     * year, month, and date into the Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * and(column, new GregorianCalendar(year, month,date), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param year An int with the year.
-     * @param month An int with the month.
-     * @param date An int with the date.
-     * @param comparison String describing how to compare the column with
-     *        the value
-     * @return A modified Criteria object.
-     */
-    public Criteria andDate(String column, int year, int month, int date,
-            SqlEnum comparison)
-    {
-        and(column, new GregorianCalendar(year, month, date).getTime(), comparison);
-        return this;
-    }
-
-    /**
-     * Adds an 'IN' clause with the criteria supplied as an Object array.
-     * For example:
-     *
-     * <p>
-     * FOO.NAME IN ('FOO', 'BAR', 'ZOW')
-     * <p>
-     *
-     * where 'values' contains three objects that evaluate to the
-     * respective strings above when .toString() is called.
-     *
-     * If a criterion for the requested column already exists, it is
-     * &quot;AND&quot;ed to the existing criterion.
-     *
-     * @param column The column to run the comparison on
-     * @param values An Object[] with the allowed values.
-     * @return A modified Criteria object.
-     */
-    public Criteria andIn(Column column, Object[] values)
-    {
-        and(column, values, Criteria.IN);
-        return this;
-    }
-
-    /**
-     * Adds an 'IN' clause with the criteria supplied as an Object array.
-     * For example:
-     *
-     * <p>
-     * FOO.NAME IN ('FOO', 'BAR', 'ZOW')
-     * <p>
+     * FOO.NAME IN ('FOO', 'BAR', 'ZOW')
+     * <p>
      *
      * where 'values' contains three objects that evaluate to the
      * respective strings above when .toString() is called.
@@ -2838,29 +2392,6 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Adds an 'IN' clause with the criteria supplied as an int array.
-     * For example:
-     *
-     * <p>
-     * FOO.ID IN ('2', '3', '7')
-     * <p>
-     *
-     * where 'values' contains those three integers.
-     *
-     * If a criterion for the requested column already exists, it is
-     * &quot;AND&quot;ed to the existing criterion.
-     *
-     * @param column The column to run the comparison on
-     * @param values An int[] with the allowed values.
-     * @return A modified Criteria object.
-     */
-    public Criteria andIn(Column column, int[] values)
-    {
-        and(column, values, Criteria.IN);
-        return this;
-    }
-
-    /**
      * Adds an 'IN' clause with the criteria supplied as a List.
      * For example:
      *
@@ -2878,7 +2409,7 @@ public class Criteria implements Seriali
      * @param values A List with the allowed values.
      * @return A modified Criteria object.
      */
-    public Criteria andIn(Column column, List<?> values)
+    public Criteria andIn(Column column, Collection<?> values)
     {
         and(column, values, Criteria.IN);
         return this;
@@ -2902,7 +2433,7 @@ public class Criteria implements Seriali
      * @param values A List with the allowed values.
      * @return A modified Criteria object.
      */
-    public Criteria andIn(String column, List<?> values)
+    public Criteria andIn(String column, Collection<?> values)
     {
         return and(column, values, Criteria.IN);
     }
@@ -2956,29 +2487,6 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Adds a 'NOT IN' clause with the criteria supplied as an int
-     * array.  For example:
-     *
-     * <p>
-     * FOO.ID NOT IN ('2', '3', '7')
-     * <p>
-     *
-     * where 'values' contains those three integers.
-     *
-     * If a criterion for the requested column already exists, it is
-     * &quot;AND&quot;ed to the existing criterion.
-     *
-     * @param column The column to run the comparison on
-     * @param values An int[] with the disallowed values.
-     * @return A modified Criteria object.
-     */
-    public Criteria andNotIn(Column column, int[] values)
-    {
-        and(column, values, Criteria.NOT_IN);
-        return this;
-    }
-
-    /**
      * Adds a 'NOT IN' clause with the criteria supplied as a List.
      * For example:
      *
@@ -2996,7 +2504,7 @@ public class Criteria implements Seriali
      * @param values A List with the disallowed values.
      * @return A modified Criteria object.
      */
-    public Criteria andNotIn(Column column, List<?> values)
+    public Criteria andNotIn(Column column, Collection<?> values)
     {
         and(column, values, Criteria.NOT_IN);
         return this;
@@ -3020,7 +2528,7 @@ public class Criteria implements Seriali
      * @param values A List with the disallowed values.
      * @return A modified Criteria object.
      */
-    public Criteria andNotIn(String column, List<?> values)
+    public Criteria andNotIn(String column, Collection<?> values)
     {
         return and(column, values, Criteria.NOT_IN);
     }
@@ -3255,208 +2763,6 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Convenience method to add a boolean to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * or(column, new Boolean(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A Boolean.
-     * @return A modified Criteria object.
-     */
-    public Criteria or(Column column, boolean value)
-    {
-        or(column, new Boolean(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add a boolean to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * or(column, new Boolean(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A Boolean.
-     * @param comparison String describing how to compare the column
-     * with the value
-     * @return A modified Criteria object.
-     */
-    public Criteria or(Column column, boolean value, SqlEnum comparison)
-    {
-        or(column, new Boolean(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add an int to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * or(column, new Integer(value), EQUAL);
-     * </code>
-     *
-     *
-     * @param column The column to run the comparison on
-     * @param value An int.
-     * @return A modified Criteria object.
-     */
-    public Criteria or(Column column, int value)
-    {
-        or(column, new Integer(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add an int to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * or(column, new Integer(value), comparison);
-     * </code>
-     *
-     *
-     * @param column The column to run the comparison on
-     * @param value An int.
-     * @param comparison String describing how to compare the column
-     * with the value
-     * @return A modified Criteria object.
-     */
-    public Criteria or(Column column, int value, SqlEnum comparison)
-    {
-        or(column, new Integer(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add a long to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * or(column, new Long(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A long.
-     * @return A modified Criteria object.
-     */
-    public Criteria or(Column column, long value)
-    {
-        or(column, new Long(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add a long to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * or(column, new Long(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A long.
-     * @param comparison String describing how to compare the column
-     * with the value
-     * @return A modified Criteria object.
-     */
-    public Criteria or(Column column, long value, SqlEnum comparison)
-    {
-        or(column, new Long(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add a float to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * or(column, new Float(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A float.
-     * @return A modified Criteria object.
-     */
-    public Criteria or(Column column, float value)
-    {
-        or(column, new Float(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add a float to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * or(column, new Float(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A float.
-     * @param comparison String describing how to compare the column
-     * with the value
-     * @return A modified Criteria object.
-     */
-    public Criteria or(Column column, float value, SqlEnum comparison)
-    {
-        or(column, new Float(value), comparison);
-        return this;
-    }
-
-    /**
-     * Convenience method to add a double to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * or(column, new Double(value), EQUAL);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A double.
-     * @return A modified Criteria object.
-     */
-    public Criteria or(Column column, double value)
-    {
-        or(column, new Double(value));
-        return this;
-    }
-
-    /**
-     * Convenience method to add a double to Criteria.
-     * Equal to
-     *
-     * <p>
-     * <code>
-     * or(column, new Double(value), comparison);
-     * </code>
-     *
-     * @param column The column to run the comparison on
-     * @param value A double.
-     * @param comparison String describing how to compare the column
-     * with the value
-     * @return A modified Criteria object.
-     */
-    public Criteria or(Column column, double value, SqlEnum comparison)
-    {
-        or(column, new Double(value), comparison);
-        return this;
-    }
-
-    /**
      * Convenience method to add a Date object specified by
      * year, month, and date into the Criteria.
      * Equal to
@@ -3596,29 +2902,6 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Adds an 'IN' clause with the criteria supplied as an int array.
-     * For example:
-     *
-     * <p>
-     * FOO.ID IN ('2', '3', '7')
-     * <p>
-     *
-     * where 'values' contains those three integers.
-     *
-     * If a criterion for the requested column already exists, it is
-     * &quot;OR&quot;ed to the existing criterion.
-     *
-     * @param column The column to run the comparison on
-     * @param values An int[] with the allowed values.
-     * @return A modified Criteria object.
-     */
-    public Criteria orIn(Column column, int[] values)
-    {
-        or(column, values, Criteria.IN);
-        return this;
-    }
-
-    /**
      * Adds an 'IN' clause with the criteria supplied as a List.
      * For example:
      *
@@ -3636,7 +2919,7 @@ public class Criteria implements Seriali
      * @param values A List with the allowed values.
      * @return A modified Criteria object.
      */
-    public Criteria orIn(Column column, List<?> values)
+    public Criteria orIn(Column column, Collection<?> values)
     {
         or(column, values, Criteria.IN);
         return this;
@@ -3660,7 +2943,7 @@ public class Criteria implements Seriali
      * @param values A List with the allowed values.
      * @return A modified Criteria object.
      */
-    public Criteria orIn(String column, List<?> values)
+    public Criteria orIn(String column, Collection<?> values)
     {
         return or(column, values, Criteria.IN);
     }
@@ -3713,29 +2996,6 @@ public class Criteria implements Seriali
     }
 
     /**
-     * Adds a 'NOT IN' clause with the criteria supplied as an int
-     * array.  For example:
-     *
-     * <p>
-     * FOO.ID NOT IN ('2', '3', '7')
-     * <p>
-     *
-     * where 'values' contains those three integers.
-     *
-     * If a criterion for the requested column already exists, it is
-     * &quot;OR&quot;ed to the existing criterion.
-     *
-     * @param column The column to run the comparison on
-     * @param values An int[] with the disallowed values.
-     * @return A modified Criteria object.
-     */
-    public Criteria orNotIn(Column column, int[] values)
-    {
-        or(column, values, Criteria.NOT_IN);
-        return this;
-    }
-
-    /**
      * Adds a 'NOT IN' clause with the criteria supplied as a List.
      * For example:
      *
@@ -3753,7 +3013,7 @@ public class Criteria implements Seriali
      * @param values A List with the disallowed values.
      * @return A modified Criteria object.
      */
-    public Criteria orNotIn(Column column, List<?> values)
+    public Criteria orNotIn(Column column, Collection<?> values)
     {
         or(column, values, Criteria.NOT_IN);
         return this;
@@ -3777,7 +3037,7 @@ public class Criteria implements Seriali
      * @param values A List with the disallowed values.
      * @return A modified Criteria object.
      */
-    public Criteria orNotIn(String column, List<?> values)
+    public Criteria orNotIn(String column, Collection<?> values)
     {
         return or(column, values, Criteria.NOT_IN);
     }



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