diff options
-rw-r--r-- | src/main/java/org/traccar/api/BaseObjectResource.java | 2 | ||||
-rw-r--r-- | src/main/java/org/traccar/api/resource/ServerResource.java | 2 | ||||
-rw-r--r-- | src/main/java/org/traccar/broadcast/BaseBroadcastService.java | 1 | ||||
-rw-r--r-- | src/main/java/org/traccar/broadcast/BroadcastInterface.java | 1 | ||||
-rw-r--r-- | src/main/java/org/traccar/broadcast/BroadcastMessage.java | 1 | ||||
-rw-r--r-- | src/main/java/org/traccar/model/ObjectOperation.java (renamed from src/main/java/org/traccar/broadcast/ObjectOperation.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/traccar/notificators/NotificatorFirebase.java | 2 | ||||
-rw-r--r-- | src/main/java/org/traccar/notificators/NotificatorTraccar.java | 2 | ||||
-rw-r--r-- | src/main/java/org/traccar/session/cache/CacheManager.java | 2 |
9 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/api/BaseObjectResource.java b/src/main/java/org/traccar/api/BaseObjectResource.java index 02e1c2cbe..ebfa93ff0 100644 --- a/src/main/java/org/traccar/api/BaseObjectResource.java +++ b/src/main/java/org/traccar/api/BaseObjectResource.java @@ -17,7 +17,7 @@ package org.traccar.api; import org.traccar.api.security.ServiceAccountUser; -import org.traccar.broadcast.ObjectOperation; +import org.traccar.model.ObjectOperation; import org.traccar.helper.LogAction; import org.traccar.model.BaseModel; import org.traccar.model.Group; diff --git a/src/main/java/org/traccar/api/resource/ServerResource.java b/src/main/java/org/traccar/api/resource/ServerResource.java index bcd36a32e..59ef642c8 100644 --- a/src/main/java/org/traccar/api/resource/ServerResource.java +++ b/src/main/java/org/traccar/api/resource/ServerResource.java @@ -16,7 +16,7 @@ package org.traccar.api.resource; import org.traccar.api.BaseResource; -import org.traccar.broadcast.ObjectOperation; +import org.traccar.model.ObjectOperation; import org.traccar.config.Config; import org.traccar.config.Keys; import org.traccar.database.OpenIdProvider; diff --git a/src/main/java/org/traccar/broadcast/BaseBroadcastService.java b/src/main/java/org/traccar/broadcast/BaseBroadcastService.java index bb220d2bb..1c4660320 100644 --- a/src/main/java/org/traccar/broadcast/BaseBroadcastService.java +++ b/src/main/java/org/traccar/broadcast/BaseBroadcastService.java @@ -21,6 +21,7 @@ import java.util.Set; import org.traccar.model.BaseModel; import org.traccar.model.Device; import org.traccar.model.Event; +import org.traccar.model.ObjectOperation; import org.traccar.model.Permission; import org.traccar.model.Position; diff --git a/src/main/java/org/traccar/broadcast/BroadcastInterface.java b/src/main/java/org/traccar/broadcast/BroadcastInterface.java index ededbaa1a..25fdf4d93 100644 --- a/src/main/java/org/traccar/broadcast/BroadcastInterface.java +++ b/src/main/java/org/traccar/broadcast/BroadcastInterface.java @@ -18,6 +18,7 @@ package org.traccar.broadcast; import org.traccar.model.BaseModel; import org.traccar.model.Device; import org.traccar.model.Event; +import org.traccar.model.ObjectOperation; import org.traccar.model.Position; public interface BroadcastInterface { diff --git a/src/main/java/org/traccar/broadcast/BroadcastMessage.java b/src/main/java/org/traccar/broadcast/BroadcastMessage.java index 6fe2d8b35..0d15d7495 100644 --- a/src/main/java/org/traccar/broadcast/BroadcastMessage.java +++ b/src/main/java/org/traccar/broadcast/BroadcastMessage.java @@ -17,6 +17,7 @@ package org.traccar.broadcast; import org.traccar.model.Device; import org.traccar.model.Event; +import org.traccar.model.ObjectOperation; import org.traccar.model.Position; public class BroadcastMessage { diff --git a/src/main/java/org/traccar/broadcast/ObjectOperation.java b/src/main/java/org/traccar/model/ObjectOperation.java index 27e5fb253..b462580bb 100644 --- a/src/main/java/org/traccar/broadcast/ObjectOperation.java +++ b/src/main/java/org/traccar/model/ObjectOperation.java @@ -1,4 +1,4 @@ -package org.traccar.broadcast; +package org.traccar.model; public enum ObjectOperation { ADD, diff --git a/src/main/java/org/traccar/notificators/NotificatorFirebase.java b/src/main/java/org/traccar/notificators/NotificatorFirebase.java index 0402db49d..a39683b2b 100644 --- a/src/main/java/org/traccar/notificators/NotificatorFirebase.java +++ b/src/main/java/org/traccar/notificators/NotificatorFirebase.java @@ -29,7 +29,7 @@ import com.google.firebase.messaging.MessagingErrorCode; import com.google.firebase.messaging.MulticastMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.traccar.broadcast.ObjectOperation; +import org.traccar.model.ObjectOperation; import org.traccar.config.Config; import org.traccar.config.Keys; import org.traccar.model.Event; diff --git a/src/main/java/org/traccar/notificators/NotificatorTraccar.java b/src/main/java/org/traccar/notificators/NotificatorTraccar.java index f693e9f30..82e1584a5 100644 --- a/src/main/java/org/traccar/notificators/NotificatorTraccar.java +++ b/src/main/java/org/traccar/notificators/NotificatorTraccar.java @@ -18,7 +18,7 @@ package org.traccar.notificators; import com.fasterxml.jackson.annotation.JsonProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.traccar.broadcast.ObjectOperation; +import org.traccar.model.ObjectOperation; import org.traccar.config.Config; import org.traccar.config.Keys; import org.traccar.model.Event; diff --git a/src/main/java/org/traccar/session/cache/CacheManager.java b/src/main/java/org/traccar/session/cache/CacheManager.java index c40916218..dc9c86ef3 100644 --- a/src/main/java/org/traccar/session/cache/CacheManager.java +++ b/src/main/java/org/traccar/session/cache/CacheManager.java @@ -19,7 +19,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.traccar.broadcast.BroadcastInterface; import org.traccar.broadcast.BroadcastService; -import org.traccar.broadcast.ObjectOperation; +import org.traccar.model.ObjectOperation; import org.traccar.config.Config; import org.traccar.model.Attribute; import org.traccar.model.BaseModel; |