Clean up some model classes

3 files changed, 132 insertions, 60 deletions

diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java
index 56e709150..09bb81a74 100644
--- a/src/org/traccar/model/Command.java
+++ b/src/org/traccar/model/Command.java
@@ -1,32 +1,6 @@
 package org.traccar.model;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class Command implements Factory {
-
-    @Override
-    public Command create() {
-        return new Command();
-    }
-
-    private long deviceId;
-    public long getDeviceId() { return deviceId; }
-    public void setDeviceId(long deviceId) { this.deviceId = deviceId; }
-
-    private String type;
-    public String getType() { return type; }
-    public void setType(String type) { this.type = type; }
-
-    private Map<String, Object> attributes = new LinkedHashMap<>();
-    public Map<String, Object> getAttributes() { return attributes; }
-    public void setAttributes(Map<String, Object> attributes) { this.attributes = attributes; }
-
-    public void set(String key, boolean value) { attributes.put(key, value); }
-    public void set(String key, int value) { attributes.put(key, value); }
-    public void set(String key, long value) { attributes.put(key, value); }
-    public void set(String key, double value) { attributes.put(key, value); }
-    public void set(String key, String value) { if (value != null && !value.isEmpty()) attributes.put(key, value); }
+public class Command extends Extensible implements Factory {
 
     public static final String TYPE_POSITION_SINGLE = "positionSingle";
     public static final String TYPE_POSITION_PERIODIC = "positionPeriodic";
@@ -42,4 +16,29 @@ public class Command implements Factory {
     public static final String KEY_TIMEZONE = "timezone";
     public static final String KEY_DEVICE_PASSWORD = "devicePassword";
 
+    @Override
+    public Command create() {
+        return new Command();
+    }
+
+    private long deviceId;
+
+    public long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(long deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
 }
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 953bd1770..9ad54adbf 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -16,40 +16,8 @@
 package org.traccar.model;
 
 import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.Map;
 
-public abstract class Event {
-
-    private long id;
-    public long getId() { return id; }
-    public void setId(long id) { this.id = id; }
-
-    private String protocol;
-    public String getProtocol() { return protocol; }
-    public void setProtocol(String protocol) { this.protocol = protocol; }
-
-    private long deviceId;
-    public long getDeviceId() { return deviceId; }
-    public void setDeviceId(long deviceId) { this.deviceId = deviceId; }
-
-    private Date serverTime;
-    public Date getServerTime() { return serverTime; }
-    public void setServerTime(Date serverTime) { this.serverTime = serverTime; }
-
-    private Date deviceTime;
-    public Date getDeviceTime() { return deviceTime; }
-    public void setDeviceTime(Date deviceTime) { this.deviceTime = deviceTime; }
-
-    private Map<String, Object> attributes = new LinkedHashMap<>();
-    public Map<String, Object> getAttributes() { return attributes; }
-    public void setAttributes(Map<String, Object> attributes) { this.attributes = attributes; }
-
-    public void set(String key, boolean value) { attributes.put(key, value); }
-    public void set(String key, int value) { attributes.put(key, value); }
-    public void set(String key, long value) { attributes.put(key, value); }
-    public void set(String key, double value) { attributes.put(key, value); }
-    public void set(String key, String value) { if (value != null && !value.isEmpty()) attributes.put(key, value); }
+public abstract class Event extends Extensible {
 
     // Words separated by dashes (word-second-third)
     public static final String KEY_INDEX = "index";
@@ -91,4 +59,54 @@ public abstract class Event {
     public static final String PREFIX_IO = "io";
     public static final String PREFIX_COUNT = "count";
 
+    private long id;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    private String protocol;
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+
+    private long deviceId;
+
+    public long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(long deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    private Date serverTime;
+
+    public Date getServerTime() {
+        return serverTime;
+    }
+
+    public void setServerTime(Date serverTime) {
+        this.serverTime = serverTime;
+    }
+
+    private Date deviceTime;
+
+    public Date getDeviceTime() {
+        return deviceTime;
+    }
+
+    public void setDeviceTime(Date deviceTime) {
+        this.deviceTime = deviceTime;
+    }
+
 }
diff --git a/src/org/traccar/model/Extensible.java b/src/org/traccar/model/Extensible.java
new file mode 100644
index 000000000..954f3deac
--- /dev/null
+++ b/src/org/traccar/model/Extensible.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.model;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public abstract class Extensible {
+    
+    private Map<String, Object> attributes = new LinkedHashMap<>();
+
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(Map<String, Object> attributes) {
+        this.attributes = attributes;
+    }
+
+    public void set(String key, boolean value) {
+        attributes.put(key, value);
+    }
+
+    public void set(String key, int value) {
+        attributes.put(key, value);
+    }
+
+    public void set(String key, long value) {
+        attributes.put(key, value);
+    }
+
+    public void set(String key, double value) {
+        attributes.put(key, value);
+    }
+
+    public void set(String key, String value) {
+        if (value != null && !value.isEmpty()) {
+            attributes.put(key, value);
+        }
+    }
+
+}