dobbs 02/04/29 21:38:59
Modified: src/java/org/apache/torque/util Criteria.java
Log:
turns out they didn't need fixing after all. Removed my FIXME
comments, split a few long lines in comments, and replaced some single
character strings with chars
Revision Changes Path
1.25 +9 -9
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Criteria.java 30 Apr 2002 04:15:21 -0000 1.24
+++ Criteria.java 30 Apr 2002 04:38:59 -0000 1.25
@@ -90,7 +90,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.24 2002/04/30 04:15:21 dobbs Exp $
+ * @version $Id: Criteria.java,v 1.25 2002/04/30 04:38:59 dobbs Exp $
*/
public class Criteria extends Hashtable
{
@@ -1828,7 +1828,7 @@
*/
public Criteria addAscendingOrderByColumn(String name)
{
- orderByColumns.add(name + " " + ASC);
+ orderByColumns.add(name + ' ' + ASC);
return this;
}
@@ -1840,7 +1840,7 @@
*/
public Criteria addDescendingOrderByColumn(String name)
{
- orderByColumns.add(name + " " + DESC);
+ orderByColumns.add(name + ' ' + DESC);
return this;
}
@@ -1976,7 +1976,7 @@
*/
public Criteria and(Criterion c)
{
- Criterion oc = getCriterion(c.getTable()+"."+c.getColumn());
+ Criterion oc = getCriterion(c.getTable()+'.'+c.getColumn());
if(oc == null)
{
@@ -2587,10 +2587,9 @@
*
* @return A modified Criteria object.
*/
- //FIXME NOW!!
public Criteria or(Criterion c)
{
- Criterion oc = getCriterion(c.getTable()+"."+c.getColumn());
+ Criterion oc = getCriterion(c.getTable()+'.'+c.getColumn());
if(oc == null)
{
@@ -2724,7 +2723,6 @@
*
* @return A modified Criteria object.
*/
- //FIXME NOW!!
public Criteria or(String table,
String column,
Object value,
@@ -2780,7 +2778,8 @@
*
* @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 comparison String describing how to compare the column
+ * with the value
*
* @return A modified Criteria object.
*/
@@ -2966,7 +2965,8 @@
*
* @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
+ * @param comparison String describing how to compare the column
+ * with the value
*
* @return A modified Criteria object.
*/
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
