diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-04-28 22:41:07 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-04-28 22:41:07 +1200 |
| commit | a5f47492857a175548beff07cfb565129f687ae2 (patch) | |
| tree | d5650b6f5db7de9296d8d00cab505b9f594112f6 /src/org/traccar/database/ResultSetConverter.java | |
| parent | c14f99819add0971a82ced01bf6d54ed77aedb74 (diff) | |
| download | traccar-server-a5f47492857a175548beff07cfb565129f687ae2.tar.gz traccar-server-a5f47492857a175548beff07cfb565129f687ae2.tar.bz2 traccar-server-a5f47492857a175548beff07cfb565129f687ae2.zip | |
Implement API to create devices
Diffstat (limited to 'src/org/traccar/database/ResultSetConverter.java')
| -rw-r--r-- | src/org/traccar/database/ResultSetConverter.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/org/traccar/database/ResultSetConverter.java b/src/org/traccar/database/ResultSetConverter.java index 92cb8fa4e..2bac01393 100644 --- a/src/org/traccar/database/ResultSetConverter.java +++ b/src/org/traccar/database/ResultSetConverter.java @@ -18,8 +18,6 @@ package org.traccar.database; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; @@ -64,10 +62,10 @@ public class ResultSetConverter { obj.add(columnName, rs.getString(columnName)); break; case java.sql.Types.DATE: - obj.add(columnName, JsonConvertable.dateFormat.format(rs.getDate(columnName))); + obj.add(columnName, ObjectConverter.dateFormat.format(rs.getDate(columnName))); break; case java.sql.Types.TIMESTAMP: - obj.add(columnName, JsonConvertable.dateFormat.format(rs.getTimestamp(columnName))); + obj.add(columnName, ObjectConverter.dateFormat.format(rs.getTimestamp(columnName))); break; default: break; |