aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/model
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-10-04 13:20:46 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-10-04 13:20:46 +1300
commitd4dbf85d9536bfec85252a58fc552e2bad42ff17 (patch)
tree4a849426c2cd60538b152138b147abef47b40966 /src/org/traccar/model
parent9218bc65b9673b24d2866aae3d5bbe1a5388bab0 (diff)
downloadtraccar-server-d4dbf85d9536bfec85252a58fc552e2bad42ff17.tar.gz
traccar-server-d4dbf85d9536bfec85252a58fc552e2bad42ff17.tar.bz2
traccar-server-d4dbf85d9536bfec85252a58fc552e2bad42ff17.zip
Remove trailing whitespaces from code
Diffstat (limited to 'src/org/traccar/model')
-rw-r--r--src/org/traccar/model/Command.java4
-rw-r--r--src/org/traccar/model/Device.java10
-rw-r--r--src/org/traccar/model/Factory.java4
-rw-r--r--src/org/traccar/model/MiscFormatter.java18
-rw-r--r--src/org/traccar/model/Permission.java6
-rw-r--r--src/org/traccar/model/Position.java2
-rw-r--r--src/org/traccar/model/Schema.java4
-rw-r--r--src/org/traccar/model/Server.java4
-rw-r--r--src/org/traccar/model/User.java8
9 files changed, 30 insertions, 30 deletions
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java
index 16772e0cb..13187808f 100644
--- a/src/org/traccar/model/Command.java
+++ b/src/org/traccar/model/Command.java
@@ -27,7 +27,7 @@ public class Command implements Factory {
public void set(String key, long value) { attributes.put(key, value); }
public void set(String key, double value) { attributes.put(key, value); }
public void set(String key, String value) { if (value != null && !value.isEmpty()) attributes.put(key, value); }
-
+
public static final String TYPE_POSITION_SINGLE = "positionSingle";
public static final String TYPE_POSITION_PERIODIC = "positionPeriodic";
public static final String TYPE_POSITION_STOP = "positionStop";
@@ -39,5 +39,5 @@ public class Command implements Factory {
public static final String KEY_UNIQUE_ID = "uniqueId";
public static final String KEY_FREQUENCY = "frequency";
public static final String KEY_DEVICE_PASSWORD = "devicePassword";
-
+
}
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index b40e694b8..4d97e166d 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -27,7 +27,7 @@ public class Device implements Factory {
private long id;
public long getId() { return id; }
public void setId(long id) { this.id = id; }
-
+
private String name;
public String getName() { return name; }
public void setName(String name) { this.name = name; }
@@ -35,13 +35,13 @@ public class Device implements Factory {
private String uniqueId;
public String getUniqueId() { return uniqueId; }
public void setUniqueId(String uniqueId) { this.uniqueId = uniqueId; }
-
+
private String status;
-
+
private Date lastUpdate;
-
+
private long positionId;
-
+
private long dataId;
}
diff --git a/src/org/traccar/model/Factory.java b/src/org/traccar/model/Factory.java
index 5af946a2b..c09d11ab6 100644
--- a/src/org/traccar/model/Factory.java
+++ b/src/org/traccar/model/Factory.java
@@ -16,7 +16,7 @@
package org.traccar.model;
public interface Factory {
-
+
public Object create();
-
+
}
diff --git a/src/org/traccar/model/MiscFormatter.java b/src/org/traccar/model/MiscFormatter.java
index 38aa853d4..725270122 100644
--- a/src/org/traccar/model/MiscFormatter.java
+++ b/src/org/traccar/model/MiscFormatter.java
@@ -46,18 +46,18 @@ public class MiscFormatter {
public static String toXmlString(Map<String, Object> attributes) {
StringBuilder result = new StringBuilder();
-
+
result.append("<").append(xmlRootNode).append(">");
-
+
for (Map.Entry<String, Object> entry : attributes.entrySet()) {
-
+
result.append("<").append(entry.getKey()).append(">");
result.append(format(entry.getValue()));
result.append("</").append(entry.getKey()).append(">");
}
result.append("</").append(xmlRootNode).append(">");
-
+
return result.toString();
}
@@ -84,11 +84,11 @@ public class MiscFormatter {
return json.build();
}
-
+
public static Map<String, Object> fromJson(JsonObject json) {
-
+
Map<String, Object> attributes = new LinkedHashMap<>();
-
+
for (Map.Entry<String, JsonValue> entry : json.entrySet()) {
switch (entry.getValue().getValueType()) {
case STRING:
@@ -110,10 +110,10 @@ public class MiscFormatter {
break;
}
}
-
+
return attributes;
}
-
+
public static String toJsonString(Map<String, Object> attributes) {
return toJson(attributes).toString();
}
diff --git a/src/org/traccar/model/Permission.java b/src/org/traccar/model/Permission.java
index d8854a549..c37c750ef 100644
--- a/src/org/traccar/model/Permission.java
+++ b/src/org/traccar/model/Permission.java
@@ -21,13 +21,13 @@ public class Permission implements Factory {
public Permission create() {
return new Permission();
}
-
+
private long userId;
public long getUserId() { return userId; }
public void setUserId(long userId) { this.userId = userId; }
-
+
private long deviceId;
public long getDeviceId() { return deviceId; }
public void setDeviceId(long deviceId) { this.deviceId = deviceId; }
-
+
}
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 8a6084775..964327a5f 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -27,7 +27,7 @@ public class Position extends Event implements Factory {
private Date fixTime;
public Date getFixTime() { return fixTime; }
public void setFixTime(Date fixTime) { this.fixTime = fixTime; }
-
+
public void setTime(Date time) {
setDeviceTime(time);
setFixTime(time);
diff --git a/src/org/traccar/model/Schema.java b/src/org/traccar/model/Schema.java
index 1878f0edb..a4109bea1 100644
--- a/src/org/traccar/model/Schema.java
+++ b/src/org/traccar/model/Schema.java
@@ -21,9 +21,9 @@ public class Schema implements Factory {
public Schema create() {
return new Schema();
}
-
+
private int version;
public int getVersion() { return version; }
public void setVersion(int version) { this.version = version; }
-
+
}
diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index b910e30ec..f16863d1c 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -25,7 +25,7 @@ public class Server implements Factory {
private long id;
public long getId() { return id; }
public void setId(long id) { this.id = id; }
-
+
private boolean registration;
public boolean getRegistration() { return registration; }
public void setRegistration(boolean registration) { this.registration = registration; }
@@ -61,7 +61,7 @@ public class Server implements Factory {
private double longitude;
public double getLongitude() { return longitude; }
public void setLongitude(double longitude) { this.longitude = longitude; }
-
+
private int zoom;
public int getZoom() { return zoom; }
public void setZoom(int zoom) { this.zoom = zoom; }
diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java
index 382709da8..401f64245 100644
--- a/src/org/traccar/model/User.java
+++ b/src/org/traccar/model/User.java
@@ -28,21 +28,21 @@ public class User implements Factory {
private long id;
public long getId() { return id; }
public void setId(long id) { this.id = id; }
-
+
private String name;
public String getName() { return name; }
public void setName(String name) { this.name = name; }
-
+
private String email;
public String getEmail() { return email; }
public void setEmail(String email) { this.email = email; }
private boolean readonly;
-
+
private boolean admin;
public boolean getAdmin() { return admin; }
public void setAdmin(boolean admin) { this.admin = admin; }
-
+
private String map;
public String getMap() { return map; }
public void setMap(String map) { this.map = map; }