Rename Identifiable and Extensible to BaseModel and ExtendedModel

14 files changed, 15 insertions, 15 deletions

diff --git a/src/org/traccar/model/Attribute.java b/src/org/traccar/model/Attribute.java
index ab12cd2c4..45d40b3ec 100644
--- a/src/org/traccar/model/Attribute.java
+++ b/src/org/traccar/model/Attribute.java
@@ -16,7 +16,7 @@
  */
 package org.traccar.model;
 
-public class Attribute extends Identifiable {
+public class Attribute extends BaseModel {
 
     private String description;
 
diff --git a/src/org/traccar/model/AttributeAlias.java b/src/org/traccar/model/AttributeAlias.java
index 5aa8a5122..1599ab939 100644
--- a/src/org/traccar/model/AttributeAlias.java
+++ b/src/org/traccar/model/AttributeAlias.java
@@ -16,7 +16,7 @@
  */
 package org.traccar.model;
 
-public class AttributeAlias extends Identifiable {
+public class AttributeAlias extends BaseModel {
 
     private long deviceId;
 
diff --git a/src/org/traccar/model/Identifiable.java b/src/org/traccar/model/BaseModel.java
index f22cfe800..8bdb916e8 100644
--- a/src/org/traccar/model/Identifiable.java
+++ b/src/org/traccar/model/BaseModel.java
@@ -16,7 +16,7 @@
  */
 package org.traccar.model;
 
-public class Identifiable {
+public class BaseModel {
 
     private long id;
 
diff --git a/src/org/traccar/model/Calendar.java b/src/org/traccar/model/Calendar.java
index 55f696d50..3d855b1be 100644
--- a/src/org/traccar/model/Calendar.java
+++ b/src/org/traccar/model/Calendar.java
@@ -34,7 +34,7 @@ import net.fortuna.ical4j.model.Period;
 import net.fortuna.ical4j.model.component.CalendarComponent;
 import org.traccar.database.QueryIgnore;
 
-public class Calendar extends Extensible {
+public class Calendar extends ExtendedModel {
 
     private String name;
 
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index 2324da532..6a13c2b77 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -18,7 +18,7 @@ package org.traccar.model;
 import java.util.Date;
 import java.util.List;
 
-public class Device extends Extensible {
+public class Device extends ExtendedModel {
 
     private String name;
 
diff --git a/src/org/traccar/model/Driver.java b/src/org/traccar/model/Driver.java
index 7a51d9151..05f52fd4d 100644
--- a/src/org/traccar/model/Driver.java
+++ b/src/org/traccar/model/Driver.java
@@ -16,7 +16,7 @@
  */
 package org.traccar.model;
 
-public class Driver extends Extensible {
+public class Driver extends ExtendedModel {
 
     private String name;
 
diff --git a/src/org/traccar/model/Extensible.java b/src/org/traccar/model/ExtendedModel.java
index 3b382838e..a4bf00e70 100644
--- a/src/org/traccar/model/Extensible.java
+++ b/src/org/traccar/model/ExtendedModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.traccar.model;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class Extensible extends Identifiable {
+public class ExtendedModel extends BaseModel {
 
     private Map<String, Object> attributes = new LinkedHashMap<>();
 
diff --git a/src/org/traccar/model/Geofence.java b/src/org/traccar/model/Geofence.java
index dfb888852..21c196da9 100644
--- a/src/org/traccar/model/Geofence.java
+++ b/src/org/traccar/model/Geofence.java
@@ -26,7 +26,7 @@ import org.traccar.geofence.GeofencePolyline;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-public class Geofence extends Extensible {
+public class Geofence extends ExtendedModel {
 
     public static final String TYPE_GEOFENCE_CILCLE = "geofenceCircle";
     public static final String TYPE_GEOFENCE_POLYGON = "geofencePolygon";
diff --git a/src/org/traccar/model/Group.java b/src/org/traccar/model/Group.java
index c21d43127..aad206aad 100644
--- a/src/org/traccar/model/Group.java
+++ b/src/org/traccar/model/Group.java
@@ -15,7 +15,7 @@
  */
 package org.traccar.model;
 
-public class Group extends Extensible {
+public class Group extends ExtendedModel {
 
     private String name;
 
diff --git a/src/org/traccar/model/Message.java b/src/org/traccar/model/Message.java
index ab472202b..dad9c20f0 100644
--- a/src/org/traccar/model/Message.java
+++ b/src/org/traccar/model/Message.java
@@ -15,7 +15,7 @@
  */
 package org.traccar.model;
 
-public class Message extends Extensible {
+public class Message extends ExtendedModel {
 
     private long deviceId;
 
diff --git a/src/org/traccar/model/Notification.java b/src/org/traccar/model/Notification.java
index 6c61cafaf..e7bb69903 100644
--- a/src/org/traccar/model/Notification.java
+++ b/src/org/traccar/model/Notification.java
@@ -15,7 +15,7 @@
  */
 package org.traccar.model;
 
-public class Notification extends Extensible {
+public class Notification extends ExtendedModel {
 
     private long userId;
 
diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index 4ded65204..cd5b0624e 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -19,7 +19,7 @@ import java.util.TimeZone;
 
 import org.traccar.helper.Log;
 
-public class Server extends Extensible {
+public class Server extends ExtendedModel {
 
     public String getVersion() {
         return Log.getAppVersion();
diff --git a/src/org/traccar/model/Statistics.java b/src/org/traccar/model/Statistics.java
index c7ae5af7a..2acf8514f 100644
--- a/src/org/traccar/model/Statistics.java
+++ b/src/org/traccar/model/Statistics.java
@@ -17,7 +17,7 @@ package org.traccar.model;
 
 import java.util.Date;
 
-public class Statistics extends Extensible {
+public class Statistics extends ExtendedModel {
 
     private Date captureTime;
 
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 366ced503..6e6a079c2 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -21,7 +21,7 @@ import org.traccar.helper.Hashing;
 import java.util.Date;
 import java.util.TimeZone;
 
-public class User extends Extensible {
+public class User extends ExtendedModel {
 
     private String name;