OFBiz › OFBiz - Commits

svn commit: r682103 - in /ofbiz/trunk/framework: entity/src/org/ofbiz/entity/finder/ widget/src/org/ofbiz/widget/form/ widget/src/org/ofbiz/widget/menu/ widget/src/org/ofbiz/widget/screen/ widget/src/org/ofbiz/widget/tree/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

doogie-3

svn commit: r682103 - in /ofbiz/trunk/framework: entity/src/org/ofbiz/entity/finder/ widget/src/org/ofbiz/widget/form/ widget/src/org/ofbiz/widget/menu/ widget/src/org/ofbiz/widget/screen/ widget/src/org/ofbiz/widget/tree/

Author: doogie
Date: Sat Aug 2 22:17:15 2008
New Revision: 682103

URL: http://svn.apache.org/viewvc?rev=682103&view=rev
Log:
More FlexibleMapAccessor fallout.

Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ByAndFinder.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ByAndFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ByAndFinder.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ByAndFinder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ByAndFinder.java Sat Aug 2 22:17:15 2008
@@ -38,7 +38,7 @@

public static final String module = ByAndFinder.class.getName();

- protected Map<FlexibleMapAccessor, Object> fieldMap;
+ protected Map<FlexibleMapAccessor<Object>, Object> fieldMap;

public ByAndFinder(Element element) {
super(element, "and");

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java Sat Aug 2 22:17:15 2008
@@ -28,10 +28,13 @@
import java.util.Map;
import java.util.Set;

+import javolution.util.FastMap;
+
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.ObjectType;
+import static org.ofbiz.base.util.UtilGenerics.cast;
import org.ofbiz.base.util.UtilFormatOut;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.collections.FlexibleMapAccessor;
@@ -59,11 +62,11 @@

public static final String module = EntityFinderUtil.class.getName();

- public static Map<FlexibleMapAccessor, Object> makeFieldMap(Element element) {
- Map<FlexibleMapAccessor, Object> fieldMap = null;
+ public static Map<FlexibleMapAccessor<Object>, Object> makeFieldMap(Element element) {
+ Map<FlexibleMapAccessor<Object>, Object> fieldMap = null;
List<? extends Element> fieldMapElementList = UtilXml.childElementList(element, "field-map");
if (fieldMapElementList.size() > 0) {
- fieldMap = new HashMap<FlexibleMapAccessor, Object>();
+ fieldMap = FastMap.newInstance();
for (Element fieldMapElement: fieldMapElementList) {
// set the env-name for each field-name, noting that if no field-name is specified it defaults to the env-name
String fieldName = fieldMapElement.getAttribute("field-name");
@@ -71,17 +74,17 @@
String value = fieldMapElement.getAttribute("value");
if (UtilValidate.isEmpty(fieldName)) {
// no fieldName, use envName for both
- fieldMap.put(new FlexibleMapAccessor(envName), new FlexibleMapAccessor(envName));
+ fieldMap.put(new FlexibleMapAccessor<Object>(envName), new FlexibleMapAccessor<Object>(envName));
} else {
if (UtilValidate.isNotEmpty(value)) {
- fieldMap.put(new FlexibleMapAccessor(fieldName), new FlexibleStringExpander(value));
+ fieldMap.put(new FlexibleMapAccessor<Object>(fieldName), new FlexibleStringExpander(value));
} else {
// at this point we have a fieldName and no value, do we have a envName?
if (UtilValidate.isNotEmpty(envName)) {
- fieldMap.put(new FlexibleMapAccessor(fieldName), new FlexibleMapAccessor(envName));
+ fieldMap.put(new FlexibleMapAccessor<Object>(fieldName), new FlexibleMapAccessor<Object>(envName));
} else {
// no envName, use fieldName for both
- fieldMap.put(new FlexibleMapAccessor(fieldName), new FlexibleMapAccessor(fieldName));
+ fieldMap.put(new FlexibleMapAccessor<Object>(fieldName), new FlexibleMapAccessor<Object>(fieldName));
}
}
}
@@ -90,14 +93,14 @@
return fieldMap;
}

- public static void expandFieldMapToContext(Map<FlexibleMapAccessor, Object> fieldMap, Map<String, Object> context, Map<String, Object> outContext) {
+ public static void expandFieldMapToContext(Map<FlexibleMapAccessor<Object>, Object> fieldMap, Map<String, Object> context, Map<String, Object> outContext) {
//Debug.logInfo("fieldMap: " + fieldMap, module);
if (fieldMap != null) {
- for (Map.Entry<FlexibleMapAccessor, Object> entry: fieldMap.entrySet()) {
- FlexibleMapAccessor serviceContextFieldAcsr = entry.getKey();
+ for (Map.Entry<FlexibleMapAccessor<Object>, Object> entry: fieldMap.entrySet()) {
+ FlexibleMapAccessor<Object> serviceContextFieldAcsr = entry.getKey();
Object valueSrc = entry.getValue();
if (valueSrc instanceof FlexibleMapAccessor) {
- FlexibleMapAccessor contextEnvAcsr = (FlexibleMapAccessor) valueSrc;
+ FlexibleMapAccessor<Object> contextEnvAcsr = cast(valueSrc);
serviceContextFieldAcsr.put(outContext, contextEnvAcsr.get(context));
} else if (valueSrc instanceof FlexibleStringExpander) {
FlexibleStringExpander valueExdr = (FlexibleStringExpander) valueSrc;
@@ -149,7 +152,7 @@
public static class ConditionExpr implements Condition {
protected FlexibleStringExpander fieldNameExdr;
protected FlexibleStringExpander operatorExdr;
- protected FlexibleMapAccessor envNameAcsr;
+ protected FlexibleMapAccessor<Object> envNameAcsr;
protected FlexibleStringExpander valueExdr;
protected boolean ignoreIfNull;
protected boolean ignoreIfEmpty;
@@ -163,7 +166,7 @@
}

this.operatorExdr = new FlexibleStringExpander(UtilFormatOut.checkEmpty(conditionExprElement.getAttribute("operator"), "equals"));
- this.envNameAcsr = new FlexibleMapAccessor(conditionExprElement.getAttribute("env-name"));
+ this.envNameAcsr = new FlexibleMapAccessor<Object>(conditionExprElement.getAttribute("env-name"));
this.valueExdr = new FlexibleStringExpander(conditionExprElement.getAttribute("value"));
this.ignoreIfNull = "true".equals(conditionExprElement.getAttribute("ignore-if-null"));
this.ignoreIfEmpty = "true".equals(conditionExprElement.getAttribute("ignore-if-empty"));
@@ -295,13 +298,13 @@
}
}
public static class ConditionObject implements Condition {
- protected FlexibleMapAccessor fieldNameAcsr;
+ protected FlexibleMapAccessor<Object> fieldNameAcsr;

public ConditionObject(Element conditionExprElement) {
- this.fieldNameAcsr = new FlexibleMapAccessor(conditionExprElement.getAttribute("field-name"));
+ this.fieldNameAcsr = new FlexibleMapAccessor<Object>(conditionExprElement.getAttribute("field-name"));
if (this.fieldNameAcsr.isEmpty()) {
// no "field-name"? try "name"
- this.fieldNameAcsr = new FlexibleMapAccessor(conditionExprElement.getAttribute("name"));
+ this.fieldNameAcsr = new FlexibleMapAccessor<Object>(conditionExprElement.getAttribute("name"));
}
}

@@ -312,8 +315,8 @@
}

public static interface OutputHandler extends Serializable {
- public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor listAcsr);
- public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor listAcsr);
+ public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr);
+ public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr);
}
public static class LimitRange implements OutputHandler {
FlexibleStringExpander startExdr;
@@ -346,7 +349,7 @@
}
}

- public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor listAcsr) {
+ public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr) {
int start = getStart(context);
int size = getSize(context);
try {
@@ -359,7 +362,7 @@
}
}

- public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor listAcsr) {
+ public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr) {
int start = getStart(context);
int size = getSize(context);

@@ -400,7 +403,7 @@
}
}

- public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor listAcsr) {
+ public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr) {
int index = this.getIndex(context);
int size = this.getSize(context);

@@ -414,7 +417,7 @@
}
}

- public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor listAcsr) {
+ public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr) {
int index = this.getIndex(context);
int size = this.getSize(context);

@@ -430,11 +433,11 @@
// no parameters, nothing to do
}

- public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor listAcsr) {
+ public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr) {
listAcsr.put(context, eli);
}

- public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor listAcsr) {
+ public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr) {
throw new IllegalArgumentException("Cannot handle output with use-iterator when the query is cached, or the result in general is not an EntityListIterator");
}
}
@@ -443,7 +446,7 @@
// no parameters, nothing to do
}

- public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor listAcsr) {
+ public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr) {
try {
listAcsr.put(context, eli.getCompleteList());
eli.close();
@@ -454,7 +457,7 @@
}
}

- public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor listAcsr) {
+ public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr) {
listAcsr.put(context, results);
}
}

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java Sat Aug 2 22:17:15 2008
@@ -64,7 +64,7 @@
protected FlexibleStringExpander filterByDateStrExdr;
protected FlexibleStringExpander distinctStrExdr;
protected FlexibleStringExpander delegatorNameExdr;
- protected FlexibleMapAccessor listAcsr;
+ protected FlexibleMapAccessor<Object> listAcsr;
protected FlexibleStringExpander resultSetTypeExdr;

protected List<FlexibleStringExpander> selectFieldExpanderList;
@@ -78,7 +78,7 @@
this.filterByDateStrExdr = new FlexibleStringExpander(element.getAttribute("filter-by-date"));
this.distinctStrExdr = new FlexibleStringExpander(element.getAttribute("distinct"));
this.delegatorNameExdr = new FlexibleStringExpander(element.getAttribute("delegator-name"));
- this.listAcsr = new FlexibleMapAccessor(element.getAttribute("list-name"));
+ this.listAcsr = new FlexibleMapAccessor<Object>(element.getAttribute("list-name"));
this.resultSetTypeExdr = new FlexibleStringExpander(element.getAttribute("result-set-type"));

// process select-field

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java Sat Aug 2 22:17:15 2008
@@ -44,15 +44,15 @@
public class PrimaryKeyFinder extends Finder {
public static final String module = PrimaryKeyFinder.class.getName();

- protected FlexibleMapAccessor valueNameAcsr;
+ protected FlexibleMapAccessor<Object> valueNameAcsr;
protected FlexibleStringExpander autoFieldMapExdr;
- protected Map<FlexibleMapAccessor, Object> fieldMap;
+ protected Map<FlexibleMapAccessor<Object>, Object> fieldMap;
protected List<FlexibleStringExpander> selectFieldExpanderList;

public PrimaryKeyFinder(Element entityOneElement) {
super(entityOneElement);
if (UtilValidate.isNotEmpty(entityOneElement.getAttribute("value-name")))
- this.valueNameAcsr = new FlexibleMapAccessor(entityOneElement.getAttribute("value-name"));
+ this.valueNameAcsr = new FlexibleMapAccessor<Object>(entityOneElement.getAttribute("value-name"));
this.autoFieldMapExdr = new FlexibleStringExpander(entityOneElement.getAttribute("auto-field-map"));

// process field-map
@@ -88,7 +88,7 @@
}

public static GenericValue runFind(ModelEntity modelEntity, Map<String, Object> context, GenericDelegator delegator, boolean useCache, boolean autoFieldMap,
- Map<FlexibleMapAccessor, Object> fieldMap, List<FlexibleStringExpander> selectFieldExpanderList) throws GeneralException {
+ Map<FlexibleMapAccessor<Object>, Object> fieldMap, List<FlexibleStringExpander> selectFieldExpanderList) throws GeneralException {

// assemble the field map
Map<String, Object> entityContext = FastMap.newInstance();

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java Sat Aug 2 22:17:15 2008
@@ -292,7 +292,7 @@
protected FlexibleMapAccessor<Map<String, Object>> resultMapNameAcsr;
protected FlexibleStringExpander autoFieldMapExdr;
protected FlexibleStringExpander resultMapListNameExdr;
- protected Map<FlexibleMapAccessor, Object> fieldMap;
+ protected Map<FlexibleMapAccessor<Object>, Object> fieldMap;

public Service(ModelForm modelForm, Element serviceElement) {
super (modelForm, serviceElement);

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sat Aug 2 22:17:15 2008
@@ -1796,7 +1796,7 @@
protected String updateAfterRequestCall;
protected String rows;
protected String cols;
- protected Map<FlexibleMapAccessor, Object> fieldMap;
+ protected Map<FlexibleMapAccessor<Object>, Object> fieldMap;

public InPlaceEditor (Element element) {
this.setUrl(element.getAttribute("url"));
@@ -2031,7 +2031,7 @@
this.cols = string;
}

- public void setFieldMap(Map<FlexibleMapAccessor, Object> fieldMap) {
+ public void setFieldMap(Map<FlexibleMapAccessor<Object>, Object> fieldMap) {
this.fieldMap = fieldMap;
}
}

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java Sat Aug 2 22:17:15 2008
@@ -419,7 +419,7 @@
fieldVal = "";
}

- List<String> messages = FastList.newInstance();
+ List<Object> messages = FastList.newInstance();
Boolean resultBool = BaseCompare.doRealCompare(fieldVal, value, operator, type, format, messages, null, null, true);
if (messages.size() > 0) {
messages.add(0, "Error with comparison in if-compare between field [" + fieldAcsr.toString() + "] with value [" + fieldVal + "] and value [" + value + "] with operator [" + operator + "] and type [" + type + "]: ");
@@ -468,7 +468,7 @@
fieldVal = "";
}

- List<String> messages = FastList.newInstance();
+ List<Object> messages = FastList.newInstance();
Boolean resultBool = BaseCompare.doRealCompare(fieldVal, toFieldVal, operator, type, format, messages, null, null, false);
if (messages.size() > 0) {
messages.add(0, "Error with comparison in if-compare-field between field [" + fieldAcsr.toString() + "] with value [" + fieldVal + "] and to-field [" + toFieldVal.toString() + "] with value [" + toFieldVal + "] with operator [" + operator + "] and type [" + type + "]: ");

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java Sat Aug 2 22:17:15 2008
@@ -425,7 +425,7 @@
protected FlexibleStringExpander serviceNameExdr;
protected FlexibleMapAccessor<Map<String, Object>> resultMapNameAcsr;
protected FlexibleStringExpander autoFieldMapExdr;
- protected Map<FlexibleMapAccessor, Object> fieldMap;
+ protected Map<FlexibleMapAccessor<Object>, Object> fieldMap;

public Service(ModelScreen modelScreen, Element serviceElement) {
super (modelScreen, serviceElement);

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java Sat Aug 2 22:17:15 2008
@@ -412,7 +412,7 @@
fieldVal = "";
}

- List<String> messages = FastList.newInstance();
+ List<Object> messages = FastList.newInstance();
Boolean resultBool = BaseCompare.doRealCompare(fieldVal, value, operator, type, format, messages, null, null, true);
if (messages.size() > 0) {
messages.add(0, "Error with comparison in if-compare between field [" + fieldAcsr.toString() + "] with value [" + fieldVal + "] and value [" + value + "] with operator [" + operator + "] and type [" + type + "]: ");
@@ -461,7 +461,7 @@
fieldVal = "";
}

- List<String> messages = FastList.newInstance();
+ List<Object> messages = FastList.newInstance();
Boolean resultBool = BaseCompare.doRealCompare(fieldVal, toFieldVal, operator, type, format, messages, null, null, false);
if (messages.size() > 0) {
messages.add(0, "Error with comparison in if-compare-field between field [" + fieldAcsr.toString() + "] with value [" + fieldVal + "] and to-field [" + toFieldAcsr.toString() + "] with value [" + toFieldVal + "] with operator [" + operator + "] and type [" + type + "]: ");

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java Sat Aug 2 22:17:15 2008
@@ -216,7 +216,7 @@
protected FlexibleStringExpander resultMapListIteratorNameExdr;
protected FlexibleStringExpander resultMapValueNameExdr;
protected FlexibleStringExpander valueNameExdr;
- protected Map<FlexibleMapAccessor, Object> fieldMap;
+ protected Map<FlexibleMapAccessor<Object>, Object> fieldMap;

public Service(ModelTree.ModelNode modelNode, Element serviceElement) {
super (modelNode, serviceElement);

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java?rev=682103&r1=682102&r2=682103&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java Sat Aug 2 22:17:15 2008
@@ -317,7 +317,7 @@
fieldVal = "";
}

- List<String> messages = FastList.newInstance();
+ List<Object> messages = FastList.newInstance();
Boolean resultBool = BaseCompare.doRealCompare(fieldVal, value, operator, type, format, messages, null, null, true);
if (messages.size() > 0) {
messages.add(0, "Error with comparison in if-compare between field [" + fieldAcsr.toString() + "] with value [" + fieldVal + "] and value [" + value + "] with operator [" + operator + "] and type [" + type + "]: ");
@@ -366,7 +366,7 @@
fieldVal = "";
}

- List<String> messages = FastList.newInstance();
+ List<Object> messages = FastList.newInstance();
Boolean resultBool = BaseCompare.doRealCompare(fieldVal, toFieldVal, operator, type, format, messages, null, null, false);
if (messages.size() > 0) {
messages.add(0, "Error with comparison in if-compare-field between field [" + fieldAcsr.toString() + "] with value [" + fieldVal + "] and to-field [" + toFieldVal.toString() + "] with value [" + toFieldVal + "] with operator [" + operator + "] and type [" + type + "]: ");