eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-25 06:58:39 +00:00
Code Activity

Bug 4199: Code formatting

Browse Source
This commit is contained in:
Steffen Schaefer
2017-07-17 14:35:47 +02:00
parent e8b5f43d37
commit 5f3c50dc27
12 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/startanalysis/card/StartAnalysisCard.java
+1 -1
View File
@@ -167,7 +167,7 @@ public class StartAnalysisCard extends Composite implements HasWidgets, StartAna
defaultRaceMapSettings.isShowSelectedCompetitorsInfo(), defaultRaceMapSettings.isShowWindStreamletColors(),
defaultRaceMapSettings.isShowWindStreamletOverlay(), defaultRaceMapSettings.isShowSimulationOverlay(),
defaultRaceMapSettings.isShowMapControls(), defaultRaceMapSettings.getManeuverTypesToShow(),
defaultRaceMapSettings.isShowDouglasPeuckerPoints(),defaultRaceMapSettings.isShowTargetEstimation());
defaultRaceMapSettings.isShowDouglasPeuckerPoints(), defaultRaceMapSettings.isShowTargetEstimation());
RaceTimesInfoProvider raceTimesInfoProvider = new RaceTimesInfoProvider(sailingServiceAsync,
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
+2 -1
View File
@@ -168,7 +168,8 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS
CompactRaceMapDataDTO getRaceMapData(RegattaAndRaceIdentifier raceIdentifier, Date date, Map<String, Date> fromPerCompetitorIdAsString,
Map<String, Date> toPerCompetitorIdAsString, boolean extrapolate, LegIdentifier simulationLegIdentifier,
byte[] md5OfIdsAsStringOfCompetitorParticipatingInRaceInAlphanumericOrderOfTheirID,Date time,boolean targetEstimationRequired) throws NoWindException;
byte[] md5OfIdsAsStringOfCompetitorParticipatingInRaceInAlphanumericOrderOfTheirID, Date time,
boolean targetEstimationRequired) throws NoWindException;
CompactBoatPositionsDTO getBoatPositions(RegattaAndRaceIdentifier raceIdentifier,
Map<String, Date> fromPerCompetitorIdAsString, Map<String, Date> toPerCompetitorIdAsString,
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
+1 -1
View File
@@ -387,7 +387,7 @@ public interface SailingServiceAsync extends ServerInfoRetriever, FileStorageMan
void getRaceMapData(RegattaAndRaceIdentifier raceIdentifier, Date date,
Map<String, Date> fromPerCompetitorIdAsString, Map<String, Date> toPerCompetitorIdAsString,
boolean extrapolate, LegIdentifier simulationLegIdentifier,
byte[] md5OfIdsAsStringOfCompetitorParticipatingInRaceInAlphanumericOrderOfTheirID,Date time,
byte[] md5OfIdsAsStringOfCompetitorParticipatingInRaceInAlphanumericOrderOfTheirID, Date time,
boolean targetEstimationRequired, AsyncCallback<CompactRaceMapDataDTO> callback);
void getBoatPositions(RegattaAndRaceIdentifier raceIdentifier, Map<String, Date> fromPerCompetitorIdAsString,
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CombinedWindPanel.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class CombinedWindPanel extends FlowPanel {
oldRaceMapSettings.isShowSelectedCompetitorsInfo(), oldRaceMapSettings.isShowWindStreamletColors(),
newShowStreamletsOverlaySetting, oldRaceMapSettings.isShowSimulationOverlay(),
oldRaceMapSettings.isShowMapControls(), oldRaceMapSettings.getManeuverTypesToShow(),
oldRaceMapSettings.isShowDouglasPeuckerPoints(),oldRaceMapSettings.isShowTargetEstimation());
oldRaceMapSettings.isShowDouglasPeuckerPoints(), oldRaceMapSettings.isShowTargetEstimation());
map.updateSettings(newRaceMapSettings);
}
});
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.css
+7 -7
View File
@@ -36,13 +36,13 @@ body {
margin-top: 10px;
}
.estimatedTargettime{
font-size: 19px;
color:black;
background-color:rgba(255,255,255,0.75);
border:1px solid #c9caca;
border-radius:4px;
text-align: left;
.estimatedTargettime {
font-size: 19px;
color:black;
background-color:rgba(255,255,255,0.75);
border:1px solid #c9caca;
border-radius:4px;
text-align: left;
height:30px;
padding-right: 8px;
padding-left: 8px;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
+3 -3
View File
@@ -952,7 +952,7 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
asyncActionsExecutor.execute(new GetRaceMapDataAction(sailingService, competitorsByIdAsString,
race, useNullAsTimePoint() ? null : newTime, fromTimesForQuickCall, toTimesForQuickCall, /* extrapolate */true,
(settings.isShowSimulationOverlay() ? simulationOverlay.getLegIdentifier() : null),
raceCompetitorSet.getMd5OfIdsAsStringOfCompetitorParticipatingInRaceInAlphanumericOrderOfTheirID(),newTime,settings.isShowTargetEstimation()),
raceCompetitorSet.getMd5OfIdsAsStringOfCompetitorParticipatingInRaceInAlphanumericOrderOfTheirID(), newTime, settings.isShowTargetEstimation()),
GET_RACE_MAP_DATA_CATEGORY,
getRaceMapDataCallback(newTime, transitionTimeInMillis, fromAndToAndOverlap.getC(), competitorsToShow, ++boatPositionRequestIDCounter));
// next, if necessary, do the full thing; the two calls have different action classes, so throttling should not drop one for the other
@@ -2609,7 +2609,7 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
if (!newSettings.getHelpLinesSettings().equals(settings.getHelpLinesSettings())) {
requiresRedraw = true;
}
if(!newSettings.isShowTargetEstimation() && targetEstimationOverlay != null){
if (!newSettings.isShowTargetEstimation() && targetEstimationOverlay != null){
targetEstimationOverlay.removeFromParent();
}
if (newSettings.isShowWindStreamletOverlay() != settings.isShowWindStreamletOverlay()) {
@@ -2625,7 +2625,7 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
requiresUpdateCoordinateSystem = true;
requiresRedraw = true;
}
if(!newSettings.isShowTargetEstimation() && targetEstimationOverlay != null){
if (!newSettings.isShowTargetEstimation() && targetEstimationOverlay != null){
targetEstimationOverlay.removeFromParent();
}
this.settings = newSettings;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapLifecycle.java
+14 -2
View File
@@ -47,12 +47,24 @@ public class RaceMapLifecycle implements ComponentLifecycle<RaceMapSettings> {
@Override
public RaceMapSettings extractUserSettings(RaceMapSettings settings) {
RaceMapSettings defaultSettings = createDefaultSettings();
return new RaceMapSettings(settings.getZoomSettings(), settings.getHelpLinesSettings(), settings.getTransparentHoverlines(), settings.getHoverlineStrokeWeight(), settings.getTailLengthInMilliseconds(), settings.isWindUp(), defaultSettings.getBuoyZoneRadius(), settings.isShowOnlySelectedCompetitors(), settings.isShowSelectedCompetitorsInfo(), settings.isShowWindStreamletColors(), settings.isShowWindStreamletOverlay(), settings.isShowSimulationOverlay(), settings.isShowMapControls(), settings.getManeuverTypesToShow(), settings.isShowDouglasPeuckerPoints(),settings.isShowTargetEstimation());
return new RaceMapSettings(settings.getZoomSettings(), settings.getHelpLinesSettings(),
settings.getTransparentHoverlines(), settings.getHoverlineStrokeWeight(),
settings.getTailLengthInMilliseconds(), settings.isWindUp(), defaultSettings.getBuoyZoneRadius(),
settings.isShowOnlySelectedCompetitors(), settings.isShowSelectedCompetitorsInfo(),
settings.isShowWindStreamletColors(), settings.isShowWindStreamletOverlay(),
settings.isShowSimulationOverlay(), settings.isShowMapControls(), settings.getManeuverTypesToShow(),
settings.isShowDouglasPeuckerPoints(), settings.isShowTargetEstimation());
}
@Override
public RaceMapSettings extractDocumentSettings(RaceMapSettings settings) {
RaceMapSettings defaultSettings = createDefaultSettings();
return new RaceMapSettings(settings.getZoomSettings(), settings.getHelpLinesSettings(), settings.getTransparentHoverlines(), settings.getHoverlineStrokeWeight(), settings.getTailLengthInMilliseconds(), settings.isWindUp(), defaultSettings.getBuoyZoneRadius(), settings.isShowOnlySelectedCompetitors(), settings.isShowSelectedCompetitorsInfo(), settings.isShowWindStreamletColors(), settings.isShowWindStreamletOverlay(), settings.isShowSimulationOverlay(), settings.isShowMapControls(), settings.getManeuverTypesToShow(), settings.isShowDouglasPeuckerPoints(),settings.isShowTargetEstimation());
return new RaceMapSettings(settings.getZoomSettings(), settings.getHelpLinesSettings(),
settings.getTransparentHoverlines(), settings.getHoverlineStrokeWeight(),
settings.getTailLengthInMilliseconds(), settings.isWindUp(), defaultSettings.getBuoyZoneRadius(),
settings.isShowOnlySelectedCompetitors(), settings.isShowSelectedCompetitorsInfo(),
settings.isShowWindStreamletColors(), settings.isShowWindStreamletOverlay(),
settings.isShowSimulationOverlay(), settings.isShowMapControls(), settings.getManeuverTypesToShow(),
settings.isShowDouglasPeuckerPoints(), settings.isShowTargetEstimation());
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettings.java
+2 -1
View File
@@ -98,7 +98,8 @@ public class RaceMapSettings extends AbstractGenericSerializableSettings {
Boolean transparentHoverlines, Integer hoverlineStrokeWeight, Long tailLengthInMilliseconds, Boolean windUp,
Distance buoyZoneRadius, Boolean showOnlySelectedCompetitors, Boolean showSelectedCompetitorsInfo,
Boolean showWindStreamletColors, Boolean showWindStreamletOverlay, Boolean showSimulationOverlay,
Boolean showMapControls, Collection<ManeuverType> maneuverTypesToShow, Boolean showDouglasPeuckerPoints,Boolean showEstimatedRaceEnd) {
Boolean showMapControls, Collection<ManeuverType> maneuverTypesToShow, Boolean showDouglasPeuckerPoints,
Boolean showEstimatedRaceEnd) {
this.zoomSettings.init(zoomSettings);
this.helpLinesSettings.init(helpLinesSettings);
this.transparentHoverlines.setValue(transparentHoverlines);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/TrueNorthIndicatorPanel.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class TrueNorthIndicatorPanel extends FlowPanel {
oldRaceMapSettings.isShowSelectedCompetitorsInfo(), oldRaceMapSettings.isShowWindStreamletColors(),
oldRaceMapSettings.isShowWindStreamletOverlay(), oldRaceMapSettings.isShowSimulationOverlay(),
oldRaceMapSettings.isShowMapControls(), oldRaceMapSettings.getManeuverTypesToShow(),
oldRaceMapSettings.isShowDouglasPeuckerPoints(),oldRaceMapSettings.isShowTargetEstimation());
oldRaceMapSettings.isShowDouglasPeuckerPoints(), oldRaceMapSettings.isShowTargetEstimation());
map.updateSettings(newRaceMapSettings);
}
});
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
+1 -1
View File
@@ -117,7 +117,7 @@ public class EmbeddedMapAndWindChartEntryPoint extends AbstractSailingEntryPoint
defaultRaceMapSettings.isShowSelectedCompetitorsInfo(), defaultRaceMapSettings.isShowWindStreamletColors(),
defaultRaceMapSettings.isShowWindStreamletOverlay(), defaultRaceMapSettings.isShowSimulationOverlay(),
defaultRaceMapSettings.isShowMapControls(), defaultRaceMapSettings.getManeuverTypesToShow(),
defaultRaceMapSettings.isShowDouglasPeuckerPoints(),true);
defaultRaceMapSettings.isShowDouglasPeuckerPoints(), true);
sailingService.getRaceIdentifier(regattaLikeName, raceColumnName, fleetName, new AsyncCallback<RegattaAndRaceIdentifier>() {
@Override
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/StartAnalysisMode.java
+2 -1
View File
@@ -80,7 +80,8 @@ public class StartAnalysisMode extends RaceBoardModeWithPerRaceCompetitors {
defaultSettings.isShowSimulationOverlay(),
defaultSettings.isShowMapControls(),
defaultSettings.getManeuverTypesToShow(),
defaultSettings.isShowDouglasPeuckerPoints(),defaultSettings.isShowTargetEstimation());
defaultSettings.isShowDouglasPeuckerPoints(),
defaultSettings.isShowTargetEstimation());
((RaceBoardComponentContext) raceMap.getComponentContext()).addModesPatching(raceMap, additiveSettings, new OnSettingsReloadedCallback<RaceMapSettings>() {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/WinningLanesMode.java
+2 -1
View File
@@ -76,7 +76,8 @@ public class WinningLanesMode extends RaceBoardModeWithPerRaceCompetitors {
defaultSettings.isShowSimulationOverlay(),
defaultSettings.isShowMapControls(),
defaultSettings.getManeuverTypesToShow(),
defaultSettings.isShowDouglasPeuckerPoints(),defaultSettings.isShowTargetEstimation());
defaultSettings.isShowDouglasPeuckerPoints(),
defaultSettings.isShowTargetEstimation());
((RaceBoardComponentContext) raceMap.getComponentContext()).addModesPatching(raceMap, additiveSettings, new OnSettingsReloadedCallback<RaceMapSettings>() {