mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-08 20:12:23 +00:00
smaller code style improvements
This commit is contained in:
1 parent
8a9137e600
commit
dec1006a19
3 files changed
+86
-84
No files matched your search
-1
@@ -75,7 +75,6 @@ public class BravoFixTrackImpl<ItemType extends WithID & Serializable> extends S
|
||||
*/
|
||||
private transient GPSFixTrack<ItemType, GPSFixMoving> gpsTrack;
|
||||
|
||||
|
||||
private class CacheInvalidationGpsTrackListener implements GPSTrackListener<ItemType, GPSFixMoving> {
|
||||
private static final long serialVersionUID = 6395529765232404414L;
|
||||
@Override
|
||||
|
||||
+2
-4
@@ -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<DetailType> availableDetailTypes) {
|
||||
boolean startInFullScreenMode, Iterable<DetailType> availableDetailTypes) {
|
||||
super(parent, componentContext, lifecycle, settings);
|
||||
this.stringMessages = stringMessages;
|
||||
Window.addResizeHandler(new ResizeHandler() {
|
||||
@@ -186,7 +184,7 @@ public class MultiRaceLeaderboardWithZoomingPerspective extends AbstractPerspect
|
||||
PerspectiveCompositeSettings<LeaderboardWithZoomingPerspectiveSettings> settings,
|
||||
SailingServiceAsync sailingService, AsyncActionsExecutor asyncActionsExecutor,
|
||||
CompetitorSelectionProvider competitorSelectionProvider, Timer timer,
|
||||
String leaderboardName, final ErrorReporter errorReporter, final StringMessages stringMessages, Collection<DetailType> availableDetailTypes) {
|
||||
String leaderboardName, final ErrorReporter errorReporter, final StringMessages stringMessages, Iterable<DetailType> availableDetailTypes) {
|
||||
MultiRaceLeaderboardPanelLifecycle leaderboardPanelLifecycle = getPerspectiveLifecycle().getLeaderboardPanelLifecycle();
|
||||
MultiRaceLeaderboardSettings leaderboardSettings = settings
|
||||
.findSettingsByComponentId(leaderboardPanelLifecycle.getComponentId());
|
||||
|
||||
+84
-79
@@ -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<Iterable<DetailType>>() {
|
||||
sailingService.getAvailableDetailTypesForLeaderboard(leaderboardName,
|
||||
new AsyncCallback<Iterable<DetailType>>() {
|
||||
@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<DetailType> result) {
|
||||
if (leaderboardDTO.type.isMetaLeaderboard()) {
|
||||
// overall
|
||||
MetaLeaderboardPerspectiveLifecycle rootComponentLifeCycle = new MetaLeaderboardPerspectiveLifecycle(
|
||||
stringmessages, leaderboardDTO, result);
|
||||
ComponentContext<PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>> context = new ComponentContextWithSettingsStorage<>(
|
||||
rootComponentLifeCycle, getUserService(), storageDefinition);
|
||||
context.getInitialSettings(
|
||||
new OnSettingsLoadedCallback<PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>>() {
|
||||
@Override
|
||||
public void onSuccess(
|
||||
PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings> defaultSettings) {
|
||||
configureWithSettings(defaultSettings, timer);
|
||||
|
||||
@Override
|
||||
public void onSuccess(Iterable<DetailType> 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<LeaderboardPerspectiveOwnSettings> 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<PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>> context = new ComponentContextWithSettingsStorage<>(
|
||||
rootComponentLifeCycle, getUserService(), storageDefinition);
|
||||
context.getInitialSettings(
|
||||
new OnSettingsLoadedCallback<PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>>() {
|
||||
@Override
|
||||
public void onSuccess(
|
||||
PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings> defaultSettings) {
|
||||
sailingService.getAvailableDetailTypesForLeaderboard(leaderboardName,
|
||||
new AsyncCallback<Iterable<DetailType>>() {
|
||||
|
||||
MetaLeaderboardPerspectiveLifecycle rootComponentLifeCycle = new MetaLeaderboardPerspectiveLifecycle(
|
||||
stringmessages, leaderboardDTO, result);
|
||||
ComponentContext<PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>> context = new ComponentContextWithSettingsStorage<>(
|
||||
rootComponentLifeCycle, getUserService(), storageDefinition);
|
||||
context.getInitialSettings(
|
||||
new OnSettingsLoadedCallback<PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>>() {
|
||||
@Override
|
||||
public void onSuccess(
|
||||
PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings> 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<DetailType> 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<LeaderboardPerspectiveOwnSettings> fallbackDefaultSettings) {
|
||||
// TODO
|
||||
onSuccess(fallbackDefaultSettings);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
|
||||
LeaderboardPerspectiveLifecycle rootComponentLifeCycle = new LeaderboardPerspectiveLifecycle(
|
||||
StringMessages.INSTANCE, leaderboardDTO, result);
|
||||
ComponentContext<PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>> context = new ComponentContextWithSettingsStorage<>(
|
||||
rootComponentLifeCycle, getUserService(), storageDefinition);
|
||||
context.getInitialSettings(
|
||||
new OnSettingsLoadedCallback<PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>>() {
|
||||
@Override
|
||||
public void onSuccess(
|
||||
PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings> defaultSettings) {
|
||||
sailingService.getAvailableDetailTypesForLeaderboard(leaderboardName,
|
||||
new AsyncCallback<Iterable<DetailType>>() {
|
||||
|
||||
@Override
|
||||
public void onFailure(Throwable caught) {
|
||||
caught.printStackTrace();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSuccess(Iterable<DetailType> 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<LeaderboardPerspectiveOwnSettings> fallbackDefaultSettings) {
|
||||
// TODO
|
||||
onSuccess(fallbackDefaultSettings);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
@Override
|
||||
public void onError(Throwable caught,
|
||||
PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings> fallbackDefaultSettings) {
|
||||
logger.log(Level.WARNING,
|
||||
"Could not load initialsettings, useing default settings as fallback",
|
||||
caught);
|
||||
onSuccess(fallbackDefaultSettings);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private DetailType getActualChartDetailType(
|
||||
|
||||
Reference in new issue
Block a user