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

Fix open maven subproject context menu #7723

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Fix open maven subproject context menu #7723

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 17 additions & 13 deletions ide/projectui/src/org/netbeans/modules/project/ui/actions/OpenSubprojects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ private void openAllRequiredProjects(Node [] activatedNodes) {

private class LazyMenu extends JMenu {
private final Node[] activatedNodes;
boolean initialized; // create only once, prevents recreating items when user repeatedly expends and collapses the menu
private Set<? extends Project> subProjects;
private boolean menuCreated; // create only once, prevents recreating items when user repeatedly expends and collapses the menu
private volatile Set<? extends Project> subProjects;

@NbBundle.Messages("LBL_SubProjectPopupMenu_Initializing=Initializing...")
private LazyMenu(Node[] nodes) {
Expand All @@ -147,25 +147,20 @@ private LazyMenu(Node[] nodes) {
JMenuItem item = new JMenuItem(Bundle.LBL_SubProjectPopupMenu_Initializing());
item.setEnabled(false);
add(item);
RP.post(new Runnable() {
@Override
public void run() {
getSubProjects();
}
});
RP.post(this::asyncFindSubProjects);
}

@Override
public JPopupMenu getPopupMenu() {
if(initialized) {
if (!menuCreated && subProjects != null) {
createSubMenu();
}
return super.getPopupMenu();
}

private void createSubMenu() {
removeAll();
if(subProjects != null && !subProjects.isEmpty()) {
if (!subProjects.isEmpty()) {
super.getPopupMenu().setLayout(new VerticalGridLayout());
final JMenuItem openAllProjectsItem = new JMenuItem(new AbstractAction() {
@Override
Expand All @@ -181,7 +176,7 @@ public void actionPerformed(ActionEvent e) {
nothingItem.setEnabled(false);
add(nothingItem);
}
if(subProjects != null && !subProjects.isEmpty()) {
if (!subProjects.isEmpty()) {
for(final Project prjIter:subProjects) {
JMenuItem selectPrjAction = new JMenuItem(new AbstractAction() {
@Override
Expand All @@ -193,9 +188,10 @@ public void actionPerformed(ActionEvent e) {
add(selectPrjAction);
}
}
menuCreated = true;
}

private void getSubProjects() {
private void asyncFindSubProjects() {
try {
if(activatedNodes != null) {
for( int i = 0; i < activatedNodes.length; i++ ) {
Expand All @@ -214,7 +210,15 @@ private void getSubProjects() {
}
}
} finally {
initialized = true;
if (subProjects == null) {
subProjects = Set.of();
} else {
// trigger project name query tasks
// without this, the first call to getDisplayName() will likely return a project path fallback
for (Project project : subProjects) {
ProjectUtils.getInformation(project).getDisplayName();
}
}
}
}
}
Expand Down
Loading