eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 10:09:42 +00:00
Code Activity

Removed setter from MarkInfo and replaced by constructor arguments

Browse Source 
Change-Id: I62403f3664149ba54e3676f2a953cc4dcd9fa48a
This commit is contained in:
Axel Uhl committed 2016-04-15 11:44:01 +02:00
1 parent b93bdfa3be
commit b9ed121b93
3 files changed
+14 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
+1 -3
View File
@@ -181,9 +181,7 @@ public class CheckinManager {
org.json.simple.JSONObject simpleMark;
simpleMark = JsonHelper.convertToSimple(jsonMark);
MarkDeserializer markDeserializer = new MarkDeserializer(getSharedDomainFactory());
MarkInfo mark = MarkInfo.create(markDeserializer.deserialize(simpleMark));
mark.setCheckinDigest(checkinDigest);
mark.setClassName(jsonMark.getString(MarkJsonSerializer.FIELD_CLASS));
MarkInfo mark = MarkInfo.create(markDeserializer.deserialize(simpleMark), jsonMark.getString(MarkJsonSerializer.FIELD_CLASS), checkinDigest);
if (jsonMark.has(MarkJsonSerializerWithPosition.FIELD_POSITION)) {
if (!jsonMark.get(MarkJsonSerializerWithPosition.FIELD_POSITION).equals(null)) {
JSONObject positionJson = jsonMark.getJSONObject(MarkJsonSerializerWithPosition.FIELD_POSITION);
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/DatabaseHelper.java
+3 -3
View File
@@ -88,9 +88,9 @@ public class DatabaseHelper {
while (!mc.isAfterLast()) {
String markName = mc.getString((mc.getColumnIndex(Mark.MARK_NAME)));
String markIdAsString = mc.getString(mc.getColumnIndex(Mark.MARK_ID));
MarkInfo markInfo = new MarkInfo(markIdAsString, markName);
markInfo.setCheckinDigest(mc.getString((mc.getColumnIndex(Mark.MARK_CHECKIN_DIGEST))));
markInfo.setClassName(mc.getString((mc.getColumnIndex(Mark.MARK_CLASS_NAME))));
MarkInfo markInfo = new MarkInfo(markIdAsString, markName,
mc.getString((mc.getColumnIndex(Mark.MARK_CLASS_NAME))),
checkinDigest);
marks.add(markInfo);
mc.moveToNext();
}
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkInfo.java
+10 -12
View File
@@ -12,38 +12,36 @@ public class MarkInfo extends MarkImpl {
private String className;
private String checkinDigest;
public static MarkInfo create(Mark mark) {
return new MarkInfo(mark.getId(), mark.getName(), mark.getType(), mark.getColor(), mark.getShape(), mark.getPattern());
public static MarkInfo create(Mark mark, String classname, String checkinDigest) {
return new MarkInfo(mark.getId(), mark.getName(), mark.getType(), mark.getColor(), mark.getShape(), mark.getPattern(), classname, checkinDigest);
}
public MarkInfo(String name) {
super(name);
className = null;
checkinDigest = null;
}
public MarkInfo(Serializable id, String name) {
public MarkInfo(Serializable id, String name, String classname, String checkinDigest) {
super(id, name);
this.className = classname;
this.checkinDigest = checkinDigest;
}
public MarkInfo(Serializable id, String name, MarkType type, String color, String shape, String pattern) {
public MarkInfo(Serializable id, String name, MarkType type, String color, String shape, String pattern, String classname, String checkinDigest) {
super(id, name, type, color, shape, pattern);
this.className = classname;
this.checkinDigest = checkinDigest;
}
public String getClassName() {
return className;
}
public void setClassName(String className) {
this.className = className;
}
public String getCheckinDigest() {
return checkinDigest;
}
public void setCheckinDigest(String checkinDigest) {
this.checkinDigest = checkinDigest;
}
@Override
public boolean equals(Object o) {
if (this == o)