diff options
| author | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:36:18 +0200 |
|---|---|---|
| committer | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:39:03 +0200 |
| commit | 516ef6a30eb59e1b9c3aa297e3595c5acf665530 (patch) | |
| tree | 2bed5e621be4786816bbf3d6adabe41d2d43fbdb /src/org/traccar/model/MiscFormatter.java | |
| parent | 5bf82eff1ecac7b23661cea14be26aa7a3e4d09a (diff) | |
| parent | 59f466092c9c875c2bbcb70a2a402aad0edd7639 (diff) | |
| download | trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.gz trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.bz2 trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.zip | |
Merge branch 'master' into command_framework
Diffstat (limited to 'src/org/traccar/model/MiscFormatter.java')
| -rw-r--r-- | src/org/traccar/model/MiscFormatter.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/org/traccar/model/MiscFormatter.java b/src/org/traccar/model/MiscFormatter.java index 4f39c4013..9bb856400 100644 --- a/src/org/traccar/model/MiscFormatter.java +++ b/src/org/traccar/model/MiscFormatter.java @@ -15,17 +15,18 @@ */ package org.traccar.model; -import java.text.DecimalFormat; -import java.util.LinkedHashMap; -import java.util.Map; +import org.traccar.helper.Log; +import org.traccar.web.JsonConverter; + import javax.json.Json; import javax.json.JsonNumber; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonString; import javax.json.JsonValue; -import org.traccar.helper.Log; -import org.traccar.web.JsonConverter; +import java.text.DecimalFormat; +import java.util.LinkedHashMap; +import java.util.Map; /** * Format extended tracker status |