mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-14 22:43:57 +00:00
bug4205 Removed no longer need generic type from
FilterValueChangeHandler
This commit is contained in:
1 parent
d438102dd5
commit
43240cfb77
11 files changed
+23
-29
No files matched your search
+1
-2
@@ -30,8 +30,7 @@ import com.sap.sailing.gwt.ui.leaderboard.SortedCellTable;
|
||||
import com.sap.sse.common.filter.Filter;
|
||||
|
||||
public abstract class AbstractRaceList<T extends RaceMetadataDTO<? extends AbstractWindDTO>> extends Composite
|
||||
implements FilterValueProvider<SimpleCompetitorDTO>,
|
||||
FilterValueChangeHandler<SimpleRaceMetadataDTO, SimpleCompetitorDTO> {
|
||||
implements FilterValueProvider<SimpleCompetitorDTO>, FilterValueChangeHandler<SimpleRaceMetadataDTO> {
|
||||
|
||||
private static final LocalCss CSS = RaceListResources.INSTANCE.css();
|
||||
|
||||
|
||||
+4
-4
@@ -288,7 +288,7 @@ public class RegattaRacesTabView extends Composite implements RegattaTabView<Reg
|
||||
private class RegattaRacesTabViewFilterPresenter extends FilterPresenter<SimpleRaceMetadataDTO, SimpleCompetitorDTO> {
|
||||
|
||||
private final Map<Navigation, List<FilterValueProvider<SimpleCompetitorDTO>>> providersByTab = new HashMap<>();
|
||||
private final Map<Navigation, List<FilterValueChangeHandler<SimpleRaceMetadataDTO, SimpleCompetitorDTO>>> handlersByTab = new HashMap<>();
|
||||
private final Map<Navigation, List<FilterValueChangeHandler<SimpleRaceMetadataDTO>>> handlersByTab = new HashMap<>();
|
||||
|
||||
private RegattaRacesTabViewFilterPresenter(FilterWidget<SimpleRaceMetadataDTO, SimpleCompetitorDTO> filterWidget) {
|
||||
super(filterWidget);
|
||||
@@ -300,7 +300,7 @@ public class RegattaRacesTabView extends Composite implements RegattaTabView<Reg
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<FilterValueChangeHandler<SimpleRaceMetadataDTO, SimpleCompetitorDTO>> getCurrentValueChangeHandlers() {
|
||||
protected List<FilterValueChangeHandler<SimpleRaceMetadataDTO>> getCurrentValueChangeHandlers() {
|
||||
return handlersByTab.get(currentlySelectedTab);
|
||||
}
|
||||
|
||||
@@ -310,8 +310,8 @@ public class RegattaRacesTabView extends Composite implements RegattaTabView<Reg
|
||||
list.add(provider);
|
||||
}
|
||||
|
||||
private void addHandler(Navigation assosiatedTab, FilterValueChangeHandler<SimpleRaceMetadataDTO, SimpleCompetitorDTO> handler) {
|
||||
List<FilterValueChangeHandler<SimpleRaceMetadataDTO, SimpleCompetitorDTO>> list = handlersByTab.get(assosiatedTab);
|
||||
private void addHandler(Navigation assosiatedTab, FilterValueChangeHandler<SimpleRaceMetadataDTO> handler) {
|
||||
List<FilterValueChangeHandler<SimpleRaceMetadataDTO>> list = handlersByTab.get(assosiatedTab);
|
||||
if (list == null) this.handlersByTab.put(assosiatedTab, list = new ArrayList<>());
|
||||
list.add(handler);
|
||||
super.addHandler(handler);
|
||||
|
||||
+3
-3
@@ -50,11 +50,11 @@ public class MultiRegattaViewImpl extends AbstractEventOverview {
|
||||
private class MultiRegattaViewImplFilterPresenter extends FilterPresenter<RegattaMetadataDTO, String> {
|
||||
|
||||
private final List<FilterValueProvider<String>> valueProviders;
|
||||
private final List<FilterValueChangeHandler<RegattaMetadataDTO, String>> valueChangeHandlers;
|
||||
private final List<FilterValueChangeHandler<RegattaMetadataDTO>> valueChangeHandlers;
|
||||
|
||||
public MultiRegattaViewImplFilterPresenter(FilterWidget<RegattaMetadataDTO, String> filterWidget,
|
||||
FilterValueProvider<String> valueProvider,
|
||||
FilterValueChangeHandler<RegattaMetadataDTO, String> valueChangeHandler) {
|
||||
FilterValueChangeHandler<RegattaMetadataDTO> valueChangeHandler) {
|
||||
super(filterWidget);
|
||||
this.valueProviders = Arrays.asList(valueProvider);
|
||||
this.valueChangeHandlers = Arrays.asList(valueChangeHandler);
|
||||
@@ -67,7 +67,7 @@ public class MultiRegattaViewImpl extends AbstractEventOverview {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<FilterValueChangeHandler<RegattaMetadataDTO, String>> getCurrentValueChangeHandlers() {
|
||||
protected List<FilterValueChangeHandler<RegattaMetadataDTO>> getCurrentValueChangeHandlers() {
|
||||
return valueChangeHandlers;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -76,11 +76,11 @@ public class RacesViewImpl extends AbstractEventView<RacesView.Presenter> implem
|
||||
private class RacesViewImplFilterPresenter extends FilterPresenter<SimpleRaceMetadataDTO, SimpleCompetitorDTO> {
|
||||
|
||||
private final List<FilterValueProvider<SimpleCompetitorDTO>> valueProviders;
|
||||
private final List<FilterValueChangeHandler<SimpleRaceMetadataDTO, SimpleCompetitorDTO>> valueChangeHandlers;
|
||||
private final List<FilterValueChangeHandler<SimpleRaceMetadataDTO>> valueChangeHandlers;
|
||||
|
||||
public RacesViewImplFilterPresenter(FilterWidget<SimpleRaceMetadataDTO, SimpleCompetitorDTO> filterWidget,
|
||||
FilterValueProvider<SimpleCompetitorDTO> valueProvider,
|
||||
FilterValueChangeHandler<SimpleRaceMetadataDTO, SimpleCompetitorDTO> valueChangeHandler) {
|
||||
FilterValueChangeHandler<SimpleRaceMetadataDTO> valueChangeHandler) {
|
||||
super(filterWidget);
|
||||
this.valueProviders = Arrays.asList(valueProvider);
|
||||
this.valueChangeHandlers = Arrays.asList(valueChangeHandler);
|
||||
@@ -93,7 +93,7 @@ public class RacesViewImpl extends AbstractEventView<RacesView.Presenter> implem
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<FilterValueChangeHandler<SimpleRaceMetadataDTO, SimpleCompetitorDTO>> getCurrentValueChangeHandlers() {
|
||||
protected List<FilterValueChangeHandler<SimpleRaceMetadataDTO>> getCurrentValueChangeHandlers() {
|
||||
return valueChangeHandlers;
|
||||
}
|
||||
}
|
||||
|
||||
+4
-11
@@ -9,24 +9,17 @@ import com.sap.sse.common.filter.Filter;
|
||||
|
||||
public abstract class AbstractFilterWidget<T, C> extends Composite implements FilterWidget<T, C> {
|
||||
|
||||
private final List<FilterValueChangeHandler<T, C>> valueChangeHandlers = new ArrayList<>();
|
||||
private final List<FilterValueChangeHandler<T>> valueChangeHandlers = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public HandlerRegistration addFilterValueChangeHandler(final FilterValueChangeHandler<T, C> handler) {
|
||||
public HandlerRegistration addFilterValueChangeHandler(final FilterValueChangeHandler<T> handler) {
|
||||
valueChangeHandlers.add(handler);
|
||||
return new HandlerRegistration() {
|
||||
@Override
|
||||
public void removeHandler() {
|
||||
valueChangeHandlers.remove(handler);
|
||||
}
|
||||
};
|
||||
return () -> valueChangeHandlers.remove(handler);
|
||||
}
|
||||
|
||||
protected void notifyValueChangeHandlers() {
|
||||
Filter<T> filter = getFilter();
|
||||
for(FilterValueChangeHandler<T, C> valueChangeHandler : valueChangeHandlers) {
|
||||
valueChangeHandler.onFilterValueChanged(filter);
|
||||
}
|
||||
valueChangeHandlers.forEach(valueChangeHandler -> valueChangeHandler.onFilterValueChanged(filter));
|
||||
}
|
||||
|
||||
}
|
||||
+2
-2
@@ -27,11 +27,11 @@ public abstract class FilterPresenter<T, C extends Comparable<C>> {
|
||||
this.filterWidget.asWidget().setVisible(false);
|
||||
}
|
||||
|
||||
protected abstract List<FilterValueChangeHandler<T, C>> getCurrentValueChangeHandlers();
|
||||
protected abstract List<FilterValueChangeHandler<T>> getCurrentValueChangeHandlers();
|
||||
|
||||
protected abstract List<FilterValueProvider<C>> getCurrentValueProviders();
|
||||
|
||||
protected void addHandler(FilterValueChangeHandler<T, C> handler) {
|
||||
protected void addHandler(FilterValueChangeHandler<T> handler) {
|
||||
this.filterWidget.addFilterValueChangeHandler(handler);
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -2,7 +2,8 @@ package com.sap.sailing.gwt.home.shared.partials.filter;
|
||||
|
||||
import com.sap.sse.common.filter.Filter;
|
||||
|
||||
public interface FilterValueChangeHandler<T, C> {
|
||||
@FunctionalInterface
|
||||
public interface FilterValueChangeHandler<T> {
|
||||
|
||||
void onFilterValueChanged(Filter<T> filter);
|
||||
|
||||
|
||||
+1
@@ -2,6 +2,7 @@ package com.sap.sailing.gwt.home.shared.partials.filter;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
@FunctionalInterface
|
||||
public interface FilterValueProvider<C> {
|
||||
|
||||
Collection<C> getFilterableValues();
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ import com.sap.sse.common.filter.Filter;
|
||||
|
||||
public interface FilterWidget<T, C> extends IsWidget {
|
||||
|
||||
HandlerRegistration addFilterValueChangeHandler(FilterValueChangeHandler<T, C> handler);
|
||||
HandlerRegistration addFilterValueChangeHandler(FilterValueChangeHandler<T> handler);
|
||||
|
||||
Filter<T> getFilter();
|
||||
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ import com.sap.sse.gwt.dispatch.shared.commands.ListResult;
|
||||
|
||||
public abstract class RegattaCompetitionPresenter
|
||||
implements RefreshableWidget<ListResult<RaceCompetitionFormatSeriesDTO>>,
|
||||
FilterValueProvider<SimpleCompetitorDTO>, FilterValueChangeHandler<SimpleRaceMetadataDTO, SimpleCompetitorDTO> {
|
||||
FilterValueProvider<SimpleCompetitorDTO>, FilterValueChangeHandler<SimpleRaceMetadataDTO> {
|
||||
|
||||
private final RegattaCompetitionView view;
|
||||
private Filter<SimpleRaceMetadataDTO> latestRacesByCompetitorFilter;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ import com.sap.sse.common.filter.Filter;
|
||||
import com.sap.sse.gwt.dispatch.shared.commands.DTO;
|
||||
|
||||
public class RegattaListPresenter<D extends DTO>
|
||||
implements FilterValueProvider<String>, FilterValueChangeHandler<RegattaMetadataDTO, String> {
|
||||
implements FilterValueProvider<String>, FilterValueChangeHandler<RegattaMetadataDTO> {
|
||||
|
||||
private final RegattaListView view;
|
||||
private final Map<RegattaListItem, RegattaMetadataDTO> stucture = new HashMap<>();
|
||||
|
||||
Reference in new issue
Block a user