XmppProviders.getXmppProvidersModel(): return a List<String>

igniterealtime · Sep 1, 2024 · 1f40d1c · 1f40d1c
1 parent dad6a61
commit 1f40d1c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/core/src/main/java/org/jivesoftware/AccountCreationWizard.java b/core/src/main/java/org/jivesoftware/AccountCreationWizard.java
@@ -59,6 +59,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 
 import static org.jivesoftware.sparkimpl.certificates.SparkSSLContextCreator.Options.ONLY_SERVER_SIDE;
 
@@ -122,7 +123,13 @@ public FormPanel() {
     public AccountCreationWizard() {
         // Associate Mnemonics
         serverField.setEditable(true);
-        serverField.setModel(XmppProviders.getXmppProvidersModel());
+        List<String> providers = XmppProviders.getXmppProvidersModel();
+        for (String provider : providers) {
+            serverField.addItem(provider);
+        }
+        // Randomly pre-select a provider
+        int randomProviderIdx = new Random().nextInt(providers.size());
+        serverField.setSelectedIndex(randomProviderIdx);
 
         ResourceUtils.resButton(startRegistrationButton, Res.getString("button.start.registration"));
         startRegistrationButton.addActionListener( actionEvent -> startRegistration() );

diff --git a/core/src/main/java/org/jivesoftware/XmppProviders.java b/core/src/main/java/org/jivesoftware/XmppProviders.java
@@ -24,12 +24,9 @@
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.jivesoftware.spark.util.log.Log;
 
-import javax.swing.*;
-
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 import static java.util.Arrays.asList;
 
@@ -58,20 +55,14 @@ public class XmppProviders {
         "yax.im",
     };
 
-    public static ComboBoxModel<String> getXmppProvidersModel() {
-        DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>();
+    public static List<String> getXmppProvidersModel() {
         List<String> providersList = downloadProvidersList();
-        if (providersList == null) {
-            // fallback to static list
-            providersList = asList(providers);
-        }
-        for (String provider : providersList) {
-            model.addElement(provider);
+        if (providersList != null) {
+            return providersList;
         }
-        // Randomly pre-select a provider
-        int randomProviderIdx = new Random().nextInt(providersList.size());
-        model.setSelectedItem(providersList.get(randomProviderIdx));
-        return model;
+        // fallback to static list
+        providersList = asList(providers);
+        return providersList;
     }
 
     static List<String> downloadProvidersList() {