| @@ -37,6 +37,7 @@
import org.icesoft.util.Configuration;
import org.icesoft.util.ConfigurationException;
import org.icesoft.util.NameValuePair;
+import org.icesoft.util.StringUtilities;
import org.icesoft.util.servlet.ExtensionRegistry;
public abstract class AbstractNotificationProvider
@@ -185,24 +186,27 @@
return notificationListenerSetLock;
}
+ // TODO: Remove this method.
protected Object getProperty(
- final Map<Category, Map<String, Object>> categoryToPropertyMap, final String name) {
+ final Map<NotificationProvider.Category, Map<String, Object>> categoryToPropertyMap, final String name) {
return getProperty(categoryToPropertyMap, name, (Object)null);
}
+ // TODO: Remove this method.
protected Object getProperty(
- final Map<Category, Map<String, Object>> categoryToPropertyMap, final String name, final Object defaultValue) {
+ final Map<NotificationProvider.Category, Map<String, Object>> categoryToPropertyMap, final String name,
+ final Object defaultValue) {
- if (isNotNullAndIsNotEmpty(categoryToPropertyMap) && isNotNullAndIsNotEmpty(name)) {
+ if (isNotNullAndIsNotEmpty(categoryToPropertyMap) && StringUtilities.isNotNullAndIsNotEmpty(name)) {
if (categoryToPropertyMap.containsKey(getCategory())) {
Map<String, Object> _propertyMap = categoryToPropertyMap.get(getCategory());
if (isNotNullAndIsNotEmpty(_propertyMap) && _propertyMap.containsKey(name)) {
return _propertyMap.get(name);
}
}
- if (categoryToPropertyMap.containsKey(Category.GLOBAL)) {
- Map<String, Object> _propertyMap = categoryToPropertyMap.get(Category.GLOBAL);
+ if (categoryToPropertyMap.containsKey(NotificationProvider.Category.GLOBAL)) {
+ Map<String, Object> _propertyMap = categoryToPropertyMap.get(NotificationProvider.Category.GLOBAL);
if (isNotNullAndIsNotEmpty(_propertyMap) && _propertyMap.containsKey(name)) {
return _propertyMap.get(name);
}
|
