From a5f47492857a175548beff07cfb565129f687ae2 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 28 Apr 2015 22:41:07 +1200
Subject: Implement API to create devices

---
 src/org/traccar/model/Data.java | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'src/org/traccar/model/Data.java')

diff --git a/src/org/traccar/model/Data.java b/src/org/traccar/model/Data.java
index 1cef813a3..e329e6c1e 100644
--- a/src/org/traccar/model/Data.java
+++ b/src/org/traccar/model/Data.java
@@ -15,15 +15,16 @@
  */
 package org.traccar.model;
 
+import java.sql.ResultSet;
 import java.text.ParseException;
 import java.util.Date;
 import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
-import org.traccar.database.JsonConvertable;
-import static org.traccar.database.JsonConvertable.dateFormat;
+import org.traccar.database.Convertable;
+import org.traccar.database.ObjectConverter;
 
-public class Data implements JsonConvertable {
+public class Data implements Convertable {
 
     private long id;
     public long getId() { return id; }
@@ -50,8 +51,8 @@ public class Data implements JsonConvertable {
         JsonObjectBuilder json = Json.createObjectBuilder();
         json.add("id", id);
         json.add("deviceId", deviceId);
-        json.add("serverTime", dateFormat.format(serverTime));
-        json.add("deviceTime", dateFormat.format(deviceTime));
+        json.add("serverTime", ObjectConverter.dateFormat.format(serverTime));
+        json.add("deviceTime", ObjectConverter.dateFormat.format(deviceTime));
         //json.add("extendedInfo", extendedInfo);
         return json.build();
     }
@@ -60,9 +61,13 @@ public class Data implements JsonConvertable {
     public void fromJson(JsonObject json) throws ParseException {
         id = json.getJsonNumber("id").longValue();
         deviceId = json.getJsonNumber("deviceId").longValue();
-        serverTime = dateFormat.parse(json.getString("serverTime"));
-        deviceTime = dateFormat.parse(json.getString("deviceTime"));
+        serverTime = ObjectConverter.dateFormat.parse(json.getString("serverTime"));
+        deviceTime = ObjectConverter.dateFormat.parse(json.getString("deviceTime"));
         //extendedInfo = json.getString("extendedInfo");
     }
 
+    @Override
+    public void fromRecord(ResultSet record) {
+    }
+
 }
-- 
cgit v1.2.3