eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 21:30:57 +00:00
Code Activity

removed a merge accident around RaceGroupSeriesFleet

Browse Source 
Change-Id: I91a3a0bebdf5a5989e9b3e5f142b50c1f48bf870
This commit is contained in:
Axel Uhl committed 2016-03-31 16:37:43 +02:00
1 parent 5dc664dc88
commit 8c24213d1f
1 file changed
-11
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/ManagedRaceListAdapter.java
-11
View File
@@ -175,18 +175,7 @@ public class ManagedRaceListAdapter extends ArrayAdapter<RaceListDataType> imple
}
}
}
race_name.setText(RaceHelper.getReverseRaceFleetName(race.getRace()));
RaceGroupSeriesFleet fleet = race.getFleet();
if (fleet != null && !TextUtils.isEmpty(fleet.getFleetName())) {
if (!TextUtils.isEmpty(race_name.getText())) {
race_name.setText(race_name.getText() + " - " + fleet.getFleetName());
} else {
race_name.setText(fleet.getFleetName());
}
}
RaceState state = race.getRace().getState();
if (state != null) {
if (state.getStartTime() != null) {