aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/notification/PropertiesProvider.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/notification/PropertiesProvider.java')
-rw-r--r--src/org/traccar/notification/PropertiesProvider.java23
1 files changed, 18 insertions, 5 deletions
diff --git a/src/org/traccar/notification/PropertiesProvider.java b/src/org/traccar/notification/PropertiesProvider.java
index e7cac8d0f..c5ba688e8 100644
--- a/src/org/traccar/notification/PropertiesProvider.java
+++ b/src/org/traccar/notification/PropertiesProvider.java
@@ -16,27 +16,27 @@
package org.traccar.notification;
import org.traccar.Config;
-import org.traccar.model.Extensible;
+import org.traccar.model.ExtendedModel;
public class PropertiesProvider {
private Config config;
- private Extensible extensible;
+ private ExtendedModel extendedModel;
public PropertiesProvider(Config config) {
this.config = config;
}
- public PropertiesProvider(Extensible extensible) {
- this.extensible = extensible;
+ public PropertiesProvider(ExtendedModel extendedModel) {
+ this.extendedModel = extendedModel;
}
public String getString(String key) {
if (config != null) {
return config.getString(key);
} else {
- return extensible.getString(key);
+ return extendedModel.getString(key);
}
}
@@ -48,4 +48,17 @@ public class PropertiesProvider {
return value;
}
+ public int getInteger(String key, int defaultValue) {
+ if (config != null) {
+ return config.getInteger(key, defaultValue);
+ } else {
+ Object result = extendedModel.getAttributes().get(key);
+ if (result != null) {
+ return result instanceof String ? Integer.parseInt((String) result) : (Integer) result;
+ } else {
+ return defaultValue;
+ }
+ }
+ }
+
}