Create base event class

1 files changed, 4 insertions, 33 deletions

diff --git a/src/org/traccar/model/Data.java b/src/org/traccar/model/Data.java
index d8f898317..cd72dcbb7 100644
--- a/src/org/traccar/model/Data.java
+++ b/src/org/traccar/model/Data.java
@@ -15,40 +15,11 @@
  */
 package org.traccar.model;
 
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.Map;
+public class Data extends BaseEvent implements Factory {
 
-public class Data {
-
-    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 final Map<String, Object> other = new LinkedHashMap<String, Object>();
-    public void set(String key, Object value) {
-        if (value != null && (!(value instanceof String) || !((String) value).isEmpty())) {
-            other.put(key, value);
-        }
-    }
-    public String getOther() {
-        return MiscFormatter.toXmlString(other);
+    @Override
+    public Data create() {
+        return new Data();
     }
 
 }