svn commit: r905864 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java

[adrianc]

Author: adrianc
Date: Wed Feb  3 01:47:45 2010
New Revision: 905864

URL: http://svn.apache.org/viewvc?rev=905864&view=rev
Log:
Removed the NullExpr class that was created to fix the problem with checking FlexibleStringExpander.getOriginal() for null.

This commit might affect user modifications. Any code that checks FlexibleStringExpander.getOriginal() for null should be changed to use FlexibleStringExpander.isEmpty() instead.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=905864&r1=905863&r2=905864&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java Wed Feb  3 01:47:45 2010
@@ -56,7 +56,7 @@
     public static final String openBracket = "${";
     public static final String closeBracket = "}";
     protected static final UtilCache<String, FlexibleStringExpander> exprCache = UtilCache.createUtilCache("flexibleStringExpander.ExpressionCache");
-    protected static final FlexibleStringExpander nullExpr = new NullElem();
+    protected static final FlexibleStringExpander nullExpr = new ConstElem("");
 
     /** Does on-the-fly parsing and expansion of the original String using
      * variable values from the passed context. A null context argument will
@@ -400,24 +400,6 @@
         }
     }
 
-    protected static class NullElem extends FlexibleStringExpander {
-        protected NullElem() {
-            super("");
-        }
-        @Override
-        public void append(StringBuilder buffer, Map<String, ? extends Object> context, TimeZone timeZone, Locale locale) {}
-        /** Returns null to maintain backward compatibility.
-         */
-        @Override
-        public String getOriginal() {
-            return null;
-        }
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    }
-
     protected static class VarElem extends FlexibleStringExpander {
         protected final char[] bracketedOriginal;
         protected VarElem(String original) {