From 3a7a5a38050331159d3f2e86beea22f757610c75 Mon Sep 17 00:00:00 2001 From: Lukas Furmanek Date: Fri, 5 Aug 2016 18:11:34 +0200 Subject: [PATCH 1/4] Simplefied the comunication betwean the AbstractFilterablePanel and some classes which use a method to create the CellTable --- .../AbstractLeaderboardConfigPanel.java | 8 +++++++- .../AbstractTrackedRacesListComposite.java | 8 +++++++- .../ui/adminconsole/CompetitorTableWrapper.java | 8 +++++++- .../gwt/ui/adminconsole/EventListComposite.java | 11 ++++++++--- .../gwt/ui/adminconsole/IgtimiAccountsPanel.java | 8 +++++++- .../LeaderboardGroupConfigPanel.java | 16 ++++++++++++++-- .../LeaderboardGroupSelectorComposite.java | 12 +++++++++--- .../sailing/gwt/ui/adminconsole/MediaPanel.java | 9 +++++++-- .../ui/adminconsole/RegattaListComposite.java | 9 +++++++-- .../RemoteServerInstancesManagementPanel.java | 12 +++++++++--- .../SwissTimingEventManagementPanel.java | 8 +++++++- .../SwissTimingReplayConnectorPanel.java | 8 +++++++- .../TracTracEventManagementPanel.java | 8 +++++++- .../filter/FilterableSelectionTable.java | 8 +++++++- .../client/panels/AbstractFilterablePanel.java | 12 +++++++----- .../panels/LabeledAbstractFilterablePanel.java | 4 ++-- 16 files changed, 119 insertions(+), 30 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java index 71f143851d1..a1bd41b00e5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java @@ -13,6 +13,7 @@ import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; import com.google.gwt.user.client.Window; @@ -165,7 +166,7 @@ public abstract class AbstractLeaderboardConfigPanel extends FormPanel implement AdminConsoleTableResources tableRes = GWT.create(AdminConsoleTableResources.class); leaderboardTable = new FlushableCellTable(/* pageSize */10000, tableRes); filterLeaderboardPanel = new LabeledAbstractFilterablePanel(lblFilterEvents, - availableLeaderboardList, leaderboardTable, filteredLeaderboardList) { + availableLeaderboardList, filteredLeaderboardList) { @Override public List getSearchableStrings(StrippedLeaderboardDTO t) { List strings = new ArrayList(); @@ -173,6 +174,11 @@ public abstract class AbstractLeaderboardConfigPanel extends FormPanel implement strings.add(t.displayName); return strings; } + + @Override + public AbstractCellTable getCellTable() { + return leaderboardTable; + } }; filterLeaderboardPanel.getTextBox().ensureDebugId("LeaderboardsFilterTextBox"); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java index 90f8b8625f3..1e0566dcba7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java @@ -12,6 +12,7 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.safehtml.shared.SafeHtmlUtils; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; import com.google.gwt.user.cellview.client.TextColumn; @@ -117,7 +118,7 @@ public abstract class AbstractTrackedRacesListComposite extends SimplePanel impl raceTable = new FlushableCellTable(/* pageSize */10000, tableRes); raceTable.ensureDebugId("TrackedRacesCellTable"); - filterablePanelRaces = new LabeledAbstractFilterablePanel(lblFilterRaces, allRaces, raceTable, + filterablePanelRaces = new LabeledAbstractFilterablePanel(lblFilterRaces, allRaces, raceList) { @Override public List getSearchableStrings(RaceDTO t) { @@ -128,6 +129,11 @@ public abstract class AbstractTrackedRacesListComposite extends SimplePanel impl strings.add(t.toString()); return strings; } + + @Override + public AbstractCellTable getCellTable() { + return raceTable; + } }; filterablePanelRaces.getTextBox().ensureDebugId("TrackedRacesFilterTextBox"); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java index d10053c428a..cab4fd6b24e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java @@ -11,6 +11,7 @@ import com.google.gwt.core.client.Callback; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; import com.google.gwt.user.cellview.client.TextColumn; @@ -218,7 +219,7 @@ public class CompetitorTableWrapper(new Label(stringMessages.filterCompetitors()), - new ArrayList(), table, dataProvider) { + new ArrayList(), dataProvider) { @Override public Iterable getSearchableStrings(CompetitorDTO t) { List string = new ArrayList(); @@ -229,6 +230,11 @@ public class CompetitorTableWrapper getCellTable() { + return table; + } }; registerSelectionModelOnNewDataProvider(filterField.getAllListDataProvider()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java index 59d99183862..55daa0baa96 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java @@ -18,6 +18,7 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.safehtml.client.SafeHtmlTemplates; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; @@ -152,8 +153,8 @@ public class EventListComposite extends Composite implements EventsRefresher, Le eventControlsPanel.add(removeEventsButton); eventListDataProvider = new ListDataProvider(); - filterTextbox = new LabeledAbstractFilterablePanel(new Label(stringMessages.filterEventsByName()), allEvents, - new CellTable(), eventListDataProvider) { + filterTextbox = new LabeledAbstractFilterablePanel(new Label(stringMessages.filterEventsByName()), + allEvents, eventListDataProvider) { @Override public Iterable getSearchableStrings(EventDTO t) { List result = new ArrayList(); @@ -167,10 +168,14 @@ public class EventListComposite extends Composite implements EventsRefresher, Le } return result; } + + @Override + public AbstractCellTable getCellTable() { + return eventTable; + } }; eventTable = createEventTable(); eventTable.ensureDebugId("EventsCellTable"); - filterTextbox.setTable(eventTable); refreshableEventSelectionModel = (RefreshableMultiSelectionModel) eventTable.getSelectionModel(); eventTable.setVisible(false); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanel.java index d0a5e3efb9c..a0dd4cd3b52 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanel.java @@ -11,6 +11,7 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.safehtml.shared.UriUtils; import com.google.gwt.text.shared.SafeHtmlRenderer; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; @@ -84,12 +85,17 @@ public class IgtimiAccountsPanel extends FlowPanel { filteredAccounts.addDataDisplay(allAccounts); final List emptyList = Collections.emptyList(); filterAccountsPanel = new LabeledAbstractFilterablePanel(new Label(stringMessages.igtimiAccounts()), - emptyList, allAccounts, filteredAccounts) { + emptyList, filteredAccounts) { @Override public Iterable getSearchableStrings(String t) { Set strings = Collections.singleton(t); return strings; } + + @Override + public AbstractCellTable getCellTable() { + return allAccounts; + } }; refreshableAccountsSelectionModel = new RefreshableSingleSelectionModel(null, filterAccountsPanel.getAllListDataProvider()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java index 818938a1789..48e40aa1e9c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java @@ -14,6 +14,7 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.safehtml.client.SafeHtmlTemplates; import com.google.gwt.safehtml.shared.SafeHtml; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.CellTable.Resources; import com.google.gwt.user.cellview.client.Column; @@ -192,7 +193,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements leaderboardsTable = new FlushableCellTable(10000, tableRes); leaderboardsTable.ensureDebugId("LeaderboardsCellTable"); leaderboardsFilterablePanel = new LabeledAbstractFilterablePanel( - filterLeaderboardsLabel, availableLeaderboards, leaderboardsTable, leaderboardsProvider) { + filterLeaderboardsLabel, availableLeaderboards, leaderboardsProvider) { @Override public Iterable getSearchableStrings(StrippedLeaderboardDTO t) { List strings = new ArrayList(); @@ -200,6 +201,11 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements strings.add(t.displayName); return strings; } + + @Override + public AbstractCellTable getCellTable() { + return leaderboardsTable; + } }; SelectionCheckboxColumn leaderboardTableSelectionColumn = new SelectionCheckboxColumn( @@ -453,13 +459,19 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements ListHandler leaderboardGroupsListHandler = new ListHandler(groupsProvider.getList()); groupsTable = new BaseCelltable(10000, tableRes); groupsTable.ensureDebugId("LeaderboardGroupsCellTable"); - groupsFilterablePanel = new LabeledAbstractFilterablePanel(filterLeaderboardGroupsLbl, availableLeaderboardGroups, groupsTable, groupsProvider) { + groupsFilterablePanel = new LabeledAbstractFilterablePanel(filterLeaderboardGroupsLbl, + availableLeaderboardGroups, groupsProvider) { @Override public Iterable getSearchableStrings(LeaderboardGroupDTO t) { List string = new ArrayList(); string.add(t.getName()); return string; } + + @Override + public AbstractCellTable getCellTable() { + return groupsTable; + } }; groupsFilterablePanel.getTextBox().ensureDebugId("LeaderboardGroupsFilterTextBox"); leaderboardGroupsContentPanel.add(groupsFilterablePanel); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupSelectorComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupSelectorComposite.java index b819eb1fafe..84445d3383f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupSelectorComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupSelectorComposite.java @@ -17,6 +17,7 @@ import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; @@ -141,15 +142,20 @@ public class LeaderboardGroupSelectorComposite extends Composite implements HasV availableLeaderboardGroupsProvider = new ListDataProvider<>(); availableLeaderboardGroupsProvider.setList(availableLeaderboardGroups); availableLeaderboardGroupsProvider.addDataDisplay(availableLeaderboardGroupsTable); - availableLeaderboardGroupsFilterablePanel = new LabeledAbstractFilterablePanel(new Label( - stringMessages.filterLeaderboardGroupsByName()), Collections. emptyList(), - availableLeaderboardGroupsTable, availableLeaderboardGroupsProvider) { + availableLeaderboardGroupsFilterablePanel = new LabeledAbstractFilterablePanel( + new Label(stringMessages.filterLeaderboardGroupsByName()), + Collections. emptyList(), availableLeaderboardGroupsProvider) { @Override public Iterable getSearchableStrings(LeaderboardGroupDTO t) { List result = new ArrayList<>(); result.add(t.getName()); return result; } + + @Override + public AbstractCellTable getCellTable() { + return availableLeaderboardGroupsTable; + } }; availableLeaderboardGroupsSelectionModel = new RefreshableMultiSelectionModel<>( new EntityIdentityComparator() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java index 5310d6e6607..a52af358ad6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java @@ -22,6 +22,7 @@ import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.KeyCodes; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; @@ -119,7 +120,7 @@ public class MediaPanel extends FlowPanel { buttonAndFilterPanel.add(lblFilterRaces); buttonAndFilterPanel.setCellVerticalAlignment(lblFilterRaces, HasVerticalAlignment.ALIGN_MIDDLE); this.filterableMediaTracks = new LabeledAbstractFilterablePanel(lblFilterRaces, allMediaTracks, - new CellTable(), mediaTrackListDataProvider) { + mediaTrackListDataProvider) { @Override public List getSearchableStrings(MediaTrack t) { List strings = new ArrayList(); @@ -131,9 +132,13 @@ public class MediaPanel extends FlowPanel { } return strings; } + + @Override + public AbstractCellTable getCellTable() { + return mediaTracksTable; + } }; createMediaTracksTable(); - filterableMediaTracks.setTable(mediaTracksTable); filterableMediaTracks.getTextBox().ensureDebugId("MediaTracksFilterTextBox"); buttonAndFilterPanel.add(filterableMediaTracks); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java index 4bcad5339ef..6b283aa80f4 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java @@ -13,6 +13,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; import com.google.gwt.user.cellview.client.TextColumn; @@ -99,7 +100,7 @@ public class RegattaListComposite extends Composite implements RegattasDisplayer regattaListDataProvider = new ListDataProvider(); filterablePanelRegattas = new LabeledAbstractFilterablePanel(filterRegattasLabel, allRegattas, - new CellTable(), regattaListDataProvider) { + regattaListDataProvider) { @Override public Iterable getSearchableStrings(RegattaDTO t) { List string = new ArrayList(); @@ -109,11 +110,15 @@ public class RegattaListComposite extends Composite implements RegattasDisplayer } return string; } + + @Override + public AbstractCellTable getCellTable() { + return regattaTable; + } }; filterablePanelRegattas.getTextBox().ensureDebugId("RegattasFilterTextBox"); regattaTable = createRegattaTable(); regattaTable.ensureDebugId("RegattasCellTable"); - filterablePanelRegattas.setTable(regattaTable); refreshableRegattaMultiSelectionModel = (RefreshableMultiSelectionModel) regattaTable.getSelectionModel(); regattaTable.setVisible(false); panel.add(filterablePanelRegattas); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RemoteServerInstancesManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RemoteServerInstancesManagementPanel.java index 920d81242f7..43b43d97fa3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RemoteServerInstancesManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RemoteServerInstancesManagementPanel.java @@ -12,6 +12,7 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.TextColumn; @@ -40,6 +41,7 @@ public class RemoteServerInstancesManagementPanel extends SimplePanel { private final SailingServiceAsync sailingService; private final ErrorReporter errorReporter; private final StringMessages stringMessages; + private CellTable remoteServersTable; private final AdminConsoleTableResources tableRes = GWT.create(AdminConsoleTableResources.class); private final ListDataProvider serverDataProvider; @@ -66,7 +68,7 @@ public class RemoteServerInstancesManagementPanel extends SimplePanel { serverDataProvider = new ListDataProvider(); filteredServerTablePanel = new LabeledAbstractFilterablePanel( new Label(stringMessages.filterBy() + ":"), Collections. emptyList(), - new CellTable(), serverDataProvider) { + serverDataProvider) { @Override public List getSearchableStrings(RemoteSailingServerReferenceDTO t) { List strings = new ArrayList(); @@ -79,9 +81,13 @@ public class RemoteServerInstancesManagementPanel extends SimplePanel { } return strings; } + + @Override + public AbstractCellTable getCellTable() { + return remoteServersTable; + } }; - CellTable remoteServersTable = createRemoteServersTable(); - filteredServerTablePanel.setTable(remoteServersTable); + remoteServersTable = createRemoteServersTable(); serverDataProvider.addDataDisplay(remoteServersTable); remoteServersContentPanel.add(filteredServerTablePanel); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingEventManagementPanel.java index 70a1a95e498..fb902f94e5d 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingEventManagementPanel.java @@ -12,6 +12,7 @@ import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.Handler; @@ -265,7 +266,7 @@ public class SwissTimingEventManagementPanel extends AbstractEventManagementPane raceTable.setWidth("300px"); raceList = new ListDataProvider(); filterablePanelEvents = new LabeledAbstractFilterablePanel(lblFilterEvents, - availableSwissTimingRaces, raceTable, raceList) { + availableSwissTimingRaces, raceList) { @Override public Iterable getSearchableStrings(SwissTimingRaceRecordDTO t) { List strings = new ArrayList<>(); @@ -280,6 +281,11 @@ public class SwissTimingEventManagementPanel extends AbstractEventManagementPane } return strings; } + + @Override + public AbstractCellTable getCellTable() { + return raceTable; + } }; raceTable.setSelectionModel(new RefreshableMultiSelectionModel( new EntityIdentityComparator() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java index af717b7c9f0..54c46b63fb4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java @@ -13,6 +13,7 @@ import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.Handler; @@ -192,13 +193,18 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane raceTable.addColumn(raceStartTrackingColumn, stringMessages.startTime()); raceTable.setWidth("300px"); raceList = new ListDataProvider(); - filterablePanelEvents = new LabeledAbstractFilterablePanel(lblFilterEvents, availableSwissTimingRaces, raceTable, raceList) { + filterablePanelEvents = new LabeledAbstractFilterablePanel(lblFilterEvents, availableSwissTimingRaces, raceList) { @Override public List getSearchableStrings(SwissTimingReplayRaceDTO t) { List strings = new ArrayList(); strings.addAll(Arrays.asList(t.boat_class, t.flight_number, t.getName(), t.race_id, t.rsc)); return strings; } + + @Override + public AbstractCellTable getCellTable() { + return raceTable; + } }; raceTable.setSelectionModel(new RefreshableMultiSelectionModel( new EntityIdentityComparator() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java index 416a780ba56..66ada4f3d22 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java @@ -14,6 +14,7 @@ import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; import com.google.gwt.user.cellview.client.TextColumn; @@ -317,7 +318,7 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel { AdminConsoleTableResources tableResources = GWT.create(AdminConsoleTableResources.class); racesTable = new FlushableCellTable(10000, tableResources); racesTable.ensureDebugId("TrackableRacesCellTable"); - this.racesFilterablePanel = new LabeledAbstractFilterablePanel(racesFilterLabel, availableTracTracRaces, racesTable, raceList) { + this.racesFilterablePanel = new LabeledAbstractFilterablePanel(racesFilterLabel, availableTracTracRaces, raceList) { @Override public List getSearchableStrings(TracTracRaceRecordDTO t) { List strings = new ArrayList(); @@ -330,6 +331,11 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel { } return strings; } + + @Override + public AbstractCellTable getCellTable() { + return racesTable; + } }; racesFilterablePanel.getTextBox().ensureDebugId("TrackableRacesFilterTextBox"); layoutTable.setWidget(++row, 0, racesFilterLabel); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterableSelectionTable.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterableSelectionTable.java index b21a7b7076a..f442706a31b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterableSelectionTable.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterableSelectionTable.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.TextColumn; import com.google.gwt.user.client.ui.FlowPanel; @@ -67,13 +68,18 @@ public class FilterableSelectionTable { }); dataProvider.addDataDisplay(table); - filterPanel = new AbstractFilterablePanel(allData, table, dataProvider) { + filterPanel = new AbstractFilterablePanel(allData, dataProvider) { @Override public Iterable getSearchableStrings(ContentType content) { Collection searchableStrings = new ArrayList(); searchableStrings.add(getElementAsString(content)); return searchableStrings; } + + @Override + public AbstractCellTable getCellTable() { + return table; + } }; filterPanel.setSpacing(2); filterPanel.setWidth("95%"); diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/AbstractFilterablePanel.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/AbstractFilterablePanel.java index e48beb086f6..54b8a0f134d 100755 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/AbstractFilterablePanel.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/AbstractFilterablePanel.java @@ -38,7 +38,6 @@ import com.sap.sse.gwt.client.celltable.RefreshableSingleSelectionModel; */ public abstract class AbstractFilterablePanel extends HorizontalPanel { protected ListDataProvider all; - protected AbstractCellTable display; protected final ListDataProvider filtered; protected final TextBox textBox; @@ -55,10 +54,9 @@ public abstract class AbstractFilterablePanel extends HorizontalPanel { * This panel keeps a copy, so modifications to the all object do not reflect in the table * contents. Use {@link #updateAll(Iterable)} instead to update the sequence of available objects. */ - public AbstractFilterablePanel(Iterable all, AbstractCellTable display, final ListDataProvider filtered) { + public AbstractFilterablePanel(Iterable all, final ListDataProvider filtered) { setSpacing(5); this.all = new ListDataProvider<>(); - this.display = display; this.filtered = filtered; this.textBox = new TextBox(); this.textBox.ensureDebugId("FilterTextBox"); @@ -159,10 +157,12 @@ public abstract class AbstractFilterablePanel extends HorizontalPanel { filtered.refresh(); sort(); } + + public abstract AbstractCellTable getCellTable(); private void sort() { - if (display != null) { - ColumnSortEvent.fire(display, display.getColumnSortList()); + if (getCellTable() != null) { + ColumnSortEvent.fire(getCellTable(), getCellTable().getColumnSortList()); } } @@ -214,7 +214,9 @@ public abstract class AbstractFilterablePanel extends HorizontalPanel { * * @param table {@link AbstractCellTable} on which this panel works. */ + /* public void setTable(AbstractCellTable table) { display = table; } + */ } \ No newline at end of file diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/LabeledAbstractFilterablePanel.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/LabeledAbstractFilterablePanel.java index a065582ea9d..25cec3c2958 100755 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/LabeledAbstractFilterablePanel.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/LabeledAbstractFilterablePanel.java @@ -25,8 +25,8 @@ import com.sap.sse.common.filter.AbstractListFilter; */ public abstract class LabeledAbstractFilterablePanel extends AbstractFilterablePanel { - public LabeledAbstractFilterablePanel(Label label, Iterable all, CellTable display, final ListDataProvider filtered) { - super(all, display, filtered); + public LabeledAbstractFilterablePanel(Label label, Iterable all, final ListDataProvider filtered) { + super(all, filtered); insert(label, 0); } From ada2e4a391c02fae7fa93927cc1e6878e3648714 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 15 Oct 2018 11:35:19 +0200 Subject: [PATCH 2/4] bug3725: make selection in TrackedRacesListComposite on allRaces, not filtered races Change-Id: I74d2a227f0febbf09e6215d3970e224cc98822ee --- .../ui/adminconsole/AbstractTrackedRacesListComposite.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java index cc7e70ba9cb..2276205820d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java @@ -465,8 +465,8 @@ public abstract class AbstractTrackedRacesListComposite extends AbstractComposit } public void selectRaceByIdentifier(RegattaAndRaceIdentifier raceIdentifier) { - if (raceList != null) { - for (RaceDTO race : raceList.getList()) { + if (allRaces != null) { + for (RaceDTO race : allRaces) { String regattaName = race.getRegattaName(); if (regattaName.equals(raceIdentifier.getRegattaName()) && race.getName().equals(raceIdentifier.getRaceName())) { From ebff5c64f410498e61ff8003ba74fc39dd2c80a6 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 15 Oct 2018 11:38:55 +0200 Subject: [PATCH 3/4] tackling https://bugzilla.sapsailing.com/bugzilla/show_bug.cgi?id=3725#c21 by updating complete list instead of filtered list for leaderboards Change-Id: I4252c6401f639ed7a58c9068c57b2426da29f955 --- .../ui/adminconsole/EventListComposite.java | 88 +++++++++---------- .../adminconsole/LeaderboardConfigPanel.java | 8 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java index bb65214cbd8..a0c64efbd5b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java @@ -627,57 +627,57 @@ public class EventListComposite extends Composite implements EventsRefresher, Le updatedEvent.getVideos(), updatedEvent.getWindFinderReviewedSpotsCollectionIds(), new AsyncCallback() { @Override public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to update sailing event" + oldEvent.getName() + ": " + t.getMessage()); + errorReporter.reportError("Error trying to update sailing event" + oldEvent.getName() + ": " + t.getMessage()); } @Override public void onSuccess(EventDTO result) { - fillEvents(); - final String[] namesOfCourseAreasToAdd = new String[courseAreasToAdd.size()]; - int i=0; - for (CourseAreaDTO courseAreaToAdd : courseAreasToAdd) { - namesOfCourseAreasToAdd[i++] = courseAreaToAdd.getName(); - } - sailingService.createCourseAreas(oldEvent.id, namesOfCourseAreasToAdd, new AsyncCallback() { - @Override - public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to add course area to sailing event " + oldEvent.getName() - + ": " + t.getMessage()); - } - - @Override - public void onSuccess(Void result) { - final UUID[] idsOfCourseAreasToRemove = new UUID[courseAreasToRemove.size()]; - int j=0; - for (CourseAreaDTO courseAreaToRemove : courseAreasToRemove) { - idsOfCourseAreasToRemove[j++] = courseAreaToRemove.id; + fillEvents(); + final String[] namesOfCourseAreasToAdd = new String[courseAreasToAdd.size()]; + int i=0; + for (CourseAreaDTO courseAreaToAdd : courseAreasToAdd) { + namesOfCourseAreasToAdd[i++] = courseAreaToAdd.getName(); + } + sailingService.createCourseAreas(oldEvent.id, namesOfCourseAreasToAdd, new AsyncCallback() { + @Override + public void onFailure(Throwable t) { + errorReporter.reportError("Error trying to add course area to sailing event " + oldEvent.getName() + + ": " + t.getMessage()); } - sailingService.removeCourseAreas(oldEvent.id, idsOfCourseAreasToRemove, new AsyncCallback() { - @Override - public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to remove course area from sailing event " + oldEvent.getName() - + ": " + t.getMessage()); + + @Override + public void onSuccess(Void result) { + final UUID[] idsOfCourseAreasToRemove = new UUID[courseAreasToRemove.size()]; + int j=0; + for (CourseAreaDTO courseAreaToRemove : courseAreasToRemove) { + idsOfCourseAreasToRemove[j++] = courseAreaToRemove.id; } - - @Override - public void onSuccess(Void result) { - fillEvents(); - if (!oldEvent.getName().equals(updatedEvent.getName())) { - sailingService.renameEvent(oldEvent.id, updatedEvent.getName(), new AsyncCallback() { - @Override - public void onSuccess(Void result) { - } - - @Override - public void onFailure(Throwable t) { - errorReporter.reportError("Error trying to rename sailing event " + oldEvent.getName() + ": " + t.getMessage()); - } - }); + sailingService.removeCourseAreas(oldEvent.id, idsOfCourseAreasToRemove, new AsyncCallback() { + @Override + public void onFailure(Throwable t) { + errorReporter.reportError("Error trying to remove course area from sailing event " + oldEvent.getName() + + ": " + t.getMessage()); } - } - }); - } - }); + + @Override + public void onSuccess(Void result) { + fillEvents(); + if (!oldEvent.getName().equals(updatedEvent.getName())) { + sailingService.renameEvent(oldEvent.id, updatedEvent.getName(), new AsyncCallback() { + @Override + public void onSuccess(Void result) { + } + + @Override + public void onFailure(Throwable t) { + errorReporter.reportError("Error trying to rename sailing event " + oldEvent.getName() + ": " + t.getMessage()); + } + }); + } + } + }); + } + }); } }); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java index 5d71a179735..583c6403a75 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java @@ -1001,15 +1001,15 @@ TrackedRaceChangedListener, LeaderboardsDisplayer { @Override public void onSuccess(StrippedLeaderboardDTO updatedLeaderboard) { int indexOfLeaderboard = 0; - for (int i = 0; i < filteredLeaderboardList.getList().size(); i++) { - StrippedLeaderboardDTO dao = filteredLeaderboardList.getList().get(i); + for (int i = 0; i < availableLeaderboardList.size(); i++) { + StrippedLeaderboardDTO dao = availableLeaderboardList.get(i); if (dao.name.equals(oldLeaderboardName)) { indexOfLeaderboard = i; break; } } - filteredLeaderboardList.getList().set(indexOfLeaderboard, updatedLeaderboard); - filteredLeaderboardList.refresh(); + availableLeaderboardList.set(indexOfLeaderboard, updatedLeaderboard); + filterLeaderboardPanel.updateAll(availableLeaderboardList); } }); } From 9e98827f8d1cb0414ae06518985386739678e157 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 15 Oct 2018 16:08:27 +0200 Subject: [PATCH 4/4] fixed more numeric object creations from number representations in Mongo Change-Id: I294d3b3652c060d8611b1b22c748a4a829d81f70 --- .../impl/DomainObjectFactoryImpl.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java index 895c93f9890..1c89c0f6538 100644 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java @@ -554,8 +554,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { if (dbDiscardIndexResultsStartingWithHowManyRaces == null) { result = null; } else { - int[] discardIndexResultsStartingWithHowManyRaces = new int[dbDiscardIndexResultsStartingWithHowManyRaces - .size()]; + int[] discardIndexResultsStartingWithHowManyRaces = new int[dbDiscardIndexResultsStartingWithHowManyRaces.size()]; int i = 0; for (Object discardingThresholdAsObject : dbDiscardIndexResultsStartingWithHowManyRaces) { discardIndexResultsStartingWithHowManyRaces[i++] = ((Number) discardingThresholdAsObject).intValue(); @@ -703,8 +702,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { .containsField(FieldNames.LEADERBOARD_CORRECTED_SCORE.name())) { final Double leaderboardCorrectedScore = ((Number) dbScoreCorrectionForCompetitorInRace .get(FieldNames.LEADERBOARD_CORRECTED_SCORE.name())).doubleValue(); - correctionsToUpdate.correctScoreByID(competitorId, raceColumn, - (Double) leaderboardCorrectedScore); + correctionsToUpdate.correctScoreByID(competitorId, raceColumn, leaderboardCorrectedScore); } } } else { @@ -1268,7 +1266,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { } final Number buoyZoneRadiusInHullLengthsAsNumber = (Number) dbRegatta .get(FieldNames.REGATTA_BUOY_ZONE_RADIUS_IN_HULL_LENGTHS.name()); - final Double buoyZoneRadiusInHullLengths = buoyZoneRadiusInHullLengthsAsNumber==null?null:(Double) buoyZoneRadiusInHullLengthsAsNumber.doubleValue(); + final Double buoyZoneRadiusInHullLengths = buoyZoneRadiusInHullLengthsAsNumber==null?null:buoyZoneRadiusInHullLengthsAsNumber.doubleValue(); final Boolean useStartTimeInference = (Boolean) dbRegatta .get(FieldNames.REGATTA_USE_START_TIME_INFERENCE.name()); final Boolean controlTrackingFromStartAndFinishTimes = (Boolean) dbRegatta @@ -1358,8 +1356,9 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { if (isFleetCanRunInParallelObject != null) { isFleetsCanRunInParallel = (Boolean) dbSeries.get(FieldNames.SERIES_IS_FLEETS_CAN_RUN_IN_PARALLEL.name()); } - final Integer maximumNumberOfDiscards = (Integer) dbSeries + final Number maximumNumberOfDiscardsAsObject = (Number) dbSeries .get(FieldNames.SERIES_MAXIMUM_NUMBER_OF_DISCARDS.name()); + final Integer maximumNumberOfDiscards = maximumNumberOfDiscardsAsObject == null ? null : maximumNumberOfDiscardsAsObject.intValue(); Boolean startsWithZeroScore = (Boolean) dbSeries.get(FieldNames.SERIES_STARTS_WITH_ZERO_SCORE.name()); Boolean hasSplitFleetContiguousScoring = (Boolean) dbSeries .get(FieldNames.SERIES_HAS_SPLIT_FLEET_CONTIGUOUS_SCORING.name()); @@ -1428,11 +1427,13 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { private Fleet loadFleet(DBObject dbFleet) { Fleet result; String name = (String) dbFleet.get(FieldNames.FLEET_NAME.name()); - Integer ordering = (Integer) dbFleet.get(FieldNames.FLEET_ORDERING.name()); + Number orderingAsNumber = (Number) dbFleet.get(FieldNames.FLEET_ORDERING.name()); + Integer ordering = orderingAsNumber == null ? null : orderingAsNumber.intValue(); if (ordering == null) { ordering = 0; } - Integer colorAsInt = (Integer) dbFleet.get(FieldNames.FLEET_COLOR.name()); + Number colorAsNumber = (Number) dbFleet.get(FieldNames.FLEET_COLOR.name()); + Integer colorAsInt = colorAsNumber == null ? null : colorAsNumber.intValue(); Color color = null; if (colorAsInt != null) { int r = colorAsInt % 256; @@ -1874,9 +1875,11 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { final Integer rank = (Integer) dbObject.get(FieldNames.LEADERBOARD_RANK.name()); final MaxPointsReason maxPointsReason = MaxPointsReason .valueOf((String) dbObject.get(FieldNames.LEADERBOARD_SCORE_CORRECTION_MAX_POINTS_REASON.name())); - final Double score = (Double) dbObject.get(FieldNames.LEADERBOARD_CORRECTED_SCORE.name()); - final Long finishingTimePointAsMillis = (Long) dbObject + final Number scoreAsNumber = (Number) dbObject.get(FieldNames.LEADERBOARD_CORRECTED_SCORE.name()); + final Double score = scoreAsNumber == null ? null : scoreAsNumber.doubleValue(); + final Number finishingTimePointAsMillisAsNumber = (Number) dbObject .get(FieldNames.RACE_LOG_FINISHING_TIME_AS_MILLIS.name()); + final Long finishingTimePointAsMillis = finishingTimePointAsMillisAsNumber == null ? null : finishingTimePointAsMillisAsNumber.longValue(); final TimePoint finishingTime = finishingTimePointAsMillis == null ? null : new MillisecondsTimePoint(finishingTimePointAsMillis); final String comment = (String) dbObject.get(FieldNames.LEADERBOARD_SCORE_CORRECTION_COMMENT.name()); @@ -2072,7 +2075,8 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { private RegattaLogEvent loadRegattaLogSetCompetitorTimeOnDistanceAllowancePerNauticalMileEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable id, DBObject dbObject) { final Competitor comp = getCompetitorByID(dbObject); - final Double timeOnTimeFactor = (Double) dbObject.get(FieldNames.REGATTA_LOG_TIME_ON_TIME_FACTOR.name()); + final Number timeOnTimeFactorAsNumber = (Number) dbObject.get(FieldNames.REGATTA_LOG_TIME_ON_TIME_FACTOR.name()); + final Double timeOnTimeFactor = timeOnTimeFactorAsNumber == null ? null : timeOnTimeFactorAsNumber.doubleValue(); return new RegattaLogSetCompetitorTimeOnTimeFactorEventImpl(createdAt, logicalTimePoint, author, id, comp, timeOnTimeFactor); } @@ -2080,8 +2084,10 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { private RegattaLogEvent loadRegattaLogSetCompetitorTimeOnTimeFactorEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable id, DBObject dbObject) { final Competitor comp = getCompetitorByID(dbObject); - final Double timeOnDistanceSecondsAllowancePerNauticalMile = (Double) dbObject + final Number timeOnDistanceSecondsAllowancePerNauticalMileAsNumber = (Number) dbObject .get(FieldNames.REGATTA_LOG_TIME_ON_DISTANCE_SECONDS_ALLOWANCE_PER_NAUTICAL_MILE.name()); + final Double timeOnDistanceSecondsAllowancePerNauticalMile = timeOnDistanceSecondsAllowancePerNauticalMileAsNumber == null + ? null : timeOnDistanceSecondsAllowancePerNauticalMileAsNumber.doubleValue(); final Duration timeOnDistanceAllowancePerNauticalMile = timeOnDistanceSecondsAllowancePerNauticalMile == null ? null : new MillisecondsDurationImpl((long) (timeOnDistanceSecondsAllowancePerNauticalMile * 1000)); return new RegattaLogSetCompetitorTimeOnDistanceAllowancePerNauticalMileEventImpl(createdAt, logicalTimePoint,