4 files changed, 70 insertions, 65 deletions
diff --git a/src/org/traccar/model/BaseEvent.java b/src/org/traccar/model/BaseEvent.java
new file mode 100644
index 000000000..4bc1dd060
--- /dev/null
+++ b/src/org/traccar/model/BaseEvent.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013 - 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.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class BaseEvent {
+
+    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);
+    }
+
+}
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();
     }
 
 }
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 21951d115..b7e711c7f 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -19,34 +19,19 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class Position {
-    
-    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; }
+public class Position extends BaseEvent implements Factory {
 
-    private Date deviceTime;
-    public Date getDeviceTime() { return deviceTime; }
-    public void setDeviceTime(Date deviceTime) { this.deviceTime = deviceTime; }
+    @Override
+    public Position create() {
+        return new Position();
+    }
 
     private Date fixTime;
     public Date getFixTime() { return fixTime; }
     public void setFixTime(Date fixTime) { this.fixTime = fixTime; }
     
     public void setTime(Date time) {
-        deviceTime = time;
+        setDeviceTime(time);
         fixTime = time;
     }
 
@@ -78,14 +63,4 @@ public class Position {
     public String getAddress() { return address; }
     public void setAddress(String address) { this.address = address; }
 
-    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);
-    }
-
 }
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index ea4617e54..fb060d1d6 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -15,7 +15,12 @@
  */
 package org.traccar.model;
 
-public class User {
+public class User implements Factory {
+
+    @Override
+    public User create() {
+        return new User();
+    }
 
     private long id;
     public long getId() { return id; }