From: <ez...@us...> - 2012-10-15 02:32:00
|
Revision: 22379 http://jedit.svn.sourceforge.net/jedit/?rev=22379&view=rev Author: ezust Date: 2012-10-15 02:31:54 +0000 (Mon, 15 Oct 2012) Log Message: ----------- merge req# 3572793 - Fix keymap duplication handling Modified Paths: -------------- jEdit/branches/5.0.x/doc/CHANGES.txt jEdit/branches/5.0.x/org/gjt/sp/jedit/options/ShortcutsOptionPane.java Property Changed: ---------------- jEdit/branches/5.0.x/ Property changes on: jEdit/branches/5.0.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:21791-21792,21800-21801,21816,21880,21917,21933,21965-21966,21974,21981,21998-22000,22055,22077,22085-22086,22088,22108,22169,22192,22230-22232,22264,22272-22273,22276,22361,22363-22364 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:21791-21792,21800-21801,21816,21880,21917,21933,21965-21966,21974,21981,21998-22000,22055,22077,22085-22086,22088,22108,22169,22192,22230-22232,22264-22265,22272-22273,22276,22350,22361,22363-22364 Modified: jEdit/branches/5.0.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/5.0.x/doc/CHANGES.txt 2012-10-15 01:10:53 UTC (rev 22378) +++ jEdit/branches/5.0.x/doc/CHANGES.txt 2012-10-15 02:31:54 UTC (rev 22379) @@ -14,6 +14,8 @@ soft-wrap, and folding. (Patch#3567959, Bugs #2832769, #2998294, and #3193168 - Thomas Meyer) +- Fix keymap duplication handling (Björn "Vampire" Kautler) + - Fix broken macro Files/Glob_close.bsh (Eric Le Lay) - File status checking before save (#3562315, Alan Ezust) Modified: jEdit/branches/5.0.x/org/gjt/sp/jedit/options/ShortcutsOptionPane.java =================================================================== --- jEdit/branches/5.0.x/org/gjt/sp/jedit/options/ShortcutsOptionPane.java 2012-10-15 01:10:53 UTC (rev 22378) +++ jEdit/branches/5.0.x/org/gjt/sp/jedit/options/ShortcutsOptionPane.java 2012-10-15 02:31:54 UTC (rev 22379) @@ -433,6 +433,10 @@ jEdit.getProperty( "options.shortcuts.duplicatekeymap.dialog.title"), JOptionPane.OK_CANCEL_OPTION); + if (newName == null) + { + return; + } KeymapManager manager = jEdit.getKeymapManager(); Collection<String> keymapNames = manager.getKeymapNames(); while (newName != null) @@ -441,11 +445,14 @@ break; newName = JOptionPane.showInputDialog(ShortcutsOptionPane.this, jEdit.getProperty( - "options.shortcuts.keymapalreadyexists.dialog.label"), + "options.shortcuts.duplicatekeymap.keymapalreadyexists.label"), jEdit.getProperty( "options.shortcuts.duplicatekeymap.dialog.title"), JOptionPane.OK_CANCEL_OPTION); - + if (newName == null) + { + return; + } } if (manager.copyKeymap(selectedKeymap.toString(), newName)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |