mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-28 08:26:44 +00:00
Locations output of EventDTO improved
This commit is contained in:
+14
@@ -7,4 +7,18 @@ public interface RacePlaceOrder extends Serializable {
|
||||
Placemark getStartPlace();
|
||||
Placemark getFinishPlace();
|
||||
|
||||
/**
|
||||
* @return The start placemark as String in the format 'Country-Code, Name'
|
||||
*/
|
||||
String startToString();
|
||||
/**
|
||||
* @return The finish placemark as String in the format 'Country-Code, Name'
|
||||
*/
|
||||
String finishToString();
|
||||
|
||||
/**
|
||||
* @return true if the start Placemark and the finish Placemark are equal, false if not
|
||||
*/
|
||||
boolean startEqualsFinish();
|
||||
|
||||
}
|
||||
|
||||
+19
-3
@@ -10,12 +10,14 @@ public class RacePlaceOrderImpl implements RacePlaceOrder, Serializable {
|
||||
|
||||
private Placemark start;
|
||||
private Placemark finish;
|
||||
private boolean startEqualsFinish;
|
||||
|
||||
RacePlaceOrderImpl() {}
|
||||
|
||||
public RacePlaceOrderImpl(Placemark startPlace, Placemark finishPlace) {
|
||||
this.start = startPlace;
|
||||
this.finish = finishPlace;
|
||||
startEqualsFinish = this.start.equals(this.finish);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -27,14 +29,29 @@ public class RacePlaceOrderImpl implements RacePlaceOrder, Serializable {
|
||||
public Placemark getFinishPlace() {
|
||||
return finish;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String startToString() {
|
||||
return finish.getCountryCode() + ", " + finish.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String finishToString() {
|
||||
return finish.getCountryCode() + ", " + finish.getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean startEqualsFinish() {
|
||||
return startEqualsFinish;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
String result = "";
|
||||
if (start != null) {
|
||||
result += start.getCountryCode() + ", " + start.getName();
|
||||
result += startToString();
|
||||
if (!start.equals(finish)) {
|
||||
result += " -> " + finish.getCountryCode() + ", " + finish.getName();
|
||||
result += " -> " + finishToString();
|
||||
}
|
||||
}
|
||||
return result;
|
||||
@@ -70,5 +87,4 @@ public class RacePlaceOrderImpl implements RacePlaceOrder, Serializable {
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user