aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-18 23:26:48 +1200
committerGitHub <noreply@github.com>2016-07-18 23:26:48 +1200
commit464711d63dafb44e89f3d4112f13250f268c11cd (patch)
treee4342fb8dd0f743fad8060ca1029504410ce4c21 /src
parentd3e063cf9de8a45bed4dfe87b73aadfd8d2edeab (diff)
parentbbfe8e8c328a660b8bdcdf089a8cd798cbbc5f2d (diff)
downloadtraccar-server-464711d63dafb44e89f3d4112f13250f268c11cd.tar.gz
traccar-server-464711d63dafb44e89f3d4112f13250f268c11cd.tar.bz2
traccar-server-464711d63dafb44e89f3d4112f13250f268c11cd.zip
Merge pull request #2123 from Abyss777/device_attributes
Add attributes for devices
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/database/DeviceManager.java15
-rw-r--r--src/org/traccar/model/Device.java12
2 files changed, 16 insertions, 11 deletions
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index 70df1cc1a..173e68062 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.traccar.database;
import java.sql.SQLException;
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index c42eb3718..1669aee31 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -18,17 +18,7 @@ package org.traccar.model;
import java.util.Date;
import java.util.List;
-public class Device {
-
- private long id;
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
+public class Device extends Extensible {
private String name;