Import Maven Projects wizard does not sort projects

eclipse-m2e · Oct 2, 2024 · aa4f825 · aa4f825
1 parent 2a342a2
commit aa4f825
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...lipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java b/...lipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -250,7 +251,7 @@ public Object[] getElements(Object element) {
         if(element instanceof List) {
           @SuppressWarnings("unchecked")
           List<MavenProjectInfo> projects = (List<MavenProjectInfo>) element;
-          return projects.toArray(new MavenProjectInfo[projects.size()]);
+          return sorted(projects);
         }
         return EMPTY;
       }
@@ -260,14 +261,20 @@ public Object[] getChildren(Object parentElement) {
         if(parentElement instanceof List) {
           @SuppressWarnings("unchecked")
           List<MavenProjectInfo> projects = (List<MavenProjectInfo>) parentElement;
-          return projects.toArray(new MavenProjectInfo[projects.size()]);
+          return sorted(projects);
         } else if(parentElement instanceof MavenProjectInfo mavenProjectInfo) {
           Collection<MavenProjectInfo> projects = mavenProjectInfo.getProjects();
-          return projects.toArray(new MavenProjectInfo[projects.size()]);
+          return sorted(projects);
         }
         return EMPTY;
       }
 
+      private MavenProjectInfo[] sorted(Collection<MavenProjectInfo> projects) {
+        List<MavenProjectInfo> sortedProjects = new ArrayList<>(projects);
+        sortedProjects.sort(Comparator.comparing(MavenProjectInfo::getLabel));
+        return sortedProjects.toArray(MavenProjectInfo[]::new);
+      }
+
       @Override
       public Object getParent(Object element) {
         return null;