MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[rider]: allowed to use GotoActionModel with custom modality; changed field visibility modifier

Browse Source
This commit is contained in:
vadim.lomshakov
2017-03-29 18:25:27 +03:00
parent be48e473ce
commit e8d557f55a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
+7 -2
View File
@@ -90,13 +90,18 @@ public class GotoActionModel implements ChooseByNameModel, Comparator<Object>, D
return map;
});
private final ModalityState myModality = ModalityState.defaultModalityState();
private final ModalityState myModality;
public GotoActionModel(@Nullable Project project, Component component, @Nullable Editor editor, @Nullable PsiFile file) {
this(project, component, editor, file, ModalityState.defaultModalityState());
}
public GotoActionModel(@Nullable Project project, Component component, @Nullable Editor editor, @Nullable PsiFile file, @Nullable ModalityState modalityState) {
myProject = project;
myContextComponent = component;
myEditor = editor;
myFile = file;
myModality = modalityState;
ActionGroup mainMenu = (ActionGroup)myActionManager.getActionOrStub(IdeActions.GROUP_MAIN_MENU);
collectActions(myActionGroups, mainMenu, mainMenu.getTemplatePresentation().getText());
}
@@ -287,7 +292,7 @@ public class GotoActionModel implements ChooseByNameModel, Comparator<Object>, D
}
@NotNull
String getGroupName(@NotNull OptionDescription description) {
public String getGroupName(@NotNull OptionDescription description) {
String name = description.getGroupName();
if (name == null) name = myConfigurablesNames.getValue().get(description.getConfigurableId());
String settings = SystemInfo.isMac ? "Preferences" : "Settings";