Thanks for doing these Scott... I totally forgot that there were two
sections of code that cover these same tags.
-David
On Jun 13, 2008, at 1:32 AM, [EMAIL PROTECTED] wrote:
Author: lektran
Date: Fri Jun 13 00:32:20 2008
New Revision: 667393
URL: http://svn.apache.org/viewvc?rev=667393&view=rev
Log:
A couple more fixes related to the recent minilang changes
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/
conditional/CompareCondition.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/
conditional/CompareFieldCondition.java
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/
method/conditional/CompareCondition.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java?rev=667393&r1=667392&r2=667393&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/
conditional/CompareCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/
conditional/CompareCondition.java Fri Jun 13 00:32:20 2008
@@ -46,8 +46,13 @@
public CompareCondition(Element element, SimpleMethod
simpleMethod) {
this.simpleMethod = simpleMethod;
+ // NOTE: this is still supported, but is deprecated
this.mapAcsr = new ContextAccessor(element.getAttribute("map-
name"));
- this.fieldAcsr = new
ContextAccessor(element.getAttribute("field-name"));
+ this.fieldAcsr = new
ContextAccessor(element.getAttribute("field"));
+ if (this.fieldAcsr.isEmpty()) {
+ // NOTE: this is still supported, but is deprecated
+ this.fieldAcsr = new
ContextAccessor(element.getAttribute("field-name"));
+ }
this.value = element.getAttribute("value");
this.operator = element.getAttribute("operator");
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/
method/conditional/CompareFieldCondition.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java?rev=667393&r1=667392&r2=667393&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/
conditional/CompareFieldCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/
conditional/CompareFieldCondition.java Fri Jun 13 00:32:20 2008
@@ -46,12 +46,22 @@
public CompareFieldCondition(Element element, SimpleMethod
simpleMethod) {
this.simpleMethod = simpleMethod;
+ // NOTE: this is still supported, but is deprecated
this.mapAcsr = new ContextAccessor(element.getAttribute("map-
name"));
- this.fieldAcsr = new
ContextAccessor(element.getAttribute("field-name"));
+ this.fieldAcsr = new
ContextAccessor(element.getAttribute("field"));
+ if (this.fieldAcsr.isEmpty()) {
+ // NOTE: this is still supported, but is deprecated
+ this.fieldAcsr = new
ContextAccessor(element.getAttribute("field-name"));
+ }
+ // NOTE: this is still supported, but is deprecated
this.toMapAcsr = new
ContextAccessor(element.getAttribute("to-map-name"));
- // set fieldAcsr to their defualt value of fieldAcsr if empty
- this.toFieldAcsr = new
ContextAccessor(element.getAttribute("to-field-name"),
this.fieldAcsr.toString());
+ // set fieldAcsr to their default value of fieldAcsr if empty
+ this.toFieldAcsr = new
ContextAccessor(element.getAttribute("to-field"),
element.getAttribute("field"));
+ if (this.toFieldAcsr.isEmpty()) {
+ // NOTE: this is still supported, but is deprecated
+ this.toFieldAcsr = new
ContextAccessor(element.getAttribute("to-field-name"),
element.getAttribute("field-name"));
+ }
// do NOT default the to-map-name to the map-name because that
//would make it impossible to compare from a map field to an
