diff options
| author | Abyss777 <abyss@fox5.ru> | 2016-10-21 06:12:37 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2016-10-21 06:12:37 +0500 |
| commit | 1756637b8727f592712950e12a99521e5f5c636e (patch) | |
| tree | 8195f8ab0e05ff23153782dec1444f8fda790264 | |
| parent | f7a00616b14821203f89e63d9c887b3e98b9826e (diff) | |
| download | trackermap-server-1756637b8727f592712950e12a99521e5f5c636e.tar.gz trackermap-server-1756637b8727f592712950e12a99521e5f5c636e.tar.bz2 trackermap-server-1756637b8727f592712950e12a99521e5f5c636e.zip | |
Rename type to category
| -rw-r--r-- | debug.xml | 6 | ||||
| -rw-r--r-- | schema/changelog-3.8.xml | 2 | ||||
| -rw-r--r-- | src/org/traccar/model/Device.java | 10 |
3 files changed, 9 insertions, 9 deletions
@@ -168,8 +168,8 @@ </entry> <entry key='database.insertDevice'> - INSERT INTO devices (name, uniqueId, groupId, attributes, phone, model, contact, type) - VALUES (:name, :uniqueId, :groupId, :attributes, :phone, :model, :contact, :type) + INSERT INTO devices (name, uniqueId, groupId, attributes, phone, model, contact, category) + VALUES (:name, :uniqueId, :groupId, :attributes, :phone, :model, :contact, :category) </entry> <entry key='database.updateDevice'> @@ -181,7 +181,7 @@ phone = :phone, model = :model, contact = :contact, - type = :type + category = :category WHERE id = :id </entry> diff --git a/schema/changelog-3.8.xml b/schema/changelog-3.8.xml index dbf04df79..780a2d029 100644 --- a/schema/changelog-3.8.xml +++ b/schema/changelog-3.8.xml @@ -104,7 +104,7 @@ <column name="contact" type="VARCHAR(512)" /> </addColumn> <addColumn tableName="devices"> - <column name="type" type="VARCHAR(128)" /> + <column name="category" type="VARCHAR(128)" /> </addColumn> </changeSet> diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java index 47b8fb2a6..821984c47 100644 --- a/src/org/traccar/model/Device.java +++ b/src/org/traccar/model/Device.java @@ -132,13 +132,13 @@ public class Device extends Extensible { this.contact = contact; } - private String type; + private String category; - public String getType() { - return type; + public String getCategory() { + return category; } - public void setType(String type) { - this.type = type; + public void setCategory(String category) { + this.category = category; } } |