From 62e5c4a5f2989a869daace462d575c7bd04e5bc5 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 8 Oct 2016 16:44:56 +1300
Subject: Rename column name

---
 schema/changelog-3.8.xml          |  4 ++--
 src/org/traccar/model/Server.java | 10 +++++-----
 src/org/traccar/model/User.java   | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/schema/changelog-3.8.xml b/schema/changelog-3.8.xml
index bc11d99ce..be9df5410 100644
--- a/schema/changelog-3.8.xml
+++ b/schema/changelog-3.8.xml
@@ -75,10 +75,10 @@
     </addColumn>
 
     <addColumn tableName="users">
-      <column name="coordinatesformat" type="VARCHAR(128)" />
+      <column name="coordinateformat" type="VARCHAR(128)" />
     </addColumn>
     <addColumn tableName="server">
-      <column name="coordinatesformat" type="VARCHAR(128)" />
+      <column name="coordinateformat" type="VARCHAR(128)" />
     </addColumn>
 
   </changeSet>
diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index 9a1552110..b922c4340 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -137,14 +137,14 @@ public class Server extends Extensible {
         this.forceSettings = forceSettings;
     }
 
-    private String coordinatesFormat;
+    private String coordinateFormat;
 
-    public String getCoordinatesFormat() {
-        return coordinatesFormat;
+    public String getCoordinateFormat() {
+        return coordinateFormat;
     }
 
-    public void setCoordinatesFormat(String coordinatesFormat) {
-        this.coordinatesFormat = coordinatesFormat;
+    public void setCoordinateFormat(String coordinateFormat) {
+        this.coordinateFormat = coordinateFormat;
     }
 
 }
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 63aa3e641..59951718e 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -130,14 +130,14 @@ public class User extends Extensible {
         this.twelveHourFormat = twelveHourFormat;
     }
 
-    private String coordinatesFormat;
+    private String coordinateFormat;
 
-    public String getCoordinatesFormat() {
-        return coordinatesFormat;
+    public String getCoordinateFormat() {
+        return coordinateFormat;
     }
 
-    public void setCoordinatesFormat(String coordinatesFormat) {
-        this.coordinatesFormat = coordinatesFormat;
+    public void setCoordinateFormat(String coordinateFormat) {
+        this.coordinateFormat = coordinateFormat;
     }
 
     private String password;
-- 
cgit v1.2.3