From f87def6699827f37e7ac93fd340383f5b38416ff Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 28 Sep 2013 14:03:40 +1200
Subject: Add data class

---
 src/org/traccar/model/Data.java     | 77 +++++++++++++++++++++++++++++++++++++
 src/org/traccar/model/Position.java | 43 +--------------------
 2 files changed, 79 insertions(+), 41 deletions(-)
 create mode 100644 src/org/traccar/model/Data.java

(limited to 'src/org/traccar')

diff --git a/src/org/traccar/model/Data.java b/src/org/traccar/model/Data.java
new file mode 100644
index 000000000..82a9630d5
--- /dev/null
+++ b/src/org/traccar/model/Data.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2013 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;
+
+/**
+ * Data without location
+ */
+public class Data {
+
+    /**
+     * Id
+     */
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * Device
+     */
+    private Long deviceId;
+
+    public Long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(Long deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    /**
+     * Server time (UTC)
+     */
+    private Date serverTime;
+
+    public Date getServerTime() {
+        return serverTime;
+    }
+
+    public void setServerTime(Date serverTime) {
+        this.serverTime = serverTime;
+    }
+
+    /**
+     * Extended information in XML format
+     */
+    private String extendedInfo;
+
+    public String getExtendedInfo() {
+        return extendedInfo;
+    }
+
+    public void setExtendedInfo(String extendedInfo) {
+        this.extendedInfo = extendedInfo;
+    }
+
+}
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 744019bc0..0ee79b744 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2013 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.
@@ -20,33 +20,7 @@ import java.util.Date;
 /**
  * Position information
  */
-public class Position {
-
-    /**
-     * Id
-     */
-    private Long id;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * Device
-     */
-    private Long deviceId;
-
-    public Long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(Long deviceId) {
-        this.deviceId = deviceId;
-    }
+public class Position extends Data {
 
     /**
      * Time (UTC)
@@ -152,17 +126,4 @@ public class Position {
         this.address = address;
     }
 
-    /**
-     * Extended information in XML format
-     */
-    private String extendedInfo;
-
-    public String getExtendedInfo() {
-        return extendedInfo;
-    }
-
-    public void setExtendedInfo(String extendedInfo) {
-        this.extendedInfo = extendedInfo;
-    }
-
 }
-- 
cgit v1.2.3