From d86321437d1b52be57514e6b0e55dc9e6bdf5e72 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 19 Sep 2011 13:08:42 +0200
Subject: [PATCH] copied live templates shouldn't share their contexts and
 options with the originals

---
 .../template/impl/TemplateListPanel.java      | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
index fdc0f3178750..6021a2f29047 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
@@ -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();
         }