diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardView.java index 471b7f7d6c8..036f474aaa0 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardView.java @@ -1,32 +1,11 @@ package com.sap.sailing.gwt.home.mobile.places.minileaderboard; -import java.util.Collection; +import com.sap.sailing.gwt.home.mobile.places.event.EventViewBase; -import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.home.client.place.event.EventContext; -import com.sap.sailing.gwt.home.mobile.places.RegattaLeaderboardNavigationProvider; -import com.sap.sailing.gwt.home.mobile.places.SeriesLeaderboardNavigationProvider; -import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; -import com.sap.sailing.gwt.home.shared.dispatch.DispatchSystem; -import com.sap.sailing.gwt.ui.shared.eventview.RegattaMetadataDTO; -import com.sap.sailing.gwt.ui.shared.general.EventReferenceDTO; +public interface MiniLeaderboardView extends EventViewBase { -public interface MiniLeaderboardView { - - public interface Presenter extends RegattaLeaderboardNavigationProvider, SeriesLeaderboardNavigationProvider { + public interface Presenter extends EventViewBase.Presenter { - PlaceNavigation getEventNavigation(); - - DispatchSystem getDispatch(); - - EventContext getCtx(); } - Widget asWidget(); - - void setQuickFinderValues(Collection regattas); - - void setQuickFinderValues(String seriesName, Collection eventsOfSeries); - - void hideQuickfinder(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardViewImpl.java index 8ae35319879..8b3bced1398 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardViewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardViewImpl.java @@ -1,68 +1,22 @@ package com.sap.sailing.gwt.home.mobile.places.minileaderboard; -import java.util.Collection; -import java.util.UUID; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.home.client.place.event.EventContext; -import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.reload.RefreshManager; -import com.sap.sailing.gwt.home.mobile.partials.eventheader.EventHeader; import com.sap.sailing.gwt.home.mobile.partials.minileaderboard.MinileaderboardBox; -import com.sap.sailing.gwt.home.mobile.partials.quickfinder.Quickfinder; -import com.sap.sailing.gwt.home.mobile.places.QuickfinderPresenter; +import com.sap.sailing.gwt.home.mobile.places.event.AbstractEventView; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.shared.dispatch.event.GetMiniLeaderbordAction; import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventType; -import com.sap.sailing.gwt.ui.shared.eventview.RegattaMetadataDTO; -import com.sap.sailing.gwt.ui.shared.general.EventReferenceDTO; -public class MiniLeaderboardViewImpl extends Composite implements MiniLeaderboardView { +public class MiniLeaderboardViewImpl extends AbstractEventView implements MiniLeaderboardView { + private static final StringMessages MSG = StringMessages.INSTANCE; - private static MyBinder uiBinder = GWT.create(MyBinder.class); - - interface MyBinder extends UiBinder { - } - - private Presenter currentPresenter; - @UiField(provided = true) - EventHeader eventHeaderUi; - @UiField(provided = true) - MinileaderboardBox minileaderboardUi; - @UiField - Quickfinder quickFinderUi; - - public MiniLeaderboardViewImpl(Presenter presenter) { - this.currentPresenter = presenter; - String regattaDisplayName = null; - if(presenter.getCtx().getEventDTO().getType() == EventType.MULTI_REGATTA) { - regattaDisplayName = presenter.getCtx().getRegatta().getDisplayName(); - } - minileaderboardUi = new MinileaderboardBox(false); - eventHeaderUi = new EventHeader(presenter.getCtx().getEventDTO(), regattaDisplayName, presenter.getEventNavigation()); - initWidget(uiBinder.createAndBindUi(this)); - RefreshManager refreshManager = new RefreshManager(this, currentPresenter.getDispatch()); - EventContext ctx = presenter.getCtx(); - UUID uuid = UUID.fromString(ctx.getEventId()); - refreshManager.add(minileaderboardUi, new GetMiniLeaderbordAction(uuid, presenter.getCtx().getRegattaId())); - minileaderboardUi.setAction(MSG.details(), presenter.getRegattaLeaderboardNavigation(presenter.getCtx().getRegattaId())); - } - - @Override - public void setQuickFinderValues(Collection regattaMetadatas) { - QuickfinderPresenter.getForRegattaLeaderboards(quickFinderUi, currentPresenter, regattaMetadatas); - } - @Override - public void setQuickFinderValues(String seriesName, Collection eventsOfSeries) { - QuickfinderPresenter.getForSeriesLeaderboards(quickFinderUi, seriesName, currentPresenter, eventsOfSeries); - } - - @Override - public void hideQuickfinder() { - quickFinderUi.removeFromParent(); + private final MinileaderboardBox minileaderboard; + + public MiniLeaderboardViewImpl(MiniLeaderboardView.Presenter presenter) { + super(presenter, presenter.getCtx().getEventDTO().getType() == EventType.MULTI_REGATTA, true); + setViewContent(minileaderboard = new MinileaderboardBox(false)); + refreshManager.add(minileaderboard, new GetMiniLeaderbordAction(getEventId(), getRegattaId())); + minileaderboard.setAction(MSG.details(), presenter.getRegattaLeaderboardNavigation(getRegattaId())); } + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardViewImpl.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardViewImpl.ui.xml deleted file mode 100644 index 9bf99f4f8da..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/minileaderboard/MiniLeaderboardViewImpl.ui.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - .headerWrapper { - background-color: #f2f2f2; - padding-bottom: 10px; - } - - -
- - - - -
- -
-