From 94ea366eb33694447812e6d63133aea28379d6f4 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 18 Jul 2016 11:12:14 +0500 Subject: - Added attributes to devices - Fixed license header for DeviceManager.java - Fixed editing attributes for not saved (new) object. --- src/org/traccar/database/DeviceManager.java | 15 +++++++++++++++ src/org/traccar/model/Device.java | 12 +----------- 2 files changed, 16 insertions(+), 11 deletions(-) (limited to 'src/org') 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; -- cgit v1.2.3