Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import Maven Projects wizard does not sort projects #1841

Closed
wants to merge 2 commits into from
Closed

Import Maven Projects wizard does not sort projects #1841

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78df4bd
Import Maven Projects wizard does not sort projects
ThomasReinhardt Sep 27, 2024
6c3b585
Merge branch 'eclipse-m2e:master' into master
ThomasReinhardt Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...lipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down