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, 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 4bbe5779036..bb3d35d7876 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; @@ -172,7 +173,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(); @@ -180,6 +181,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 acf6c433c15..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 @@ -17,6 +17,7 @@ import com.google.gwt.event.dom.client.DomEvent; 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.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; @@ -143,7 +144,7 @@ public abstract class AbstractTrackedRacesListComposite extends AbstractComposit filterPanel.add(lblFilterRaces); filterPanel.setCellVerticalAlignment(lblFilterRaces, HasVerticalAlignment.ALIGN_MIDDLE); raceList = raceTableWrapper.getDataProvider(); - filterablePanelRaces = new CustomizableFilterablePanel(allRaces, raceTable, raceList) { + filterablePanelRaces = new CustomizableFilterablePanel(allRaces, raceList) { @Override public List getSearchableStrings(RaceDTO t) { List strings = new ArrayList(); @@ -152,6 +153,11 @@ public abstract class AbstractTrackedRacesListComposite extends AbstractComposit strings.add(t.getRegattaName()); return strings; } + + @Override + public AbstractCellTable getCellTable() { + return raceTable; + } }; raceTableWrapper.registerSelectionModelOnNewDataProvider(filterablePanelRaces.getAllListDataProvider()); Label lblFilterByRegatta = new Label(stringMessages.filterByRegatta()); @@ -459,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())) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BoatTableWrapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BoatTableWrapper.java index 588f3e8c6ea..c954a10805d 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BoatTableWrapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BoatTableWrapper.java @@ -10,6 +10,7 @@ import com.google.gwt.cell.client.SafeHtmlCell; import com.google.gwt.core.client.Callback; 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; @@ -140,7 +141,7 @@ public class BoatTableWrapper> exte }); filterField = new LabeledAbstractFilterablePanel(new Label(stringMessages.filterBoats()), - new ArrayList(), table, dataProvider) { + new ArrayList(), dataProvider) { @Override public Iterable getSearchableStrings(BoatDTO boat) { List string = new ArrayList(); @@ -150,6 +151,11 @@ public class BoatTableWrapper> exte string.add(boat.getIdAsString()); return string; } + + @Override + public AbstractCellTable getCellTable() { + return table; + } }; registerSelectionModelOnNewDataProvider(filterField.getAllListDataProvider()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompactBoatTableWrapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompactBoatTableWrapper.java index 7c74b9534cc..4b5b08268f3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompactBoatTableWrapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompactBoatTableWrapper.java @@ -11,6 +11,7 @@ import java.util.Set; import com.google.gwt.cell.client.SafeHtmlCell; 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; @@ -131,7 +132,7 @@ public class CompactBoatTableWrapper(new ArrayList<>(), getTable(), getDataProvider()) { + filterField = new CustomizableFilterablePanel(new ArrayList<>(), getDataProvider()) { @Override public Iterable getSearchableStrings(BoatDTO boat) { List string = new ArrayList(); @@ -140,6 +141,11 @@ public class CompactBoatTableWrapper getCellTable() { + return table; } }; final CheckBox filterToBoatsRegisteredOnRegatta = new CheckBox(stringMessages.filterToBoatsRegisteredOnRegatta()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompactCompetitorTableWrapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompactCompetitorTableWrapper.java index 87f975e8388..a2bdd211038 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompactCompetitorTableWrapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompactCompetitorTableWrapper.java @@ -11,6 +11,7 @@ import com.google.gwt.cell.client.SafeHtmlCell; 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; @@ -132,7 +133,7 @@ public class CompactCompetitorTableWrapper(new Label(stringMessages.filterCompetitors()), - new ArrayList(), table, dataProvider) { + new ArrayList(), dataProvider) { @Override public Iterable getSearchableStrings(CompetitorDTO t) { List string = new ArrayList(); @@ -141,6 +142,11 @@ public class CompactCompetitorTableWrapper getCellTable() { + return table; + } }; registerSelectionModelOnNewDataProvider(filterField.getAllListDataProvider()); mainPanel.insert(filterField, 0); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorDescriptorTableWrapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorDescriptorTableWrapper.java index 77dc4d14850..b18f591e867 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorDescriptorTableWrapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorDescriptorTableWrapper.java @@ -11,6 +11,7 @@ import com.google.gwt.core.client.GWT; 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; @@ -101,7 +102,7 @@ public class CompetitorDescriptorTableWrapper( new Label(stringMessages.filterImportedCompetitorsByNameSailRaceFleet()), - new ArrayList(), table, dataProvider) { + new ArrayList(), dataProvider) { @Override public Iterable getSearchableStrings(CompetitorDescriptor competitorDescriptor) { List string = new ArrayList(); @@ -112,6 +113,11 @@ public class CompetitorDescriptorTableWrapper getCellTable() { + return CompetitorDescriptorTableWrapper.this.getTable(); + } }; registerSelectionModelOnNewDataProvider(filterablePanelCompetitorDescriptor.getAllListDataProvider()); 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 old mode 100755 new mode 100644 index 6b898852beb..2810c668a8a --- 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; @@ -290,7 +291,7 @@ public class CompetitorTableWrapper(new Label(getStringMessages().filterCompetitors()), - new ArrayList(), table, dataProvider) { + new ArrayList(), dataProvider) { @Override public Iterable getSearchableStrings(CompetitorDTO t) { List string = new ArrayList(); @@ -304,6 +305,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 old mode 100755 new mode 100644 index c5acf2892ef..9889c69644c --- 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 @@ -25,6 +25,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.safehtml.shared.SafeUri; import com.google.gwt.safehtml.shared.UriUtils; import com.google.gwt.user.cellview.client.CellTable; @@ -185,8 +186,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(); @@ -200,10 +201,14 @@ public class EventListComposite extends Composite implements EventsRefresher, Le } return result; } + + @Override + public AbstractCellTable getCellTable() { + return eventTable; + } }; eventTable = createEventTable(userService.getCurrentUser()); eventTable.ensureDebugId("EventsCellTable"); - filterTextbox.setTable(eventTable); @SuppressWarnings("unchecked") final RefreshableMultiSelectionModel selectionModel = (RefreshableMultiSelectionModel) eventTable.getSelectionModel(); refreshableEventSelectionModel = selectionModel; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ExpeditionDeviceConfigurationsPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ExpeditionDeviceConfigurationsPanel.java index 5cd2d349006..d665a883208 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ExpeditionDeviceConfigurationsPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ExpeditionDeviceConfigurationsPanel.java @@ -13,6 +13,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; 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; @@ -87,7 +88,7 @@ public class ExpeditionDeviceConfigurationsPanel extends FlowPanel { filteredDeviceConfigurations.addDataDisplay(allDeviceConfigurations); final List emptyList = Collections.emptyList(); filterDeviceConfigurationsPanel = new LabeledAbstractFilterablePanel(new Label(stringMessages.expeditionDeviceConfigurations()), - emptyList, allDeviceConfigurations, filteredDeviceConfigurations) { + emptyList, filteredDeviceConfigurations) { @Override public Iterable getSearchableStrings(ExpeditionDeviceConfiguration t) { Set strings = new HashSet<>(); @@ -96,6 +97,11 @@ public class ExpeditionDeviceConfigurationsPanel extends FlowPanel { strings.add(""+t.getExpeditionBoatId()); return strings; } + + @Override + public AbstractCellTable getCellTable() { + return allDeviceConfigurations; + } }; refreshableDeviceConfigurationsSelectionModel = new RefreshableSingleSelectionModel<>(new EntityIdentityComparator() { @Override 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 5e16aeb45dc..631bea4fc31 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; @@ -91,12 +92,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/LeaderboardConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java index fa59368baa7..42c30350ac6 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 @@ -1044,15 +1044,15 @@ TrackedRaceChangedListener, LeaderboardsDisplayer { private void refreshLeaderboardInTable(final String oldLeaderboardName, 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.getName().equals(oldLeaderboardName)) { indexOfLeaderboard = i; break; } } - filteredLeaderboardList.getList().set(indexOfLeaderboard, updatedLeaderboard); - filteredLeaderboardList.refresh(); + availableLeaderboardList.set(indexOfLeaderboard, updatedLeaderboard); + filterLeaderboardPanel.updateAll(availableLeaderboardList); } private void removeLeaderboards(final Collection leaderboards) { 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 5f4884c55d3..778aaf4b96f 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 @@ -20,6 +20,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.safehtml.shared.SafeUri; import com.google.gwt.safehtml.shared.UriUtils; import com.google.gwt.user.cellview.client.CellTable.Resources; @@ -209,7 +210,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(); @@ -217,6 +218,11 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements strings.add(t.displayName); return strings; } + + @Override + public AbstractCellTable getCellTable() { + return leaderboardsTable; + } }; SelectionCheckboxColumn leaderboardTableSelectionColumn = new SelectionCheckboxColumn( @@ -470,13 +476,19 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements ListHandler leaderboardGroupsListHandler = new ListHandler(groupsProvider.getList()); groupsTable = new FlushableCellTable(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 544bc96d7bd..c17ba4bc277 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; @@ -142,15 +143,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 3c85da56884..678448f2362 100755 --- 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 @@ -24,6 +24,7 @@ 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.safehtml.shared.SafeHtmlUtils; +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; @@ -165,7 +166,7 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { 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(); @@ -178,9 +179,13 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { } 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 81dedc24fb0..c6f3a4699bf 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 @@ -17,6 +17,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; @@ -108,7 +109,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(); @@ -118,11 +119,15 @@ public class RegattaListComposite extends Composite implements RegattasDisplayer } return string; } + + @Override + public AbstractCellTable getCellTable() { + return regattaTable; + } }; filterablePanelRegattas.getTextBox().ensureDebugId("RegattasFilterTextBox"); regattaTable = createRegattaTable(userService); 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/RegattaLogTrackingDeviceMappingsDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogTrackingDeviceMappingsDialog.java index dddf712eb88..1127f5838da 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogTrackingDeviceMappingsDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogTrackingDeviceMappingsDialog.java @@ -26,6 +26,7 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.json.client.JSONObject; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.CheckBox; @@ -170,7 +171,7 @@ public class RegattaLogTrackingDeviceMappingsDialog extends DataEntryDialog( new Label(stringMessages.filterDeviceMappings()), - new ArrayList(), deviceMappingTable.getTable(), deviceMappingTable.getDataProvider()) { + new ArrayList(), deviceMappingTable.getDataProvider()) { @Override public Iterable getSearchableStrings(DeviceMappingDTO t) { List string = new ArrayList(); @@ -179,6 +180,11 @@ public class RegattaLogTrackingDeviceMappingsDialog extends DataEntryDialog getCellTable() { + return deviceMappingTable.getTable(); + } }; filterField.addFilter(new Filter() { @Override 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 5cc3b9e3848..eb63e28f431 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; @@ -42,6 +43,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; @@ -68,7 +70,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(); @@ -81,9 +83,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 6e440bfa432..c37ecbcf44a 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 @@ -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.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.Handler; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; @@ -230,7 +231,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<>(); @@ -245,6 +246,11 @@ public class SwissTimingEventManagementPanel extends AbstractEventManagementPane } return strings; } + + @Override + public AbstractCellTable getCellTable() { + return raceTable; + } }; final EntityIdentityComparator entityIdentityComparator = 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 598f114198b..f66fc4bd371 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 @@ -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.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.Handler; @@ -195,13 +196,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.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 4592e7bb447..818b3539ca4 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; @@ -290,7 +291,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(); @@ -303,6 +304,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.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java index 77a960fbd54..41a1b3fc3ea 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java @@ -20,6 +20,7 @@ import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.dom.client.Style.TextAlign; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.i18n.client.LocaleInfo; +import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.DataGrid; import com.google.gwt.user.cellview.client.TextColumn; @@ -118,11 +119,16 @@ public class DimensionFilterSelectionProvider extends AbstractDataMiningComponen availableData = new HashSet<>(); filteredData = new ListDataProvider(this::elementAsString); - filterPanel = new AbstractFilterablePanel(null, dataGrid, filteredData) { + filterPanel = new AbstractFilterablePanel(null, filteredData) { @Override public Iterable getSearchableStrings(Serializable element) { return Collections.singleton(elementAsString(element)); } + + @Override + public AbstractCellTable getCellTable() { + return dataGrid; + } }; filterPanel.setWidth("100%"); filterPanel.setSpacing(1); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java index 21242950caf..ec8846d6e0c 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java @@ -148,12 +148,16 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractDa filteredFilterDimensions.addDataDisplay(filterDimensionsList); filterFilterDimensionsPanel = new AbstractFilterablePanel( - null, filterDimensionsList, filteredFilterDimensions) - { + null, filteredFilterDimensions) { @Override public Iterable getSearchableStrings(DimensionWithContext dimension) { return dimension.getMatchingStrings(); } + + @Override + public AbstractCellTable getCellTable() { + return filterDimensionsList; + } }; filterFilterDimensionsPanel.addStyleName("filterFilterDimensionsPanel"); filterFilterDimensionsPanel.setSpacing(2); 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 7004792781a..043d370b4eb 100644 --- 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 @@ -46,7 +46,6 @@ import com.sap.sse.gwt.client.celltable.RefreshableSelectionModel; */ public abstract class AbstractFilterablePanel extends HorizontalPanel { protected ListDataProvider all; - protected AbstractCellTable display; protected final ListDataProvider filtered; protected final TextBox textBox; @@ -71,13 +70,11 @@ public abstract class AbstractFilterablePanel extends HorizontalPanel { * Filtering will still use the text box contents, even if the box is ultimately not shown; but under * normal circumstances the text box will be empty in this case, not making filtering any stricter. */ - public AbstractFilterablePanel(Iterable all, AbstractCellTable display, final ListDataProvider filtered, + public AbstractFilterablePanel(Iterable all, final ListDataProvider filtered, boolean drawTextBox) { filters.add(filterer); - setSpacing(5); this.all = new ListDataProvider<>(); - this.display = display; this.filtered = filtered; this.textBox = new TextBox(); this.textBox.ensureDebugId("FilterTextBox"); @@ -88,8 +85,8 @@ public abstract class AbstractFilterablePanel extends HorizontalPanel { } } - public AbstractFilterablePanel(Iterable all, AbstractCellTable display, final ListDataProvider filtered) { - this(all, display, filtered, /* show default filter text box */ true); + public AbstractFilterablePanel(Iterable all, final ListDataProvider filtered) { + this(all, filtered, /* show default filter text box */ true); } private void setAll(Iterable all) { @@ -181,7 +178,10 @@ public abstract class AbstractFilterablePanel extends HorizontalPanel { filtered.flush(); sort(); } + + public abstract AbstractCellTable getCellTable(); + protected void retainElementsInFilteredThatPassFilter() { List filteredElements = new ArrayList<>(); for (T t : all.getList()) { @@ -202,10 +202,10 @@ public abstract class AbstractFilterablePanel extends HorizontalPanel { } protected void sort() { - if (display != null) { - ColumnSortEvent.fire(display, display.getColumnSortList()); + if (getCellTable() != null) { + ColumnSortEvent.fire(getCellTable(), getCellTable().getColumnSortList()); } - } + } public void addDefaultTextBox() { add(getTextBox()); @@ -245,7 +245,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/CustomizableFilterablePanel.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/CustomizableFilterablePanel.java index aad530eb749..7b087250675 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/CustomizableFilterablePanel.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/CustomizableFilterablePanel.java @@ -1,6 +1,5 @@ package com.sap.sse.gwt.client.panels; -import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; @@ -20,8 +19,8 @@ public abstract class CustomizableFilterablePanel extends AbstractFilterableP * Does not add the default filter text box yet; use {@link #addDefaultTextBox()} to do so; you may * add other widgets before the default text filter box. */ - public CustomizableFilterablePanel(Iterable all, AbstractCellTable display, ListDataProvider filtered) { - super(all, display, filtered, /* show default filter text box */ false); + public CustomizableFilterablePanel(Iterable all, ListDataProvider filtered) { + super(all, filtered, /* show default filter text box */ false); } public void add(Label label, Widget widget, Filter filter) { 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 b5d91608be7..1b58c83e575 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 @@ -1,6 +1,5 @@ package com.sap.sse.gwt.client.panels; -import com.google.gwt.user.cellview.client.AbstractCellTable; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.client.ui.Label; import com.google.gwt.view.client.ListDataProvider; @@ -29,14 +28,9 @@ import com.sap.sse.common.filter.AbstractListFilter; public abstract class LabeledAbstractFilterablePanel extends AbstractFilterablePanel { /** - * @param display - * Note: when using this with a cell table obtained through {@link TableWrapper#getTable()}, obtain this - * panel's {@link #getAllListDataProvider()} and pass it to the - * {@link TableWrapper#registerSelectionModelOnNewDataProvider} method so that the selection is preserved - * across setting and removing the filter */ - public LabeledAbstractFilterablePanel(Label label, Iterable all, AbstractCellTable display, final ListDataProvider filtered) { - super(all, display, filtered); + public LabeledAbstractFilterablePanel(Label label, Iterable all, final ListDataProvider filtered) { + super(all, filtered); insert(label, 0); } diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/RoleDefinitionsPanel.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/RoleDefinitionsPanel.java index dbdfaff0685..dded81b75e4 100755 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/RoleDefinitionsPanel.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/RoleDefinitionsPanel.java @@ -11,6 +11,7 @@ import com.google.gwt.cell.client.FieldUpdater; import com.google.gwt.cell.client.SafeHtmlCell; 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; @@ -71,17 +72,21 @@ public class RoleDefinitionsPanel extends VerticalPanel { this.removeButton = new Button(stringMessages.remove()); this.refreshButton = new Button(stringMessages.refresh()); rolesListDataProvider = new ListDataProvider(); + roleDefinitionsTable = createRoleDefinitionsTable(tableResources); + roleDefinitionsTable.ensureDebugId("RolesCellTable"); filterablePanelRoleDefinitions = new LabeledAbstractFilterablePanel(new Label(stringMessages.filterRoles()), new ArrayList<>(), - new CellTable(), rolesListDataProvider) { + rolesListDataProvider) { @Override public Iterable getSearchableStrings(RoleDefinition roleDefinition) { return Arrays.asList(roleDefinition.getName(), roleDefinition.getId().toString(), roleDefinition.getPermissions().toString()); } + + @Override + public AbstractCellTable getCellTable() { + return roleDefinitionsTable; + } }; filterablePanelRoleDefinitions.getTextBox().ensureDebugId("RolesFilterTextBox"); - roleDefinitionsTable = createRoleDefinitionsTable(tableResources); - roleDefinitionsTable.ensureDebugId("RolesCellTable"); - filterablePanelRoleDefinitions.setTable(roleDefinitionsTable); addButton.addClickHandler(e->createRoleDefinition()); refreshableRoleDefinitionMultiSelectionModel = (RefreshableMultiSelectionModel) roleDefinitionsTable.getSelectionModel(); removeButton.addClickHandler(e->{ diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserTableWrapper.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserTableWrapper.java index 6d35d7657aa..13471372759 100755 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserTableWrapper.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserTableWrapper.java @@ -12,6 +12,7 @@ import com.google.gwt.cell.client.SafeHtmlCell; import com.google.gwt.core.client.Callback; 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; @@ -174,7 +175,7 @@ extends TableWrapper { }); filterField = new LabeledAbstractFilterablePanel(new Label(stringMessages.filterUsers()), - new ArrayList(), table, dataProvider) { + new ArrayList(), dataProvider) { @Override public Iterable getSearchableStrings(UserDTO t) { List string = new ArrayList(); @@ -185,6 +186,11 @@ extends TableWrapper { string.add(t.getUserGroups().toString()); return string; } + + @Override + public AbstractCellTable getCellTable() { + return table; + } }; registerSelectionModelOnNewDataProvider(filterField.getAllListDataProvider()); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/example/AISListenerExample.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/example/AISListenerExample.java index 99b4f13466c..76f29c6b314 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/example/AISListenerExample.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/example/AISListenerExample.java @@ -25,8 +25,8 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import net.sf.marineapi.ais.message.AISMessage01; import net.sf.marineapi.ais.event.AbstractAISMessageListener; +import net.sf.marineapi.ais.message.AISMessage01; import net.sf.marineapi.nmea.io.SentenceReader; /** diff --git a/java/net.sf.marineapi/META-INF/MANIFEST.MF b/java/net.sf.marineapi/META-INF/MANIFEST.MF index 50f0b1ca673..6d2a40eba4e 100644 --- a/java/net.sf.marineapi/META-INF/MANIFEST.MF +++ b/java/net.sf.marineapi/META-INF/MANIFEST.MF @@ -4,7 +4,11 @@ Bundle-Name: Marineapi Bundle-SymbolicName: net.sf.marineapi Bundle-Version: 0.5.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: net.sf.marineapi.nmea.event, +Export-Package: net.sf.marineapi.ais.event, + net.sf.marineapi.ais.message, + net.sf.marineapi.ais.parser, + net.sf.marineapi.ais.util, + net.sf.marineapi.nmea.event, net.sf.marineapi.nmea.io, net.sf.marineapi.nmea.parser, net.sf.marineapi.nmea.sentence,