mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IDEA-82744 Bookmarks: NPE at BookmarksAction$EditBookmarkDescriptionAction.actionPerformed() after clicking in the popup with opened description dialog
This commit is contained in:
@@ -35,6 +35,8 @@ public abstract class ItemWrapper {
|
||||
public abstract String footerText();
|
||||
|
||||
public void updateDetailView(DetailView panel) {
|
||||
if (panel == null) return;
|
||||
|
||||
if (equals(panel.getCurrentItem())) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -33,6 +33,7 @@ import com.intellij.openapi.vfs.VirtualFile;
|
||||
import com.intellij.openapi.wm.IdeFocusManager;
|
||||
import com.intellij.openapi.wm.ToolWindowManager;
|
||||
import com.intellij.ui.components.JBList;
|
||||
import com.intellij.ui.popup.util.DetailViewImpl;
|
||||
import com.intellij.ui.popup.util.ItemWrapper;
|
||||
import com.intellij.ui.popup.util.MasterDetailPopupBuilder;
|
||||
import com.intellij.ui.speedSearch.FilteringListModel;
|
||||
@@ -77,10 +78,11 @@ public class BookmarksAction extends AnAction implements DumbAware, MasterDetail
|
||||
actions.add(new MoveBookmarkUpAction(project, list));
|
||||
actions.add(new MoveBookmarkDownAction(project, list));
|
||||
|
||||
myPopup = new MasterDetailPopupBuilder(project).
|
||||
setActionsGroup(actions).
|
||||
setList(list).
|
||||
setDelegate(this).createMasterDetailPopup();
|
||||
myPopup = new MasterDetailPopupBuilder(project)
|
||||
.setActionsGroup(actions)
|
||||
.setList(list)
|
||||
.setDetailView(new DetailViewImpl(project))
|
||||
.setDelegate(this).createMasterDetailPopup();
|
||||
|
||||
editDescriptionAction.setPopup(myPopup);
|
||||
myPopup.showCenteredInCurrentWindow(project);
|
||||
|
||||
Reference in New Issue
Block a user