svn commit: r912211 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java

[lektran]

Author: lektran
Date: Sat Feb 20 20:19:30 2010
New Revision: 912211

URL: http://svn.apache.org/viewvc?rev=912211&view=rev
Log:
The following deprecated classes, constructors or methods have been removed:
org.ofbiz.entity.condition.EntityExpr(L, EntityComparisonOperator<L,R>, R)
- Use EntityCondition.makeCondition(L, EntityComparisonOperator<LL,RR>, R) 
instead

org.ofbiz.entity.condition.EntityExpr(String, 
EntityComparisonOperator<String,R>, R)
- Use EntityCondition.makeCondition(L, EntityComparisonOperator<LL,RR>, R) 
instead

org.ofbiz.entity.condition.EntityExpr(L, boolean, 
EntityComparisonOperator<L,R>, R, boolean)
- Use EntityCondition.makeCondition(L, EntityComparisonOperator<LL,RR>, R) 
instead
- Use EntityFunction.UPPER_FIELD(L) in place of leftUpper = true
- Use EntityFunction.UPPER(R) in place of rightUpper = true

org.ofbiz.entity.condition.EntityExpr(EntityCondition, EntityJoinOperator, 
EntityCondition)
- Use EntityCondition.makeCondition(EntityCondition, EntityJoinOperator, 
EntityCondition) instead

org.ofbiz.entity.condition.EntityExpr.setLUpper(boolean)
org.ofbiz.entity.condition.EntityExpr.isLUpper()
org.ofbiz.entity.condition.EntityExpr.isRUpper()
org.ofbiz.entity.condition.EntityExpr.setRUpper(boolean)

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java

Modified: 
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java?rev=912211&r1=912210&r2=912211&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java 
(original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java 
Sat Feb 20 20:19:30 2010
@@ -58,32 +58,6 @@
 
     protected EntityExpr() {}
 
-    /** @deprecated Use EntityCondition.makeCondition() instead */
-    @Deprecated
-    public <L,R> EntityExpr(L lhs, EntityComparisonOperator<L,R> operator, R 
rhs) {
-        this.init(lhs, operator, rhs);
-    }
-
-    /** @deprecated Use EntityCondition.makeCondition() instead */
-    @Deprecated
-    public <R> EntityExpr(String lhs, EntityComparisonOperator<String,R> 
operator, R rhs) {
-        this.init(lhs, operator, rhs);
-    }
-
-    /** @deprecated Use EntityCondition.makeCondition() instead */
-    @Deprecated
-    public <L,R> EntityExpr(L lhs, boolean leftUpper, 
EntityComparisonOperator<L,R> operator, R rhs, boolean rightUpper) {
-        L l = leftUpper ? 
UtilGenerics.<L>cast(EntityFunction.UPPER_FIELD((String)lhs)) : lhs;
-        R r = rightUpper ? UtilGenerics.<R>cast(EntityFunction.UPPER(rhs)) : 
rhs;
-        this.init(l, operator, r);
-    }
-
-    /** @deprecated Use EntityCondition.makeCondition() instead */
-    @Deprecated
-    public EntityExpr(EntityCondition lhs, EntityJoinOperator operator, 
EntityCondition rhs) {
-        this.init(lhs, operator, rhs);
-    }
-
     public <L,R,LL,RR> void init(L lhs, EntityComparisonOperator<LL,RR> 
operator, R rhs) {
         if (lhs == null) {
             throw new IllegalArgumentException("The field name/value cannot be 
null");
@@ -137,28 +111,6 @@
         this.rhs = null;
     }
 
-    /** @deprecated */
-    @Deprecated
-    public void setLUpper(boolean upper) {
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public boolean isLUpper() {
-        return lhs instanceof EntityFunction.UPPER;
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public boolean isRUpper() {
-        return rhs instanceof EntityFunction.UPPER;
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public void setRUpper(boolean upper) {
-    }
-
     public Object getLhs() {
         return lhs;
     }