From c535bb870d6c9de1645554f1ceca85cef9ea904a Mon Sep 17 00:00:00 2001
From: Alexey Pegov <alexey.pegov@jetbrains.com>
Date: Mon, 18 Oct 2010 20:27:04 +0400
Subject: [PATCH] WI-3494 keymap set copy - wrong name assign

---
 .../intellij/openapi/keymap/impl/ui/KeymapPanel.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
index ac00a9a19566..16dcb7b13d34 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
@@ -747,10 +747,10 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable {
 
     KeymapImpl newKeymap = selectedKeymap.deriveKeymap();
 
-    String newKeymapName = KeyMapBundle.message("new.keymap.name", selectedKeymap.getName());
+    String newKeymapName = KeyMapBundle.message("new.keymap.name", selectedKeymap.getPresentableName());
     if(!tryNewKeymapName(newKeymapName)) {
       for(int i=0; ; i++) {
-        newKeymapName = KeyMapBundle.message("new.indexed.keymap.name", selectedKeymap.getName(), i);
+        newKeymapName = KeyMapBundle.message("new.indexed.keymap.name", selectedKeymap.getPresentableName(), i);
         if(tryNewKeymapName(newKeymapName)) {
           break;
         }
@@ -812,10 +812,10 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable {
     }
     KeymapImpl newKeymap = keymap.deriveKeymap();
 
-    String newKeymapName = KeyMapBundle.message("new.keymap.name", keymap.getName());
+    String newKeymapName = KeyMapBundle.message("new.keymap.name", keymap.getPresentableName());
     if(!tryNewKeymapName(newKeymapName)) {
       for(int i=0; ; i++) {
-        newKeymapName = KeyMapBundle.message("new.indexed.keymap.name", keymap.getName(), i);
+        newKeymapName = KeyMapBundle.message("new.indexed.keymap.name", keymap.getPresentableName(), i);
         if(tryNewKeymapName(newKeymapName)) {
           break;
         }
@@ -832,7 +832,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable {
   private boolean tryNewKeymapName(String name) {
     for(int i=0; i<myKeymapListModel.getSize(); i++) {
       Keymap k = (Keymap)myKeymapListModel.getElementAt(i);
-      if(name.equals(k.getName())) {
+      if(name.equals(k.getPresentableName())) {
         return false;
       }
     }