Merge remote-tracking branch 'upstream/master'

1 files changed, 30 insertions, 1 deletions

diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index b1557bf8f..5cf26f7f2 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,17 @@
  */
 package org.traccar.model;
 
+import org.traccar.helper.Log;
+
 public class Server extends Extensible {
 
+    public String getVersion() {
+        return Log.getAppVersion();
+    }
+
+    public void setVersion(String version) {
+    }
+
     private boolean registration;
 
     public boolean getRegistration() {
@@ -127,4 +136,24 @@ public class Server extends Extensible {
         this.twelveHourFormat = twelveHourFormat;
     }
 
+    private boolean forceSettings;
+
+    public boolean getForceSettings() {
+        return forceSettings;
+    }
+
+    public void setForceSettings(boolean forceSettings) {
+        this.forceSettings = forceSettings;
+    }
+
+    private String coordinateFormat;
+
+    public String getCoordinateFormat() {
+        return coordinateFormat;
+    }
+
+    public void setCoordinateFormat(String coordinateFormat) {
+        this.coordinateFormat = coordinateFormat;
+    }
+
 }