diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-02-20 22:35:43 +1300 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-02-20 22:35:43 +1300 |
commit | 6801698dfc9c99b34d7ed081ebcfbec4a8853868 (patch) | |
tree | cecc80f811b6c3a594b9da272a7c65d3a9695315 /src/org/traccar/web/client/ApplicationContext.java | |
parent | 0e766c9024e2457320f64353e29bb5e2d8294b28 (diff) | |
download | etbsa-traccar-web-6801698dfc9c99b34d7ed081ebcfbec4a8853868.tar.gz etbsa-traccar-web-6801698dfc9c99b34d7ed081ebcfbec4a8853868.tar.bz2 etbsa-traccar-web-6801698dfc9c99b34d7ed081ebcfbec4a8853868.zip |
Added account dialog
Diffstat (limited to 'src/org/traccar/web/client/ApplicationContext.java')
-rw-r--r-- | src/org/traccar/web/client/ApplicationContext.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/org/traccar/web/client/ApplicationContext.java b/src/org/traccar/web/client/ApplicationContext.java index f505324..80b8998 100644 --- a/src/org/traccar/web/client/ApplicationContext.java +++ b/src/org/traccar/web/client/ApplicationContext.java @@ -1,6 +1,7 @@ package org.traccar.web.client; import org.traccar.web.shared.model.ApplicationSettings; +import org.traccar.web.shared.model.User; import org.traccar.web.shared.model.UserSettings; public class ApplicationContext { @@ -38,15 +39,25 @@ public class ApplicationContext { } } - private UserSettings userSettings; + private User user; + + public void setUser(User user) { + this.user = user; + } + + public User getUser() { + return user; + } public void setUserSettings(UserSettings userSettings) { - this.userSettings = userSettings; + if (user != null) { + user.setUserSettings(userSettings); + } } public UserSettings getUserSettings() { - if (userSettings != null) { - return userSettings; + if (user != null && user.getUserSettings() != null) { + return user.getUserSettings(); } else { return new UserSettings(); // default settings } |