eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-29 08:56:43 +00:00
Code Activity

Bug 4551: extracted method to cancel the current fix position chooser +

Browse Source 
cancel the associated notification, if it is still visible.
This commit is contained in:
Steffen Jacobs
2018-07-23 13:48:42 +02:00
parent ff9ebaaef2
commit 49a94fd505
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java
+13 -8
View File
@@ -739,10 +739,7 @@ public class EditMarkPositionPanel extends AbstractRaceChart<AbstractSettings> i
}
raceMap.unregisterAllCourseMarkInfoWindowClickHandlers();
} else {
if (currentFixPositionChooser != null) {
currentFixPositionChooser.cancel();
currentFixPositionChooser = null;
}
cancelFixPositionChooserAndNotification();
marksPanel.deselectMark();
selectedMark = null;
if (sideBySideComponentViewer != null) {
@@ -758,6 +755,17 @@ public class EditMarkPositionPanel extends AbstractRaceChart<AbstractSettings> i
super.setVisible(visible);
}
private void cancelFixPositionChooserAndNotification() {
if (currentFixPositionChooser != null) {
currentFixPositionChooser.cancel();
currentFixPositionChooser = null;
if (notificationTimer.isRunning()) {
notificationTimer.run();
notificationTimer.cancel();
}
}
}
private void checkIfTracking(Runnable continuation) {
if (nonTrackingWarningWasDisplayed) {
continuation.run();
@@ -864,10 +872,7 @@ public class EditMarkPositionPanel extends AbstractRaceChart<AbstractSettings> i
private void selectMark(MarkDTO mark) {
if (selectedMark != mark) {
if (currentFixPositionChooser != null) {
currentFixPositionChooser.cancel();
currentFixPositionChooser = null;
}
cancelFixPositionChooserAndNotification();
}
selectedMark = mark;
if (selectedMark != null) {