aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Prangenberg <philipp.prangenberg@derkurier.de>2016-12-06 08:55:11 +0100
committerPhilipp Prangenberg <philipp.prangenberg@derkurier.de>2016-12-06 08:55:11 +0100
commitf8b3d5cc7286726e7719ddcd4db8d8456aa6e01f (patch)
tree00066e3f21e5ab62a06d7886975386f6a8f94573 /src
parente59f8af8c74940223e6ac3f0f6b99390bb464876 (diff)
downloadtraccar-server-f8b3d5cc7286726e7719ddcd4db8d8456aa6e01f.tar.gz
traccar-server-f8b3d5cc7286726e7719ddcd4db8d8456aa6e01f.tar.bz2
traccar-server-f8b3d5cc7286726e7719ddcd4db8d8456aa6e01f.zip
Style changes
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/BaseProtocolDecoder.java7
-rw-r--r--src/org/traccar/database/DeviceManager.java6
2 files changed, 8 insertions, 5 deletions
diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java
index 9e04fa5cd..103a999b0 100644
--- a/src/org/traccar/BaseProtocolDecoder.java
+++ b/src/org/traccar/BaseProtocolDecoder.java
@@ -40,10 +40,11 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
device.setUniqueId(uniqueId);
device.setCategory(Context.getConfig().getString("database.registerUnknown.defaultCategory", "default"));
- if(!defaultGroupName.equals("NOTDEFINED")){
+ if (!defaultGroupName.equals("NOTDEFINED")) {
Group defaultGroup = Context.getDeviceManager().getGroupByName(defaultGroupName);
- if(defaultGroup != null)
+ if (defaultGroup != null) {
device.setGroupId(defaultGroup.getId());
+ }
}
try {
@@ -192,4 +193,4 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
}
}
-} \ No newline at end of file
+}
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index f442317d3..403953d56 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -246,7 +246,7 @@ public class DeviceManager implements IdentityManager {
if (groupsById == null) {
groupsById = new ConcurrentHashMap<>(databaseGroups.size());
}
- if(groupsByName == null){
+ if (groupsByName == null) {
groupsByName = new ConcurrentHashMap<>(databaseGroups.size());
}
Set<Long> databaseGroupsIds = new HashSet<>();
@@ -274,7 +274,9 @@ public class DeviceManager implements IdentityManager {
return groupsById.get(id);
}
- public Group getGroupByName(String name) { return groupsByName.get(name); }
+ public Group getGroupByName(String name) {
+ return groupsByName.get(name);
+ }
public Collection<Group> getAllGroups() {
boolean forceUpdate = groupsById.isEmpty();