Author: adrianc
Date: Tue Sep 13 11:51:49 2011
New Revision: 1170125
URL:
http://svn.apache.org/viewvc?rev=1170125&view=revLog:
Have FlexibleMapAccessor and FlexibleStringExpander implement IsEmpty so they can be evaluated by the various validation utilities.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java?rev=1170125&r1=1170124&r2=1170125&view=diff==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java Tue Sep 13 11:51:49 2011
@@ -23,6 +23,7 @@ import java.util.Locale;
import java.util.Map;
import javax.el.PropertyNotFoundException;
+import org.ofbiz.base.lang.IsEmpty;
import org.ofbiz.base.lang.SourceMonitored;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilGenerics;
@@ -39,7 +40,7 @@ import org.ofbiz.base.util.string.UelUti
*/
@SourceMonitored
@SuppressWarnings("serial")
-public class FlexibleMapAccessor<T> implements Serializable {
+public class FlexibleMapAccessor<T> implements Serializable, IsEmpty {
public static final String module = FlexibleMapAccessor.class.getName();
protected static final UtilCache<String, FlexibleMapAccessor<?>> fmaCache = UtilCache.createUtilCache("flexibleMapAccessor.ExpressionCache");
@SuppressWarnings("unchecked")
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=1170125&r1=1170124&r2=1170125&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 Tue Sep 13 11:51:49 2011
@@ -27,6 +27,7 @@ import java.util.TimeZone;
import javax.el.PropertyNotFoundException;
+import org.ofbiz.base.lang.IsEmpty;
import org.ofbiz.base.lang.SourceMonitored;
import org.ofbiz.base.util.BshUtil;
import org.ofbiz.base.util.Debug;
@@ -52,7 +53,7 @@ import bsh.EvalError;
*/
@SourceMonitored
@SuppressWarnings("serial")
-public abstract class FlexibleStringExpander implements Serializable {
+public abstract class FlexibleStringExpander implements Serializable, IsEmpty {
public static final String module = FlexibleStringExpander.class.getName();
public static final String openBracket = "${";