diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-04-25 11:02:26 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-04-25 11:02:26 +1200 |
| commit | 9ea2dbe8400bd1ab30451e3dc2b85aa7a583a8e1 (patch) | |
| tree | b9d71935821a7c895c11f87b1eb1fe3579f5289b /src/org/traccar/database/DataManager.java | |
| parent | 5859529fa396cf74bdddc714ea1936c972d01579 (diff) | |
| download | trackermap-server-9ea2dbe8400bd1ab30451e3dc2b85aa7a583a8e1.tar.gz trackermap-server-9ea2dbe8400bd1ab30451e3dc2b85aa7a583a8e1.tar.bz2 trackermap-server-9ea2dbe8400bd1ab30451e3dc2b85aa7a583a8e1.zip | |
Use Java standard Json library
Diffstat (limited to 'src/org/traccar/database/DataManager.java')
| -rw-r--r-- | src/org/traccar/database/DataManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 172fbf763..2f029e74c 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -22,11 +22,11 @@ import java.net.URL; import java.net.URLClassLoader; import java.sql.*; import java.util.*; +import javax.json.JsonArray; import javax.sql.DataSource; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.json.JSONArray; import org.traccar.helper.DriverDelegate; import org.traccar.helper.Log; import org.traccar.model.Device; @@ -362,7 +362,7 @@ public class DataManager { } } - public JSONArray getDevices(long userId) throws SQLException { + public JsonArray getDevices(long userId) throws SQLException { Connection connection = dataSource.getConnection(); try { |