[Crossfire-cvs] SF.net SVN: crossfire:[11707] jxclient/trunk/src/jxclient/com/realtime/ crossfire/jxclient/gui/keybindings

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

Revision: 11707
          http://crossfire.svn.sourceforge.net/crossfire/?rev=11707&view=rev
Author:   akirschbaum
Date:     2009-05-23 18:51:14 +0000 (Sat, 23 May 2009)

Log Message:
-----------
Fix equals().

Modified Paths:
--------------
    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/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java	2009-05-23 18:50:18 UTC (rev 11706)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java	2009-05-23 18:51:14 UTC (rev 11707)
@@ -63,7 +63,7 @@
     @Override
     public boolean equals(final Object obj)
     {
-        if (!(obj instanceof KeyCharKeyBinding))
+        if (obj == null || !(obj instanceof KeyCharKeyBinding))
         {
             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-23 18:50:18 UTC (rev 11706)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java	2009-05-23 18:51:14 UTC (rev 11707)
@@ -81,7 +81,7 @@
     @Override
     public boolean equals(final Object obj)
     {
-        if (!(obj instanceof KeyCodeKeyBinding))
+        if (obj == null || !(obj instanceof KeyCodeKeyBinding))
         {
             return false;
         }


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