svn commit: r748971 - /ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java

Author: jleroux
Date: Sun Mar  1 07:58:04 2009
New Revision: 748971

URL: http://svn.apache.org/viewvc?rev=748971&view=rev
Log:
This file has not been updated during the Simple Method Cleanup Effort. See https://issues.apache.org/jira/browse/OFBIZ-2213

Modified:
    ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java?rev=748971&r1=748970&r2=748971&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java Sun Mar  1 07:58:04 2009
@@ -72,8 +72,13 @@
     public RegexpCondition(Element element, SimpleMethod simpleMethod) {
         this.simpleMethod = simpleMethod;
         
+        // NOTE: this is still supported, but is deprecated
         this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
-        this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name"));
+        this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"));
+        if (this.fieldAcsr.isEmpty()) {
+            // NOTE: this is still supported, but is deprecated
+            this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name"));
+        }
 
         this.exprExdr = FlexibleStringExpander.getInstance(element.getAttribute("expr"));
     }