svn commit: r818515 - in /ofbiz/branches/release09.04: ./ framework/base/src/org/ofbiz/base/util/string/UelUtil.java

[adrianc]

Author: adrianc
Date: Thu Sep 24 15:20:56 2009
New Revision: 818515

URL: http://svn.apache.org/viewvc?rev=818515&view=rev
Log:
Merged rev 818500 from trunk.

UEL bug fix. Patch provided by Mridul Pathak - https://issues.apache.org/jira/browse/OFBIZ-2928.


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/string/UelUtil.java

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 15:20:56 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500

Modified: ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/string/UelUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/string/UelUtil.java?rev=818515&r1=818514&r2=818515&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/string/UelUtil.java (original)
+++ ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/string/UelUtil.java Thu Sep 24 15:20:56 2009
@@ -18,6 +18,7 @@
  *******************************************************************************/
 package org.ofbiz.base.util.string;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -133,18 +134,7 @@
          * @return a BasicValueExpression containing the variable's value or null if the variable is unknown
          */
         public ValueExpression resolveVariable(String variable) {
-            Object obj = null;
-            //Object obj = this.variables.get(variable);
-            if (this.variables instanceof LocalizedMap) {
-                Locale locale = UtilMisc.ensureLocale(this.variables.get("locale"));
-                Object localizedObj = ((LocalizedMap) this.variables).get(variable, locale);
-                if (localizedObj == null) {
-                    localizedObj = this.variables.get(variable);
-                }
-                obj = localizedObj;
-            } else {
-                obj = this.variables.get(variable);
-            }
+            Object obj = UelUtil.resolveVariable(variable, this.variables, null);
             if (obj != null) {
                 return new BasicValueExpression(obj);
             }
@@ -268,7 +258,7 @@
         }
     }
 
-    /** Custom <code>MapELResolver</code> class used to accomodate
+    /** Custom <code>MapELResolver</code> class used to accommodate
      * <code>LocalizedMap</code> instances.
      */
     protected static class ExtendedMapResolver extends MapELResolver {
@@ -305,7 +295,11 @@
                     }
                     locale = Locale.getDefault();
                 }
-                return map.get(property.toString(), locale);
+                return resolveVariable(property.toString(), (Map) map, locale);
+            }
+            if (base != null && base instanceof Map && property instanceof String) {
+                context.setPropertyResolved(true);
+                return resolveVariable(property.toString(), (Map) base, null);
             }
             return super.getValue(context, base, property);
         }
@@ -352,4 +346,71 @@
         result = result.replace("[]", "['add']");
         return result;
     }
+
+    @SuppressWarnings("unchecked")
+    public static Object resolveVariable(String variable, Map<String, Object> variables, Locale locale) {
+        Object obj = null;
+        String createObjectType = null;
+        String name = variable;
+        if (variable.contains("$")) {
+            if (variable.endsWith("$string")) {
+                name = variable.substring(0, variable.length() - 7);
+                createObjectType = "string";
+            } else if (variable.endsWith("$null")) {
+                name = variable.substring(0, variable.length() - 5);
+                createObjectType = "null";
+            } else if (variable.endsWith("$boolean")) {
+                name = variable.substring(0, variable.length() - 8);
+                createObjectType = "boolean";
+            } else if (variable.endsWith("$integer")) {
+                name = variable.substring(0, variable.length() - 8);
+                createObjectType = "integer";
+            } else if (variable.endsWith("$long")) {
+                name = variable.substring(0, variable.length() - 5);
+                createObjectType = "long";
+            } else if (variable.endsWith("$double")) {
+                name = variable.substring(0, variable.length() - 7);
+                createObjectType = "double";
+            } else if (variable.endsWith("$bigDecimal")) {
+                name = variable.substring(0, variable.length() - 11);
+                createObjectType = "bigDecimal";
+            }
+        }
+        if (variables instanceof LocalizedMap) {
+            if (locale == null) {
+                locale = (Locale) variables.get(localizedMapLocaleKey);
+                if (locale == null) {
+                    locale = (Locale) variables.get("locale");
+                    if (locale == null) {
+                        locale = Locale.getDefault();
+                    }
+                }
+            }
+            obj = ((LocalizedMap<?>) variables).get(name, locale);
+        } else {
+            obj = variables.get(name);
+        }
+        if (obj != null) {
+            return obj;
+        }
+        if (createObjectType != null) {
+            if ("string".equals(createObjectType)) {
+                return "";
+            } else if ("null".equals(createObjectType)) {
+                return null;
+            } else if ("boolean".equals(createObjectType)) {
+                return Boolean.FALSE;
+            } else if ("integer".equals(createObjectType)) {
+                return Integer.valueOf(0);
+            } else if ("long".equals(createObjectType)) {
+                return Long.valueOf(0);
+            } else if ("double".equals(createObjectType)) {
+                return Double.valueOf(0);
+            } else if ("bigDecimal".equals(createObjectType)) {
+                return BigDecimal.ZERO;
+            }
+        }
+        return null;
+    }
+
 }