1 files changed, 13 insertions, 50 deletions

diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index 600669579..b0364051e 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -317,80 +317,43 @@ public class DeviceManager implements IdentityManager {
         groupsById.remove(groupId);
     }
 
-    public boolean lookupServerBoolean(long deviceId, String attributeName, boolean defaultValue) {
-        String result = lookupAttribute(deviceId, attributeName, true);
+    public boolean lookupAttributeBoolean(long deviceId, String attributeName, boolean defaultValue,
+            boolean lookupServer) {
+        String result = lookupAttribute(deviceId, attributeName, lookupServer);
         if (result != null) {
             return Boolean.parseBoolean(result);
         }
         return defaultValue;
     }
 
-    public String lookupServerString(long deviceId, String attributeName, String defaultValue) {
-        String result = lookupAttribute(deviceId, attributeName, true);
+    public String lookupAttributeString(long deviceId, String attributeName, String defaultValue,
+            boolean lookupServer) {
+        String result = lookupAttribute(deviceId, attributeName, lookupServer);
         if (result != null) {
             return result;
         }
         return defaultValue;
     }
 
-    public int lookupServerInteger(long deviceId, String attributeName, int defaultValue) {
-        String result = lookupAttribute(deviceId, attributeName, true);
+    public int lookupAttributeInteger(long deviceId, String attributeName, int defaultValue, boolean lookupServer) {
+        String result = lookupAttribute(deviceId, attributeName, lookupServer);
         if (result != null) {
             return Integer.parseInt(result);
         }
         return defaultValue;
     }
 
-    public long lookupServerLong(long deviceId, String attributeName, long defaultValue) {
-        String result = lookupAttribute(deviceId, attributeName, true);
+    public long lookupAttributeLong(long deviceId, String attributeName, long defaultValue, boolean lookupServer) {
+        String result = lookupAttribute(deviceId, attributeName, lookupServer);
         if (result != null) {
             return Long.parseLong(result);
         }
         return defaultValue;
     }
 
-    public double lookupServerDouble(long deviceId, String attributeName, double defaultValue) {
-        String result = lookupAttribute(deviceId, attributeName, true);
-        if (result != null) {
-            return Double.parseDouble(result);
-        }
-        return defaultValue;
-    }
-
-    public boolean lookupConfigBoolean(long deviceId, String attributeName, boolean defaultValue) {
-        String result = lookupAttribute(deviceId, attributeName, false);
-        if (result != null) {
-            return Boolean.parseBoolean(result);
-        }
-        return defaultValue;
-    }
-
-    public String lookupConfigString(long deviceId, String attributeName, String defaultValue) {
-        String result = lookupAttribute(deviceId, attributeName, false);
-        if (result != null) {
-            return result;
-        }
-        return defaultValue;
-    }
-
-    public int lookupConfigInteger(long deviceId, String attributeName, int defaultValue) {
-        String result = lookupAttribute(deviceId, attributeName, false);
-        if (result != null) {
-            return Integer.parseInt(result);
-        }
-        return defaultValue;
-    }
-
-    public long lookupConfigLong(long deviceId, String attributeName, long defaultValue) {
-        String result = lookupAttribute(deviceId, attributeName, false);
-        if (result != null) {
-            return Long.parseLong(result);
-        }
-        return defaultValue;
-    }
-
-    public double lookupConfigDouble(long deviceId, String attributeName, double defaultValue) {
-        String result = lookupAttribute(deviceId, attributeName, false);
+    public double lookupAttributeDouble(long deviceId, String attributeName, double defaultValue,
+            boolean lookupServer) {
+        String result = lookupAttribute(deviceId, attributeName, lookupServer);
         if (result != null) {
             return Double.parseDouble(result);
         }