Refactor model classes

1 files changed, 10 insertions, 24 deletions

diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index cd1985e37..273faebcf 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -20,37 +20,23 @@ import java.util.Date;
 public class Device {
 
     private long id;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
+    public long getId() { return id; }
+    public void setId(long id) { this.id = id; }
     
     private String name;
-
-    public String getName() {
-        return uniqueId;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
+    public String getName() { return uniqueId; }
+    public void setName(String name) { this.name = name; }
 
     private String uniqueId;
-
-    public String getUniqueId() {
-        return uniqueId;
-    }
-
-    public void setUniqueId(String uniqueId) {
-        this.uniqueId = uniqueId;
-    }
+    public String getUniqueId() { return uniqueId; }
+    public void setUniqueId(String uniqueId) { this.uniqueId = uniqueId; }
     
     private String status;
     
     private Date lastUpdate;
+    
+    private long positionId;
+    
+    private long dataId;
 
 }