You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2008/06/30 18:05:41 UTC
svn commit: r672805 - in /ofbiz/trunk/framework/entity/src/org/ofbiz/entity:
condition/EntityCondition.java util/EntityListIterator.java
Author: doogie
Date: Mon Jun 30 09:05:41 2008
New Revision: 672805
URL: http://svn.apache.org/viewvc?rev=672805&view=rev
Log:
More generics warnings silenced.
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java?rev=672805&r1=672804&r2=672805&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java Mon Jun 30 09:05:41 2008
@@ -24,6 +24,7 @@
import javolution.lang.Reusable;
import javolution.util.FastList;
+import static org.ofbiz.base.util.UtilGenerics.cast;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.GenericModelException;
@@ -62,25 +63,25 @@
}
public static <T extends EntityCondition> EntityConditionList<T> makeCondition(EntityJoinOperator operator, T... conditionList) {
- EntityConditionList<T> ecl = EntityConditionList.entityConditionListFactory.object();
+ EntityConditionList<T> ecl = cast(EntityConditionList.entityConditionListFactory.object());
ecl.init(operator, conditionList);
return ecl;
}
public static <T extends EntityCondition> EntityConditionList<T> makeCondition(T... conditionList) {
- EntityConditionList<T> ecl = EntityConditionList.entityConditionListFactory.object();
+ EntityConditionList<T> ecl = cast(EntityConditionList.entityConditionListFactory.object());
ecl.init(EntityOperator.AND, conditionList);
return ecl;
}
public static <T extends EntityCondition> EntityConditionList<T> makeCondition(List<T> conditionList, EntityJoinOperator operator) {
- EntityConditionList<T> ecl = EntityConditionList.entityConditionListFactory.object();
+ EntityConditionList<T> ecl = cast(EntityConditionList.entityConditionListFactory.object());
ecl.init(conditionList, operator);
return ecl;
}
public static <T extends EntityCondition> EntityConditionList<T> makeCondition(List<T> conditionList) {
- EntityConditionList<T> ecl = EntityConditionList.entityConditionListFactory.object();
+ EntityConditionList<T> ecl = cast(EntityConditionList.entityConditionListFactory.object());
ecl.init(conditionList, EntityOperator.AND);
return ecl;
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java?rev=672805&r1=672804&r2=672805&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java Mon Jun 30 09:05:41 2008
@@ -67,7 +67,7 @@
this.modelFieldTypeReader = modelFieldTypeReader;
}
- public EntityListIterator(ResultSet resultSet, ModelEntity modelEntity, List selectFields, ModelFieldTypeReader modelFieldTypeReader) {
+ public EntityListIterator(ResultSet resultSet, ModelEntity modelEntity, List<ModelField> selectFields, ModelFieldTypeReader modelFieldTypeReader) {
this.sqlp = null;
this.resultSet = resultSet;
this.modelEntity = modelEntity;