commit 21726744165c946ba6619bff89e98d5863f26e22
author Geertjan Wielenga <geertjan@apache.org> Wed May 12 20:42:29 2021 +0200
committer GitHub <noreply@github.com> Wed May 12 20:42:29 2021 +0200
tree 12fb21b49c1fa3931d975fb9f2e4effd56cc1352
parent 064136c61386b371259a4275173eacb745464224
parent 1e006a8ddaa70da36e1886c4e229cb91759613d5

Merge pull request #2952 from apache/delivery

Sync release124 with delivery for 12.4 rc4

java/java.disco/src/org/netbeans/modules/java/disco/AdvancedPanel.java

diff --git a/java/java.disco/src/org/netbeans/modules/java/disco/AdvancedPanel.java b/java/java.disco/src/org/netbeans/modules/java/disco/AdvancedPanel.java
index 3785b89..da528c7 100644
--- a/java/java.disco/src/org/netbeans/modules/java/disco/AdvancedPanel.java
+++ b/java/java.disco/src/org/netbeans/modules/java/disco/AdvancedPanel.java
@@ -81,7 +81,15 @@
     }
 
     private ComboBoxModel<Distribution> createDistributionComboboxModel() {
-        Distribution[] distributions = {Distribution.NONE, Distribution.AOJ, Distribution.CORRETTO, Distribution.DRAGONWELL, Distribution.LIBERICA, Distribution.OJDK_BUILD, Distribution.SAP_MACHINE, Distribution.ZULU};
+        List<Distribution> allDistros = Distribution.getDistributions();
+        allDistros.sort((o1, o2) -> {
+            return o1.getUiString().compareTo(o2.getUiString());
+        });
+        List<Distribution> distros = new ArrayList<>(1 + allDistros.size());
+        distros.add(Distribution.NONE);
+        distros.addAll(allDistros);
+
+        Distribution[] distributions = distros.toArray(new Distribution[0]);
 
         return new DefaultComboBoxModel<>(distributions);
     }