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

copied live templates shouldn't share their contexts and options with the originals

Browse Source
This commit is contained in:
peter
2011-09-19 13:24:24 +02:00
parent 5ba424938e
commit d86321437d
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
+6 -13
View File
@@ -160,8 +160,8 @@ public class TemplateListPanel extends JPanel implements Disposable {
for (TemplateGroup templateGroup : templateGroups) {
for (TemplateImpl template : templateGroup.getElements()) {
template.applyOptions(getOptions(template));
template.applyContext(getContext(template));
template.applyOptions(getTemplateOptions(template));
template.applyContext(getTemplateContext(template));
}
}
TemplateSettings templateSettings = TemplateSettings.getInstance();
@@ -407,10 +407,6 @@ public class TemplateListPanel extends JPanel implements Disposable {
registerTemplate(template);
}
private Map<TemplateOptionalProcessor, Boolean> getOptions(final TemplateImpl template) {
return getTemplateOptions(template);
}
@Nullable
private DefaultMutableTreeNode getNode(final int row) {
JTree tree = myTree;
@@ -467,17 +463,13 @@ public class TemplateListPanel extends JPanel implements Disposable {
LOG.assertTrue(orTemplate != null);
TemplateImpl template = orTemplate.copy();
template.setKey(ABBREVIATION);
myTemplateOptions.put(getKey(template), getOptions(orTemplate));
myTemplateContext.put(getKey(template), getContext(orTemplate));
myTemplateOptions.put(getKey(template), new HashMap<TemplateOptionalProcessor, Boolean>(getTemplateOptions(orTemplate)));
myTemplateContext.put(getKey(template), new HashMap<TemplateContextType, Boolean>(getTemplateContext(orTemplate)));
registerTemplate(template);
updateTemplateDetails(true);
}
private Map<TemplateContextType, Boolean> getContext(final TemplateImpl template) {
return getTemplateContext(template);
}
private int getSelectedIndex() {
TreePath selectionPath = myTree.getSelectionPath();
if (selectionPath == null) {
@@ -838,7 +830,8 @@ public class TemplateListPanel extends JPanel implements Disposable {
if (myCurrentTemplateEditor != null) {
myCurrentTemplateEditor.dispose();
}
createTemplateEditor(newTemplate, (String)myExpandByCombo.getSelectedItem(), getOptions(newTemplate), getContext(newTemplate));
createTemplateEditor(newTemplate, (String)myExpandByCombo.getSelectedItem(), getTemplateOptions(newTemplate),
getTemplateContext(newTemplate));
if (focusKey) {
myCurrentTemplateEditor.focusKey();
}