Merge branch 'master' into bug4509

Change-Id: Ia63ce5f964be5471b00a5429d6984e141d742b4d
This commit is contained in:
Axel Uhl committed 2018-04-13 15:55:28 +02:00
commit 22b4ec6535
46 files changed
+173 -154

No files matched your search

@@ -375,7 +375,7 @@ public class PenaltyFragment extends BaseFragment implements PopupMenu.OnMenuIte
ReadonlyDataManager dataManager = OnlineDataManager.create(getActivity());
SharedDomainFactory domainFactory = dataManager.getDataStore().getDomainFactory();
for (Competitor competitor : getRace().getCompetitors()) {
domainFactory.getCompetitorStore().allowCompetitorResetToDefaults(competitor);
domainFactory.getCompetitorAndBoatStore().allowCompetitorResetToDefaults(competitor);
}
final Loader<?> competitorLoader = getLoaderManager()
.initLoader(COMPETITOR_LOADER, null, dataManager.createCompetitorsLoader(getRace(), new LoadClient<Map<Competitor, Boat>>() {
@@ -467,7 +467,7 @@ public class TrackingListFragment extends BaseFragment
ReadonlyDataManager dataManager = OnlineDataManager.create(getActivity());
SharedDomainFactory domainFactory = dataManager.getDataStore().getDomainFactory();
for (Competitor competitor : getRace().getCompetitors()) {
domainFactory.getCompetitorStore().allowCompetitorResetToDefaults(competitor);
domainFactory.getCompetitorAndBoatStore().allowCompetitorResetToDefaults(competitor);
}
final Loader<?> competitorLoader = getLoaderManager()
@@ -575,7 +575,7 @@ public class TrackingListFragment extends BaseFragment
}
private CompetitorAndBoatStore getCompetitorStore() {
return DataManager.create(getActivity()).getDataStore().getDomainFactory().getCompetitorStore();
return DataManager.create(getActivity()).getDataStore().getDomainFactory().getCompetitorAndBoatStore();
}
private CompetitorResultsList<CompetitorResultWithIdImpl> initializeFinishList() {