From 4c116d7d40fdb4d9ff07bb137e41b9afa79bf2f1 Mon Sep 17 00:00:00 2001
From: Steffen Schaefer <steffen.schaefer@sap.com>
Date: Mon, 25 Jun 2018 15:37:53 +0200
Subject: [PATCH] Bug 3621: Code cleanup

---
 .../shared/charts/EditMarkPositionPanel.java  | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java
index 5fe22b9926e..5fb4d1b13c6 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPositionPanel.java
@@ -412,29 +412,27 @@ public class EditMarkPositionPanel extends AbstractRaceChart<AbstractSettings> i
                 }
                 
                 private void addDeleteItemAndShowPopup(boolean enableDelete) {
-                    if (enableDelete) {
-                        checkIfTracking(() -> {
-                            final MenuItem delete;
-                            if (enableDelete) {
-                                delete = new MenuItem(stringMessages.deleteFix(), new ScheduledCommand() {
-                                    @Override
-                                    public void execute() {
-                                        removeMarkFix(mark, fix);
-                                        popup.hide();
-                                    }
-                                });
-                            } else {
-                                delete = new MenuItem(stringMessages.deleteFix(), new ScheduledCommand() {
-                                    @Override
-                                    public void execute() {
-                                    }
-                                });
-                                delete.setEnabled(false);
-                                delete.setTitle(stringMessages.theDeletionOfThisFix());
+                    Runnable r = () -> {
+                        final MenuItem delete = new MenuItem(stringMessages.deleteFix(), new ScheduledCommand() {
+                            @Override
+                            public void execute() {
+                                if (enableDelete) {
+                                    removeMarkFix(mark, fix);
+                                    popup.hide();
+                                }
                             }
-                            menu.addItem(delete);
-                            popup.setWidget(menu);
                         });
+                        if (!enableDelete) {
+                            delete.setEnabled(false);
+                            delete.setTitle(stringMessages.theDeletionOfThisFix());
+                        }
+                        menu.addItem(delete);
+                        popup.setWidget(menu);
+                    };
+                    if (enableDelete) {
+                        checkIfTracking(r);
+                    } else {
+                        r.run();
                     }
                 }
             });