From dec1006a19afbbcefefca0b84f3a4054e676ec16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 9 Apr 2018 17:30:32 +0200 Subject: [PATCH] smaller code style improvements --- .../tracking/impl/BravoFixTrackImpl.java | 1 - ...RaceLeaderboardWithZoomingPerspective.java | 6 +- .../ui/leaderboard/LeaderboardEntryPoint.java | 163 +++++++++--------- 3 files changed, 86 insertions(+), 84 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java index cea5997ba1e..a1391b2cb99 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java @@ -75,7 +75,6 @@ public class BravoFixTrackImpl extends S */ private transient GPSFixTrack gpsTrack; - private class CacheInvalidationGpsTrackListener implements GPSTrackListener { private static final long serialVersionUID = 6395529765232404414L; @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/leaderboard/MultiRaceLeaderboardWithZoomingPerspective.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/leaderboard/MultiRaceLeaderboardWithZoomingPerspective.java index 4af1f4a9482..f309993111a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/leaderboard/MultiRaceLeaderboardWithZoomingPerspective.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/leaderboard/MultiRaceLeaderboardWithZoomingPerspective.java @@ -1,7 +1,5 @@ package com.sap.sailing.gwt.autoplay.client.shared.leaderboard; -import java.util.Collection; - import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.RepeatingCommand; import com.google.gwt.dom.client.Style.FontWeight; @@ -56,7 +54,7 @@ public class MultiRaceLeaderboardWithZoomingPerspective extends AbstractPerspect SailingServiceAsync sailingService, UserService userService, AsyncActionsExecutor asyncActionsExecutor, CompetitorSelectionProvider competitorSelectionProvider, Timer timer, String leaderboardName, final ErrorReporter errorReporter, final StringMessages stringMessages, - boolean startInFullScreenMode, Collection availableDetailTypes) { + boolean startInFullScreenMode, Iterable availableDetailTypes) { super(parent, componentContext, lifecycle, settings); this.stringMessages = stringMessages; Window.addResizeHandler(new ResizeHandler() { @@ -186,7 +184,7 @@ public class MultiRaceLeaderboardWithZoomingPerspective extends AbstractPerspect PerspectiveCompositeSettings settings, SailingServiceAsync sailingService, AsyncActionsExecutor asyncActionsExecutor, CompetitorSelectionProvider competitorSelectionProvider, Timer timer, - String leaderboardName, final ErrorReporter errorReporter, final StringMessages stringMessages, Collection availableDetailTypes) { + String leaderboardName, final ErrorReporter errorReporter, final StringMessages stringMessages, Iterable availableDetailTypes) { MultiRaceLeaderboardPanelLifecycle leaderboardPanelLifecycle = getPerspectiveLifecycle().getLeaderboardPanelLifecycle(); MultiRaceLeaderboardSettings leaderboardSettings = settings .findSettingsByComponentId(leaderboardPanelLifecycle.getComponentId()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java index aa258dcf211..6ed205f16b9 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java @@ -44,7 +44,7 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint { public static final long DEFAULT_REFRESH_INTERVAL_MILLIS = 3000l; private static final Logger logger = Logger.getLogger(LeaderboardEntryPoint.class.getName()); - + private StringMessages stringmessages = StringMessages.INSTANCE; private String leaderboardName; private String leaderboardGroupName; @@ -123,90 +123,95 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint { final StoredSettingsLocation storageDefinition = StoredSettingsLocationFactory .createStoredSettingsLocatorForLeaderboard(leaderboardContextDefinition); - sailingService.getAvailableDetailTypesForLeaderboard(leaderboardName, new AsyncCallback>() { + sailingService.getAvailableDetailTypesForLeaderboard(leaderboardName, + new AsyncCallback>() { + @Override + public void onFailure(Throwable caught) { + logger.log(Level.SEVERE, "Could not load detailtypes", caught); + } - @Override - public void onFailure(Throwable caught) { - logger.log(Level.SEVERE, "Could not load detailtypes", caught); - } + @Override + public void onSuccess(Iterable result) { + if (leaderboardDTO.type.isMetaLeaderboard()) { + // overall + MetaLeaderboardPerspectiveLifecycle rootComponentLifeCycle = new MetaLeaderboardPerspectiveLifecycle( + stringmessages, leaderboardDTO, result); + ComponentContext> context = new ComponentContextWithSettingsStorage<>( + rootComponentLifeCycle, getUserService(), storageDefinition); + context.getInitialSettings( + new OnSettingsLoadedCallback>() { + @Override + public void onSuccess( + PerspectiveCompositeSettings defaultSettings) { + configureWithSettings(defaultSettings, timer); - @Override - public void onSuccess(Iterable result) { + final MetaLeaderboardViewer leaderboardViewer = new MetaLeaderboardViewer( + null, context, rootComponentLifeCycle, defaultSettings, + sailingService, new AsyncActionsExecutor(), timer, null, + leaderboardGroupName, leaderboardName, LeaderboardEntryPoint.this, + getStringMessages(), getActualChartDetailType(defaultSettings), + result); + createUi(leaderboardViewer, defaultSettings, timer, + leaderboardContextDefinition); + } - if (leaderboardDTO.type.isMetaLeaderboard()) { - // overall + @Override + public void onError(Throwable caught, + PerspectiveCompositeSettings fallbackDefaultSettings) { + logger.log(Level.WARNING, + "Could not load initialsettings, useing default settings as fallback", + caught); + onSuccess(fallbackDefaultSettings); + } + }); + } else { + LeaderboardPerspectiveLifecycle rootComponentLifeCycle = new LeaderboardPerspectiveLifecycle( + StringMessages.INSTANCE, leaderboardDTO, result); + ComponentContext> context = new ComponentContextWithSettingsStorage<>( + rootComponentLifeCycle, getUserService(), storageDefinition); + context.getInitialSettings( + new OnSettingsLoadedCallback>() { + @Override + public void onSuccess( + PerspectiveCompositeSettings defaultSettings) { + sailingService.getAvailableDetailTypesForLeaderboard(leaderboardName, + new AsyncCallback>() { - MetaLeaderboardPerspectiveLifecycle rootComponentLifeCycle = new MetaLeaderboardPerspectiveLifecycle( - stringmessages, leaderboardDTO, result); - ComponentContext> context = new ComponentContextWithSettingsStorage<>( - rootComponentLifeCycle, getUserService(), storageDefinition); - context.getInitialSettings( - new OnSettingsLoadedCallback>() { - @Override - public void onSuccess( - PerspectiveCompositeSettings defaultSettings) { - configureWithSettings(defaultSettings, timer); + @Override + public void onFailure(Throwable caught) { + logger.log(Level.SEVERE, + "Could not load available detail types", + caught); + } - final MetaLeaderboardViewer leaderboardViewer = new MetaLeaderboardViewer(null, - context, rootComponentLifeCycle, defaultSettings, sailingService, - new AsyncActionsExecutor(), timer, null, leaderboardGroupName, - leaderboardName, LeaderboardEntryPoint.this, getStringMessages(), - getActualChartDetailType(defaultSettings), result); - createUi(leaderboardViewer, defaultSettings, timer, leaderboardContextDefinition); - } + @Override + public void onSuccess(Iterable result) { + configureWithSettings(defaultSettings, timer); + final MultiRaceLeaderboardViewer leaderboardViewer = new MultiRaceLeaderboardViewer( + null, context, rootComponentLifeCycle, + defaultSettings, sailingService, + new AsyncActionsExecutor(), timer, + leaderboardGroupName, leaderboardName, + LeaderboardEntryPoint.this, getStringMessages(), + getActualChartDetailType(defaultSettings), result); + createUi(leaderboardViewer, defaultSettings, timer, + leaderboardContextDefinition); + } + }); + } - @Override - public void onError(Throwable caught, - PerspectiveCompositeSettings fallbackDefaultSettings) { - // TODO - onSuccess(fallbackDefaultSettings); - } - }); - } else { - - LeaderboardPerspectiveLifecycle rootComponentLifeCycle = new LeaderboardPerspectiveLifecycle( - StringMessages.INSTANCE, leaderboardDTO, result); - ComponentContext> context = new ComponentContextWithSettingsStorage<>( - rootComponentLifeCycle, getUserService(), storageDefinition); - context.getInitialSettings( - new OnSettingsLoadedCallback>() { - @Override - public void onSuccess( - PerspectiveCompositeSettings defaultSettings) { - sailingService.getAvailableDetailTypesForLeaderboard(leaderboardName, - new AsyncCallback>() { - - @Override - public void onFailure(Throwable caught) { - caught.printStackTrace(); - } - - @Override - public void onSuccess(Iterable result) { - configureWithSettings(defaultSettings, timer); - final MultiRaceLeaderboardViewer leaderboardViewer = new MultiRaceLeaderboardViewer( - null, context, rootComponentLifeCycle, defaultSettings, - sailingService, new AsyncActionsExecutor(), timer, - leaderboardGroupName, leaderboardName, - LeaderboardEntryPoint.this, getStringMessages(), - getActualChartDetailType(defaultSettings), result); - createUi(leaderboardViewer, defaultSettings, timer, - leaderboardContextDefinition); - } - }); - - } - - @Override - public void onError(Throwable caught, - PerspectiveCompositeSettings fallbackDefaultSettings) { - // TODO - onSuccess(fallbackDefaultSettings); - } - }); - } - } - }); + @Override + public void onError(Throwable caught, + PerspectiveCompositeSettings fallbackDefaultSettings) { + logger.log(Level.WARNING, + "Could not load initialsettings, useing default settings as fallback", + caught); + onSuccess(fallbackDefaultSettings); + } + }); + } + } + }); } private DetailType getActualChartDetailType(