Author: tfischer
Date: Thu Jul 12 01:38:45 2012
New Revision: 1360503
URL: http://svn.apache.org/viewvc?rev=1360503&view=rev
Log:
- Deprecate Criteria.CUSTOM
- Add missing @Override annotations
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java?rev=1360503&r1=1360502&r2=1360503&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/Criteria.java
Thu Jul 12 01:38:45 2012
@@ -91,7 +91,16 @@ public class Criteria
/** Comparison type. */
public static final SqlEnum NOT_ILIKE = SqlEnum.NOT_ILIKE;
- /** Comparison type. */
+ /**
+ * Comparison type.
+ *
+ * @deprecated use the methods whereVerbatimSql, andVerbatimSql,
+ * orVerbatimSql or the Constructor
+ * Criterion(null, null, null, String, Object[])
+ * instead of using Criteria.CUSTOM.
+ * This constant will be removed in Torque 4.1.
+ */
+ @Deprecated
public static final SqlEnum CUSTOM = SqlEnum.CUSTOM;
/** Comparison type. */
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java?rev=1360503&r1=1360502&r2=1360503&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/criteria/SqlEnum.java
Thu Jul 12 01:38:45 2012
@@ -44,6 +44,7 @@ public final class SqlEnum implements ja
this.s = s;
}
+ @Override
public String toString()
{
return s;
@@ -88,7 +89,17 @@ public final class SqlEnum implements ja
/** SQL Expression " NOT IN ". */
public static final SqlEnum NOT_IN =
new SqlEnum(" NOT IN ");
- /** Constant for "CUSTOM". */
+ /**
+ * Constant for "CUSTOM".
+ *
+ * @deprecated use the methods Criteria.whereVerbatimSql,
+ * Criteria.andVerbatimSql, Criteria.orVerbatimSql
+ * or the Constructor
+ * Criterion(null, null, null, String, Object[])
+ * instead of using SqlEnum.CUSTOM.
+ * This constant will be removed in Torque 4.1.
+ */
+ @Deprecated
public static final SqlEnum CUSTOM =
new SqlEnum("CUSTOM");
/** SQL Expression "JOIN". */
@@ -136,6 +147,7 @@ public final class SqlEnum implements ja
* Two SqlEnums are considered equal if they contain the same String.
* @param o the object to compare the SqlEnum with.
*/
+ @Override
public boolean equals(Object o)
{
if (o == null)
@@ -162,6 +174,7 @@ public final class SqlEnum implements ja
/**
* returns a hashcode for this object which is consistent with equals()
*/
+ @Override
public int hashCode()
{
return (s == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
