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

restore hacky logic around BaseToolManager, thanks to clion devs

Browse Source 
GitOrigin-RevId: b9138b47227dc1e440ef3bd3e51f95c7896f8c19
This commit is contained in:
Sergey Ignatov
2019-07-16 00:02:49 +03:00
committed by intellij-monorepo-bot
parent d5ce47f522
commit e8a89059dc
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/tools/BaseToolManager.java
+5 -3
View File
@@ -34,9 +34,11 @@ public abstract class BaseToolManager<T extends Tool> {
@Nullable private final ActionManagerEx myActionManager;
private final SchemeManager<ToolsGroup<T>> mySchemeManager;
public BaseToolManager(@NotNull SchemeManagerFactory factory, @NotNull String schemePath, @NotNull String presentableName) {
myActionManager = ActionManagerEx.getInstanceEx();
public BaseToolManager(@Nullable ActionManagerEx ex,
@NotNull SchemeManagerFactory factory,
@NotNull String schemePath,
@NotNull String presentableName) {
myActionManager = ex;
//noinspection AbstractMethodCallInConstructor
mySchemeManager = factory.create(schemePath, createProcessor(), presentableName);
mySchemeManager.loadSchemes();
platform/lang-impl/src/com/intellij/tools/ToolManager.java
+2 -1
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.tools;
import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.options.SchemeManagerFactory;
import com.intellij.openapi.options.SchemeProcessor;
@@ -22,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
public class ToolManager extends BaseToolManager<Tool> {
public ToolManager(@NotNull SchemeManagerFactory factory) {
super(factory, "tools", ToolsBundle.message("tools.settings"));
super(ActionManagerEx.getInstanceEx(), factory, "tools", ToolsBundle.message("tools.settings"));
}
@Override