diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/NewsItemLinkProvider.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/NewsItemLinkProvider.java index cbbc8c94e9c..aeb860dc8a1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/NewsItemLinkProvider.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/NewsItemLinkProvider.java @@ -6,7 +6,7 @@ import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.ui.shared.dispatch.news.NewsEntryDTO; public interface NewsItemLinkProvider { - PlaceNavigation getPlaceNavigation(NewsEntryDTO newsEntry); - void gotoNewsPlace(List values); + + PlaceNavigation getNewsEntryPlaceNavigation(NewsEntryDTO newsEntry); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.java index c0be91a4190..4616187eaba 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/updatesBox/UpdatesBoxItem.java @@ -56,7 +56,7 @@ public class UpdatesBoxItem extends Widget { link.setHref(directLink); link.setTarget("_blank"); } else { - final PlaceNavigation placeNavigation = provider.getPlaceNavigation(entry); + final PlaceNavigation placeNavigation = provider.getNewsEntryPlaceNavigation(entry); if(placeNavigation != null) { placeNavigation.configureAnchorElement(link); } else { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivity.java index 608cc418b4c..290e8775f21 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivity.java @@ -21,7 +21,6 @@ import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.dispatch.DispatchSystem; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.shared.dispatch.event.GetEventViewAction; -import com.sap.sailing.gwt.ui.shared.dispatch.news.AbstractRaceNewsEntryDTO; import com.sap.sailing.gwt.ui.shared.dispatch.news.LeaderboardNewsEntryDTO; import com.sap.sailing.gwt.ui.shared.dispatch.news.NewsEntryDTO; import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO; @@ -95,11 +94,7 @@ public class EventActivity extends AbstractActivity implements Presenter { return clientFactory.getDispatch(); } - @Override - public PlaceNavigation getRegattaLeaderboardNavigation(String leaderboardName) { - EventContext ctx = new EventContext(getCtx()).withRegattaId(leaderboardName).withRegattaAnalyticsManager(null); - return clientFactory.getNavigator().getEventNavigation(new RegattaLeaderboardPlace(ctx), null, false); - } + @Override public PlaceNavigation getMediaPageNavigation() { @@ -111,26 +106,29 @@ public class EventActivity extends AbstractActivity implements Presenter { } @Override - public String getRaceViewerURL(String regattaName, String trackedRaceName) { - // TODO Auto-generated method stub - return null; - } - - - @Override - public PlaceNavigation getPlaceNavigation(NewsEntryDTO entry) { + public PlaceNavigation getNewsEntryPlaceNavigation(NewsEntryDTO entry) { if(entry instanceof LeaderboardNewsEntryDTO) { final LeaderboardNewsEntryDTO dto = (LeaderboardNewsEntryDTO) entry; return getRegattaLeaderboardNavigation(dto.getLeaderboardName()); - } else if(entry instanceof AbstractRaceNewsEntryDTO) { - // TODO } return null; } + @Override + public String getRaceViewerURL(String regattaName, String trackedRaceName) { + return null; + } + + @Override + public PlaceNavigation getRegattaLeaderboardNavigation(String leaderboardName) { + EventContext ctx = new EventContext(getCtx()).withRegattaId(leaderboardName).withRegattaAnalyticsManager(null); + return clientFactory.getNavigator().getEventNavigation(new RegattaLeaderboardPlace(ctx), null, false); + } + @Override public void gotoNewsPlace(List values) { clientFactory.getPlaceController().goTo(new LatestNewsPlace(place.getCtx(), values)); } + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/latestnews/LatestNewsActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/latestnews/LatestNewsActivity.java index 1382b0bcc02..74bb409a86b 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/latestnews/LatestNewsActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/latestnews/LatestNewsActivity.java @@ -14,7 +14,6 @@ import com.sap.sailing.gwt.home.mobile.partials.updatesBox.NewsItemLinkProvider; import com.sap.sailing.gwt.home.mobile.places.latestnews.LatestNewsView.Presenter; 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.dispatch.news.AbstractRaceNewsEntryDTO; import com.sap.sailing.gwt.ui.shared.dispatch.news.LeaderboardNewsEntryDTO; import com.sap.sailing.gwt.ui.shared.dispatch.news.NewsEntryDTO; @@ -44,15 +43,14 @@ public class LatestNewsActivity extends AbstractActivity implements Presenter, N } @Override - public PlaceNavigation getPlaceNavigation(NewsEntryDTO entry) { + public PlaceNavigation getNewsEntryPlaceNavigation(NewsEntryDTO entry) { MobilePlacesNavigator navigator = clientFactory.getNavigator(); if (entry instanceof LeaderboardNewsEntryDTO) { final LeaderboardNewsEntryDTO dto = (LeaderboardNewsEntryDTO) entry; final String regattaId = dto.getLeaderboardName(); navigator.getEventNavigation(new RegattaLeaderboardPlace(new EventContext().withRegattaId(regattaId)), null, false); - } else if (entry instanceof AbstractRaceNewsEntryDTO) { - // TODO + } return null; }