From c5c4bb62243c375eed42b612e2edbb350198cd35 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Wed, 17 Jun 2015 17:21:01 +0200 Subject: [PATCH 1/2] Event overview mobile - Fixed NPE if no boot class icnon could by found --- .../regattaStatus/RegattaStatusRegatta.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRegatta.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRegatta.java index 0c6e41ab2e1..54b17d4ee81 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRegatta.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRegatta.java @@ -47,9 +47,7 @@ public class RegattaStatusRegatta extends Composite implements IsMobileSection { } private void initRegattaHeader(RegattaMetadataDTO regatta, final PlaceNavigation placeNavigation) { - ImageResource image = regatta.getBoatClass() == null ? BoatClassImageResources.INSTANCE.genericBoatClass() : - BoatClassImageResolver.getBoatClassIconResource(regatta.getBoatClass()); - headerUi.setImageUrl(image.getSafeUri().asString()); + headerUi.setImageUrl(getBootClassIcon(regatta.getBoatClass()).getSafeUri().asString()); headerUi.setSectionTitle(regatta.getDisplayName()); headerUi.setClickAction(new Command() { @Override @@ -58,5 +56,15 @@ public class RegattaStatusRegatta extends Composite implements IsMobileSection { } }); } + + private ImageResource getBootClassIcon(String bootClass) { + if (bootClass != null) { + ImageResource image = BoatClassImageResolver.getBoatClassIconResource(bootClass); + if (image != null) { + return image; + } + } + return BoatClassImageResources.INSTANCE.genericBoatClass(); + } } From 849509ab8373054340e9ebbb7ad08d5cb4fd7828 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Wed, 17 Jun 2015 17:21:43 +0200 Subject: [PATCH 2/2] Event overview mobile - Hide Impressions section if no media is available --- .../mobile/places/event/EventActivity.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 b4c7b025946..a13cef32969 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 @@ -71,17 +71,19 @@ public class EventActivity extends AbstractActivity implements Presenter { view.setSailorInfos(StringMessages.INSTANCE.sailorInfoLongText(), StringMessages.INSTANCE.sailorInfo(), sailorInfoUrl); } view.setQuickFinderValues(place.getCtx().getEventDTO().getRegattas()); - clientFactory.getHomeService().getMediaForEvent(currentEventUUId, new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - GWT.log("Failed to load media"); - } + if (getCtx().getEventDTO().isHasMedia()) { + clientFactory.getHomeService().getMediaForEvent(currentEventUUId, new AsyncCallback() { + @Override + public void onFailure(Throwable caught) { + GWT.log("Failed to load media"); + } - @Override - public void onSuccess(MediaDTO result) { - view.setMediaForImpressions(result.getPhotos().size(), result.getVideos().size(), result.getPhotos()); - } - }); + @Override + public void onSuccess(MediaDTO result) { + view.setMediaForImpressions(result.getPhotos().size(), result.getVideos().size(), result.getPhotos()); + } + }); + } } @Override