Refactor model classes

1 files changed, 14 insertions, 49 deletions

diff --git a/src/org/traccar/model/Data.java b/src/org/traccar/model/Data.java
index 82a9630d5..ce23154c2 100644
--- a/src/org/traccar/model/Data.java
+++ b/src/org/traccar/model/Data.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ * 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.
@@ -17,61 +17,26 @@ 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;
+    private long id;
+    public long getId() { return id; }
+    public void setId(long id) { this.id = id; }
 
-    public Long getDeviceId() {
-        return deviceId;
-    }
+    private long deviceId;
+    public long getDeviceId() { return deviceId; }
+    public void setDeviceId(long deviceId) { this.deviceId = 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; }
 
-    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; }
 
-    /**
-     * Extended information in XML format
-     */
     private String extendedInfo;
-
-    public String getExtendedInfo() {
-        return extendedInfo;
-    }
-
-    public void setExtendedInfo(String extendedInfo) {
-        this.extendedInfo = extendedInfo;
-    }
+    public String getExtendedInfo() { return extendedInfo; }
+    public void setExtendedInfo(String extendedInfo) { this.extendedInfo = extendedInfo; }
 
 }