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

IDEA-143094 Macros not working - they are in macros.xml but not shown in the menu

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-10-28 12:32:36 +01:00
parent e3940bac97
commit ed4aabcf2e
2 changed files with 20 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacro.java
+4 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,9 +23,6 @@ import com.intellij.openapi.editor.actionSystem.TypedAction;
import com.intellij.openapi.ui.playback.commands.KeyCodeTypeCommand;
import com.intellij.openapi.ui.playback.commands.TypeCommand;
import com.intellij.openapi.util.Couple;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.JDOMExternalizable;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.openapi.util.text.StringUtil;
import org.intellij.lang.annotations.JdkConstants;
import org.jdom.Element;
@@ -38,7 +35,7 @@ import java.util.List;
/**
* @author max
*/
public class ActionMacro implements JDOMExternalizable {
public class ActionMacro {
private String myName;
private final ArrayList<ActionDescriptor> myActions = new ArrayList<ActionDescriptor>();
@@ -80,7 +77,7 @@ public class ActionMacro implements JDOMExternalizable {
return myActions.toArray(new ActionDescriptor[myActions.size()]);
}
public void readExternal(Element macro) throws InvalidDataException {
public void readExternal(Element macro) {
setName(macro.getAttributeValue(ATTRIBUTE_NAME));
List actions = macro.getChildren();
for (final Object o : actions) {
@@ -115,7 +112,7 @@ public class ActionMacro implements JDOMExternalizable {
return KeyCodeTypeCommand.unparseKeyCodes(keyCodes);
}
public void writeExternal(Element macro) throws WriteExternalException {
public void writeExternal(Element macro) {
macro.setAttribute(ATTRIBUTE_NAME, myName);
final ActionDescriptor[] actions = getActions();
for (ActionDescriptor action : actions) {
platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java
+16 -34
View File
@@ -23,8 +23,10 @@ import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
import com.intellij.openapi.actionSystem.ex.AnActionListener;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.components.ExportableComponent;
import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.components.StoragePathMacros;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.project.Project;
@@ -36,9 +38,6 @@ import com.intellij.openapi.ui.popup.JBPopupAdapter;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.LightweightWindowEvent;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.NamedJDOMExternalizable;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.wm.CustomStatusBarWidget;
import com.intellij.openapi.wm.IdeFrame;
@@ -61,16 +60,15 @@ import java.awt.*;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* @author max
*/
public class ActionMacroManager implements ExportableComponent, NamedJDOMExternalizable, Disposable {
@State(
name = "ActionMacroManager",
storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/macros.xml")
)
public class ActionMacroManager implements PersistentStateComponent<Element>, Disposable {
private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actionMacro.ActionMacroManager");
private static final String TYPING_SAMPLE = "WWWWWWWWWWWWWWWWWWWW";
@@ -128,11 +126,9 @@ public class ActionMacroManager implements ExportableComponent, NamedJDOMExterna
}
@Override
public void readExternal(Element element) throws InvalidDataException {
public void loadState(Element state) {
myMacros = new ArrayList<ActionMacro>();
final List macros = element.getChildren(ELEMENT_MACRO);
for (final Object o : macros) {
Element macroElement = (Element)o;
for (Element macroElement : state.getChildren(ELEMENT_MACRO)) {
ActionMacro macro = new ActionMacro();
macro.readExternal(macroElement);
myMacros.add(macro);
@@ -141,30 +137,16 @@ public class ActionMacroManager implements ExportableComponent, NamedJDOMExterna
registerActions();
}
@Override
public String getExternalFileName() {
return "macros";
}
@Override
@NotNull
public File[] getExportFiles() {
return new File[]{PathManager.getOptionsFile(this)};
}
@Override
@NotNull
public String getPresentableName() {
return IdeBundle.message("title.macros");
}
@Override
public void writeExternal(Element element) throws WriteExternalException {
@Nullable
@Override
public Element getState() {
Element element = new Element("state");
for (ActionMacro macro : myMacros) {
Element macroElement = new Element(ELEMENT_MACRO);
macro.writeExternal(macroElement);
element.addContent(macroElement);
}
return element;
}
public static ActionMacroManager getInstance() {