diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceImpl.java index 550ed2649cd..b4b4dc9d823 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceImpl.java @@ -85,7 +85,7 @@ public class HomeServiceImpl extends ProxiedRemoteServiceServlet implements Home StageEventType stageType = pair.getA(); EventHolder holder = pair.getB(); - result.addStageEvent(HomeServiceUtil.convertToEventStageDTO(holder.event, holder.baseURL, holder.onRemoteServer, stageType, getService(), false)); + result.addStageEvent(HomeServiceUtil.convertToEventStageDTO(holder.event, holder.baseURL, holder.onRemoteServer, stageType, getService())); EventReferenceDTO eventRef = new EventReferenceDTO(holder.event); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceUtil.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceUtil.java index c243cbf921e..8497527c144 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceUtil.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceUtil.java @@ -9,9 +9,9 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Locale; +import java.util.Map.Entry; import java.util.Random; import java.util.UUID; -import java.util.Map.Entry; import javax.servlet.http.HttpServletRequest; @@ -346,13 +346,13 @@ public final class HomeServiceUtil { return LocaleMatch.NO_MATCH; } - public static EventStageDTO convertToEventStageDTO(EventBase event, URL baseURL, boolean onRemoteServer, StageEventType stageType, RacingEventService service, boolean useTeaserImage) { + public static EventStageDTO convertToEventStageDTO(EventBase event, URL baseURL, boolean onRemoteServer, StageEventType stageType, RacingEventService service) { EventStageDTO dto = new EventStageDTO(); mapToMetadataDTO(event, dto, service); dto.setBaseURL(baseURL.toString()); dto.setOnRemoteServer(onRemoteServer); dto.setStageType(stageType); - dto.setStageImageURL(useTeaserImage ? findEventThumbnailImageUrlAsString(event) : getStageImageURLAsString(event)); + dto.setStageImageURL(getStageImageURLAsString(event)); return dto; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/start/GetStagedEventsAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/start/GetStagedEventsAction.java index 0f69c06dbef..a6b1c4a5cfa 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/start/GetStagedEventsAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/start/GetStagedEventsAction.java @@ -16,33 +16,20 @@ import com.sap.sse.common.Util.Pair; public class GetStagedEventsAction implements Action> { - private boolean useTeaserImage; - - protected GetStagedEventsAction() { - } - - public GetStagedEventsAction(boolean useTeaserImage) { - this.useTeaserImage = useTeaserImage; - } - @GwtIncompatible public ListResult execute(final DispatchContext context) throws MalformedURLException { EventStageCandidateCalculator stageCandidateCalculator = new EventStageCandidateCalculator(); - HomeServiceUtil.forAllPublicEvents(context.getRacingEventService(), context.getRequest(), stageCandidateCalculator); - ListResult result = new ListResult<>(); - int count = 0; for(Pair pair : stageCandidateCalculator.getFeaturedEvents()) { count++; if(count > HomeServiceImpl.MAX_STAGE_EVENTS) { break; } - StageEventType stageType = pair.getA(); EventHolder holder = pair.getB(); - result.addValue(HomeServiceUtil.convertToEventStageDTO(holder.event, holder.baseURL, holder.onRemoteServer, stageType, context.getRacingEventService(), useTeaserImage)); + result.addValue(HomeServiceUtil.convertToEventStageDTO(holder.event, holder.baseURL, holder.onRemoteServer, stageType, context.getRacingEventService())); } return result; }