[Crossfire-cvs] SF.net SVN: crossfire:[11719] jxclient/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 11719
          http://crossfire.svn.sourceforge.net/crossfire/?rev=11719&view=rev
Author:   akirschbaum
Date:     2009-05-25 19:34:14 +0000 (Mon, 25 May 2009)

Log Message:
-----------
Do not write invalid keybindings files.

Modified Paths:
--------------
    jxclient/trunk/ChangeLog
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java

Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog	2009-05-25 13:59:36 UTC (rev 11718)
+++ jxclient/trunk/ChangeLog	2009-05-25 19:34:14 UTC (rev 11719)
@@ -1,3 +1,7 @@
+2009-05-25  Andreas Kirschbaum
+
+	* Do not write invalid keybindings files.
+
 2009-05-24  Andreas Kirschbaum
 
 	* Add "def item" skin command. Move recurring parameters from "item"

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java	2009-05-25 13:59:36 UTC (rev 11718)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java	2009-05-25 19:34:14 UTC (rev 11719)
@@ -60,6 +60,10 @@
     @Override
     public abstract boolean equals(final Object obj);
 
+    /** {@inheritDoc} */
+    @Override
+    public abstract int hashCode();
+
     /**
      * Check whether this key binding matches a key code/modifiers pair.
      *

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java	2009-05-25 13:59:36 UTC (rev 11718)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java	2009-05-25 19:34:14 UTC (rev 11719)
@@ -296,7 +296,7 @@
                         {
                             final KeyCharKeyBinding keyCharKeyBinding = (KeyCharKeyBinding)keyBinding;
                             bw.write("char ");
-                            bw.write(Character.toString(keyCharKeyBinding.getKeyChar()));
+                            bw.write(Integer.toString(keyCharKeyBinding.getKeyChar()));
                             bw.write(' ');
                             bw.write(GUICommandFactory.encode(keyCharKeyBinding.getCommandString()));
                             bw.newLine();

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java	2009-05-25 13:59:36 UTC (rev 11718)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java	2009-05-25 19:34:14 UTC (rev 11719)
@@ -69,6 +69,13 @@
 
     /** {@inheritDoc} */
     @Override
+    public int hashCode()
+    {
+        return keyChar;
+    }
+
+    /** {@inheritDoc} */
+    @Override
     public boolean matchesKeyCode(final int keyCode, final int modifiers)
     {
         return false;

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java	2009-05-25 13:59:36 UTC (rev 11718)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java	2009-05-25 19:34:14 UTC (rev 11719)
@@ -92,6 +92,13 @@
 
     /** {@inheritDoc} */
     @Override
+    public int hashCode()
+    {
+        return keyCode^(modifiers<<16); 
+    }
+
+    /** {@inheritDoc} */
+    @Override
     public boolean matchesKeyCode(final int keyCode, final int modifiers)
     {
         return this.keyCode == keyCode && this.modifiers == modifiers;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.