removed setters from MarkPingInfo and use final fields and constructor instead; this doesn't have to be mutable

Change-Id: I1444cf25d064ee70524ce524a443ba15500efe12
This commit is contained in:
Axel Uhl committed 2016-04-14 13:03:00 +02:00
1 parent 6c85d0462b
commit 9acb1c4748
4 files changed
+15 -27

No files matched your search

@@ -187,14 +187,11 @@ public class CheckinManager {
if (jsonMark.has(MarkJsonSerializerWithPosition.FIELD_POSITION)) {
if (!jsonMark.get(MarkJsonSerializerWithPosition.FIELD_POSITION).equals(null)) {
JSONObject positionJson = jsonMark.getJSONObject(MarkJsonSerializerWithPosition.FIELD_POSITION);
MarkPingInfo ping = new MarkPingInfo();
FlatGPSFixJsonDeserializer deserializer = new FlatGPSFixJsonDeserializer();
org.json.simple.JSONObject simplePosition;
simplePosition = JsonHelper.convertToSimple(positionJson);
GPSFix gpsFix = deserializer.deserialize(simplePosition);
ping.setGpsFix(gpsFix);
ping.setAccuracy(positionJson.getDouble(FlatGPSFixJsonSerializer.FIELD_ACCURACY));
ping.setMarkId(mark.getId());
MarkPingInfo ping = new MarkPingInfo(mark.getId(), gpsFix, positionJson.getDouble(FlatGPSFixJsonSerializer.FIELD_ACCURACY));
pings.add(ping);
}
}
@@ -107,13 +107,11 @@ public class DatabaseHelper {
if (mpc != null) {
mpc.moveToFirst();
while (!mpc.isAfterLast()) {
MarkPingInfo markPingInfo = new MarkPingInfo();
markPingInfo.setMarkId(markID);
long timeStamp = Long.parseLong(mpc.getString((mpc.getColumnIndex(MarkPing.MARK_PING_TIMESTAMP))));
double longitude = Double.parseDouble(mpc.getString((mpc.getColumnIndex(MarkPing.MARK_PING_LONGITUDE))));
double latitude = Double.parseDouble(mpc.getString((mpc.getColumnIndex(MarkPing.MARK_PING_LATITUDE))));
markPingInfo.setGpsFix(GPSFixImpl.create(longitude, latitude, timeStamp));
markPingInfo.setAccuracy(mpc.getDouble((mpc.getColumnIndex(MarkPing.MARK_PING_ACCURACY))));
MarkPingInfo markPingInfo = new MarkPingInfo(markID, GPSFixImpl.create(longitude, latitude, timeStamp),
mpc.getDouble((mpc.getColumnIndex(MarkPing.MARK_PING_ACCURACY))));
marks.add(markPingInfo);
mpc.moveToNext();
}
@@ -42,10 +42,8 @@ public class PingHelper {
}
public Boolean storePingInDatabase(Context context, Location location, MarkInfo mark) {
MarkPingInfo pingInfo = new MarkPingInfo();
pingInfo.setMarkId(mark.getId());
pingInfo.setGpsFix(GPSFixImpl.create(location.getLongitude(), location.getLatitude(), location.getTime()));
pingInfo.setAccuracy(location.getAccuracy());
MarkPingInfo pingInfo = new MarkPingInfo(mark.getId(),
GPSFixImpl.create(location.getLongitude(), location.getLatitude(), location.getTime()), location.getAccuracy());
try {
DatabaseHelper.getInstance().storeMarkPing(context, pingInfo);
} catch (GeneralDatabaseHelperException e) {
@@ -5,22 +5,21 @@ import java.io.Serializable;
import com.sap.sailing.domain.common.tracking.GPSFix;
public class MarkPingInfo {
private Serializable markId;
private GPSFix gpsFix;
private double accuracy;
private final Serializable markId;
private final GPSFix gpsFix;
private final double accuracy;
public MarkPingInfo(Serializable markId, GPSFix gpsFix, double accuracy) {
super();
this.markId = markId;
this.gpsFix = gpsFix;
this.accuracy = accuracy;
}
public Serializable getMarkId() {
return markId;
}
public void setGpsFix(GPSFix fix) {
gpsFix = fix;
}
public void setMarkId(Serializable markId) {
this.markId = markId;
}
public String getLongitude() {
return "" + gpsFix.getPosition().getLngDeg();
}
@@ -33,10 +32,6 @@ public class MarkPingInfo {
return accuracy;
}
public void setAccuracy(double accuracy) {
this.accuracy = accuracy;
}
public long getTimestamp() {
return gpsFix.getTimePoint().asMillis();
}