Author: lektran
Date: Wed Apr 28 11:31:18 2010
New Revision: 938955
URL: http://svn.apache.org/viewvc?rev=938955&view=rev
Log:
The following deprecated classes, constructors or methods have been removed:
org.ofbiz.entity.GenericDelegator.findCountByAnd(String)
- Use findCountByCondition(String, EntityCondition, EntityCondition,
EntityFindOptions) instead
org.ofbiz.entity.GenericDelegator.findCountByAnd(String, Object...)
- Use findCountByCondition(String, EntityCondition, EntityCondition,
EntityFindOptions) instead
org.ofbiz.entity.GenericDelegator.findCountByAnd(String, Map<String, ? extends
Object)
- Use findCountByCondition(String, EntityCondition, EntityCondition,
EntityFindOptions) instead
org.ofbiz.entity.GenericDelegator.findCountByCondition(String, EntityCondition,
EntityCondition)
- Use findCountByCondition(String, EntityCondition, EntityCondition,
EntityFindOptions) instead
org.ofbiz.entity.GenericDelegator.getRelated(String, GenericValue)
- Use getRelated(String, Map<String, ? extends Object>, List<String>,
GenericValue) instead
org.ofbiz.entity.GenericDelegator.getRelatedByAnd(String, Map<String, ? extends
Object>, GenericValue)
- Use getRelated(String, Map<String, ? extends Object>, List<String>,
GenericValue) instead
org.ofbiz.entity.GenericDelegator.getRelatedOrderBy(String, List<String>,
GenericValue)
- Use getRelated(String, Map<String, ? extends Object>, List<String>,
GenericValue) instead
org.ofbiz.entity.GenericDelegator.getMultiRelation(GenericValue, String, String)
- Use getMultiRelation(GenericValue, String, String, List<String>) instead
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=938955&r1=938954&r2=938955&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
(original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Wed
Apr 28 11:31:18 2010
@@ -1841,39 +1841,6 @@ public class GenericDelegator implements
}
/* (non-Javadoc)
- * @see org.ofbiz.entity.Delegator#findCountByAnd(java.lang.String)
- */
- @Deprecated
- public long findCountByAnd(String entityName) throws
GenericEntityException {
- return findCountByCondition(entityName, null, null, null);
- }
-
- /* (non-Javadoc)
- * @see org.ofbiz.entity.Delegator#findCountByAnd(java.lang.String,
java.lang.Object)
- */
- @Deprecated
- public long findCountByAnd(String entityName, Object... fields) throws
GenericEntityException {
- return findCountByCondition(entityName,
EntityCondition.makeCondition(UtilMisc.<String, Object>toMap(fields),
EntityOperator.AND), null, null);
- }
-
- /* (non-Javadoc)
- * @see org.ofbiz.entity.Delegator#findCountByAnd(java.lang.String,
java.util.Map)
- */
- @Deprecated
- public long findCountByAnd(String entityName, Map<String, ? extends
Object> fields) throws GenericEntityException {
- return findCountByCondition(entityName,
EntityCondition.makeCondition(fields, EntityOperator.AND), null, null);
- }
-
- /* (non-Javadoc)
- * @see org.ofbiz.entity.Delegator#findCountByCondition(java.lang.String,
org.ofbiz.entity.condition.EntityCondition,
org.ofbiz.entity.condition.EntityCondition)
- */
- @Deprecated
- public long findCountByCondition(String entityName, EntityCondition
whereEntityCondition,
- EntityCondition havingEntityCondition) throws
GenericEntityException {
- return findCountByCondition(entityName, whereEntityCondition,
havingEntityCondition, null);
- }
-
- /* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#findCountByCondition(java.lang.String,
org.ofbiz.entity.condition.EntityCondition,
org.ofbiz.entity.condition.EntityCondition,
org.ofbiz.entity.util.EntityFindOptions)
*/
public long findCountByCondition(String entityName, EntityCondition
whereEntityCondition,
@@ -1961,38 +1928,6 @@ public class GenericDelegator implements
}
/* (non-Javadoc)
- * @see
org.ofbiz.entity.Delegator#getMultiRelation(org.ofbiz.entity.GenericValue,
java.lang.String, java.lang.String)
- */
- @Deprecated
- public List<GenericValue> getMultiRelation(GenericValue value, String
relationNameOne, String relationNameTwo) throws GenericEntityException {
- return getMultiRelation(value, relationNameOne, relationNameTwo, null);
- }
-
- /* (non-Javadoc)
- * @see org.ofbiz.entity.Delegator#getRelated(java.lang.String,
org.ofbiz.entity.GenericValue)
- */
- @Deprecated
- public List<GenericValue> getRelated(String relationName, GenericValue
value) throws GenericEntityException {
- return getRelated(relationName, null, null, value);
- }
-
- /* (non-Javadoc)
- * @see org.ofbiz.entity.Delegator#getRelatedByAnd(java.lang.String,
java.util.Map, org.ofbiz.entity.GenericValue)
- */
- @Deprecated
- public List<GenericValue> getRelatedByAnd(String relationName, Map<String,
? extends Object> byAndFields, GenericValue value) throws
GenericEntityException {
- return this.getRelated(relationName, byAndFields, null, value);
- }
-
- /* (non-Javadoc)
- * @see org.ofbiz.entity.Delegator#getRelatedOrderBy(java.lang.String,
java.util.List, org.ofbiz.entity.GenericValue)
- */
- @Deprecated
- public List<GenericValue> getRelatedOrderBy(String relationName,
List<String> orderBy, GenericValue value) throws GenericEntityException {
- return this.getRelated(relationName, null, orderBy, value);
- }
-
- /* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#getRelated(java.lang.String,
java.util.Map, java.util.List, org.ofbiz.entity.GenericValue)
*/
public List<GenericValue> getRelated(String relationName, Map<String, ?
extends Object> byAndFields, List<String> orderBy, GenericValue value) throws
GenericEntityException {