From 668a29f42f472c3d6bcb5a5c989b6b2a48234b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Hessenm=C3=BCller?= <tim.hessenmueller@sap.com>
Date: Thu, 10 Sep 2020 14:57:11 +0200
Subject: [PATCH] EditScoreDialog shows penalties in lexicographical order

---
 .../com/sap/sailing/domain/common/MaxPointsReason.java    | 8 ++++++++
 .../sailing/gwt/ui/leaderboardedit/EditScoreDialog.java   | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/MaxPointsReason.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/MaxPointsReason.java
index b868a3623c3..c6084020a99 100755
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/MaxPointsReason.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/MaxPointsReason.java
@@ -1,5 +1,7 @@
 package com.sap.sailing.domain.common;
 
+import java.util.Arrays;
+
 /**
  * The reasons why a competitor may get the maximum number of points, usually equaling the
  * number of competitors enlisted for the regatta plus one.
@@ -80,4 +82,10 @@ public enum MaxPointsReason {
     public boolean isAppliesAtStartOfRace() {
         return appliesAtStartOfRace;
     }
+
+    public static MaxPointsReason[] getLexicographicalValues() {
+        MaxPointsReason[] result = MaxPointsReason.values();
+        Arrays.sort(result, (o1, o2) -> o1.name().compareToIgnoreCase(o2.name()));
+        return result;
+    }
 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/EditScoreDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/EditScoreDialog.java
index b275a81263c..4963e8d05bc 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/EditScoreDialog.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/EditScoreDialog.java
@@ -26,13 +26,14 @@ public class EditScoreDialog extends DataEntryDialog<Util.Pair<MaxPointsReason,
         this.stringMessages = stringMessages;
         maxPointsBox = createListBox(/* isMultipleSelect */ false);
         maxPointsBox.addItem("");
-        for (MaxPointsReason maxPointsReason : MaxPointsReason.values()) {
+        for (MaxPointsReason maxPointsReason : MaxPointsReason.getLexicographicalValues()) {
             maxPointsBox.addItem(maxPointsReason.name());
         }
         if (oldMaxPointsReason == null) {
             maxPointsBox.setSelectedIndex(0);
         } else {
-            maxPointsBox.setSelectedIndex(1+Arrays.asList(MaxPointsReason.values()).indexOf(oldMaxPointsReason));
+            maxPointsBox.setSelectedIndex(
+                    1 + Arrays.asList(MaxPointsReason.getLexicographicalValues()).indexOf(oldMaxPointsReason));
         }
         totalPointsBox = createDoubleBox(/* visibleLength */ 5);
         if (oldTotalPoints != null) {