diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-07-26 01:09:49 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-26 01:09:49 +1200 |
commit | 4064f864e20d3d40025a94e10cf56084d2c78287 (patch) | |
tree | 0a9e69d6139e19a830a979a45b76f82ccbe27bb4 /src/org/traccar | |
parent | 7e20896334f4f6927cf14c5272cf7d893efc3a05 (diff) | |
parent | fb0a1689fda9a06ecf5e6a9a97ba8b2b704cacb9 (diff) | |
download | trackermap-server-4064f864e20d3d40025a94e10cf56084d2c78287.tar.gz trackermap-server-4064f864e20d3d40025a94e10cf56084d2c78287.tar.bz2 trackermap-server-4064f864e20d3d40025a94e10cf56084d2c78287.zip |
Merge pull request #2155 from Abyss777/attributes
Added group and server attributes
Diffstat (limited to 'src/org/traccar')
-rw-r--r-- | src/org/traccar/model/Group.java | 12 | ||||
-rw-r--r-- | src/org/traccar/model/Server.java | 12 |
2 files changed, 2 insertions, 22 deletions
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; |