Adam,
These changes look good. Thank you for working on this! Adrian Crum Sandglass Software www.sandglass-software.com On 6/23/2014 5:24 PM, [hidden email] wrote: > Author: doogie > Date: Tue Jun 24 00:24:08 2014 > New Revision: 1604975 > > URL: http://svn.apache.org/r1604975 > Log: > Condition objects are now immutable. This removed more uses of > javolution classes, namely, all the factory support code is now gone. > > Modified: > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java > ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java > > Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java?rev=1604975&r1=1604974&r2=1604975&view=diff > ============================================================================== > --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java (original) > +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java Tue Jun 24 00:24:08 2014 > @@ -31,11 +31,6 @@ public class EntityConditionList<T exten > super(conditionList, operator); > } > > - public void init(List<T> conditionList, EntityJoinOperator operator) { > - this.conditionList = conditionList; > - this.operator = operator; > - } > - > @Override > public int getConditionListSize() { > return super.getConditionListSize(); > > Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java?rev=1604975&r1=1604974&r2=1604975&view=diff > ============================================================================== > --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java (original) > +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java Tue Jun 24 00:24:08 2014 > @@ -38,8 +38,8 @@ import org.ofbiz.entity.model.ModelEntit > public abstract class EntityConditionListBase<T extends EntityCondition> extends EntityCondition { > public static final String module = EntityConditionListBase.class.getName(); > > - protected List<T> conditionList = null; > - protected EntityJoinOperator operator = null; > + protected final List<T> conditionList; > + protected final EntityJoinOperator operator; > > protected EntityConditionListBase(List<T> conditionList, EntityJoinOperator operator) { > this.conditionList = conditionList; > > 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=1604975&r1=1604974&r2=1604975&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 Tue Jun 24 00:24:08 2014 > @@ -41,12 +41,12 @@ import org.ofbiz.entity.model.ModelField > * > */ > @SuppressWarnings("serial") > -public class EntityExpr extends EntityCondition { > +public final class EntityExpr extends EntityCondition { > public static final String module = EntityExpr.class.getName(); > > - private Object lhs = null; > - private EntityOperator<Object, Object, ?> operator = null; > - private Object rhs = null; > + private final Object lhs; > + private final EntityOperator<Object, Object, ?> operator; > + private final Object rhs; > > public <L,R,LL,RR> EntityExpr(L lhs, EntityComparisonOperator<LL,RR> operator, R rhs) { > if (lhs == null) { > > |
Administrator
|
Another part clarified, thanks Adam!
Jacques Le 24/06/2014 05:45, Adrian Crum a écrit : > Adam, > > These changes look good. Thank you for working on this! > > Adrian Crum > Sandglass Software > www.sandglass-software.com > > On 6/23/2014 5:24 PM, [hidden email] wrote: >> Author: doogie >> Date: Tue Jun 24 00:24:08 2014 >> New Revision: 1604975 >> >> URL: http://svn.apache.org/r1604975 >> Log: >> Condition objects are now immutable. This removed more uses of >> javolution classes, namely, all the factory support code is now gone. >> >> Modified: >> ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java >> ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java >> ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java >> >> Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java?rev=1604975&r1=1604974&r2=1604975&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java (original) >> +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java Tue Jun 24 00:24:08 2014 >> @@ -31,11 +31,6 @@ public class EntityConditionList<T exten >> super(conditionList, operator); >> } >> >> - public void init(List<T> conditionList, EntityJoinOperator operator) { >> - this.conditionList = conditionList; >> - this.operator = operator; >> - } >> - >> @Override >> public int getConditionListSize() { >> return super.getConditionListSize(); >> >> Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java?rev=1604975&r1=1604974&r2=1604975&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java (original) >> +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java Tue Jun 24 00:24:08 2014 >> @@ -38,8 +38,8 @@ import org.ofbiz.entity.model.ModelEntit >> public abstract class EntityConditionListBase<T extends EntityCondition> extends EntityCondition { >> public static final String module = EntityConditionListBase.class.getName(); >> >> - protected List<T> conditionList = null; >> - protected EntityJoinOperator operator = null; >> + protected final List<T> conditionList; >> + protected final EntityJoinOperator operator; >> >> protected EntityConditionListBase(List<T> conditionList, EntityJoinOperator operator) { >> this.conditionList = conditionList; >> >> 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=1604975&r1=1604974&r2=1604975&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 Tue Jun 24 00:24:08 2014 >> @@ -41,12 +41,12 @@ import org.ofbiz.entity.model.ModelField >> * >> */ >> @SuppressWarnings("serial") >> -public class EntityExpr extends EntityCondition { >> +public final class EntityExpr extends EntityCondition { >> public static final String module = EntityExpr.class.getName(); >> >> - private Object lhs = null; >> - private EntityOperator<Object, Object, ?> operator = null; >> - private Object rhs = null; >> + private final Object lhs; >> + private final EntityOperator<Object, Object, ?> operator; >> + private final Object rhs; >> >> public <L,R,LL,RR> EntityExpr(L lhs, EntityComparisonOperator<LL,RR> operator, R rhs) { >> if (lhs == null) { >> >> > -- |
Free forum by Nabble | Edit this page |