Merge remote-tracking branch 'refs/remotes/tananaev/master'

3 files changed, 2 insertions, 35 deletions

diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index 1669aee31..e90742836 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -92,19 +92,6 @@ public class Device extends Extensible {
         this.groupId = groupId;
     }
 
-    public static final String STATUS_MOVING = "moving";
-    public static final String STATUS_STOPPED = "stopped";
-
-    private String motion;
-
-    public String getMotion() {
-        return motion;
-    }
-
-    public void setMotion(String motion) {
-        this.motion = motion;
-    }
-
     private List<Long> geofenceIds;
 
     public List<Long> getGeofenceIds() {
diff --git a/src/org/traccar/model/Group.java b/src/org/traccar/model/Group.java
index 00f2b2cfc..e70b3f3d5 100644
--- a/src/org/traccar/model/Group.java
+++ b/src/org/traccar/model/Group.java
@@ -15,17 +15,7 @@
  */
 package org.traccar.model;
 
-public class Group {
-
-    private long id;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
+public class Group extends Extensible {
 
     private String name;
 
diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index 270fd61fa..b1557bf8f 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -15,17 +15,7 @@
  */
 package org.traccar.model;
 
-public class Server {
-
-    private long id;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
+public class Server extends Extensible {
 
     private boolean registration;