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

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

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

Log Message:
-----------
Simplify code.

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 04:30:59 UTC (rev 11705)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java	2009-05-23 18:50:18 UTC (rev 11706)
@@ -63,15 +63,13 @@
     @Override
     public boolean equals(final Object obj)
     {
-        if (obj instanceof KeyCharKeyBinding)
+        if (!(obj instanceof KeyCharKeyBinding))
         {
-            final KeyCharKeyBinding keyBinding = (KeyCharKeyBinding)obj;
-            return keyBinding.getKeyChar() == keyChar;
-        }
-        else
-        {
             return false;
         }
+
+        final KeyCharKeyBinding keyBinding = (KeyCharKeyBinding)obj;
+        return keyBinding.getKeyChar() == keyChar;
     }
 
     /** {@inheritDoc} */

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 04:30:59 UTC (rev 11705)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java	2009-05-23 18:50:18 UTC (rev 11706)
@@ -81,15 +81,13 @@
     @Override
     public boolean equals(final Object obj)
     {
-        if (obj instanceof KeyCodeKeyBinding)
+        if (!(obj instanceof KeyCodeKeyBinding))
         {
-            final KeyCodeKeyBinding keyBinding = (KeyCodeKeyBinding)obj;
-            return keyBinding.getKeyCode() == keyCode && keyBinding.getModifiers() == modifiers;
-        }
-        else
-        {
             return false;
         }
+
+        final KeyCodeKeyBinding keyBinding = (KeyCodeKeyBinding)obj;
+        return keyBinding.getKeyCode() == keyCode && keyBinding.getModifiers() == modifiers;
     }
 
     /** {@inheritDoc} */


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