[Gridarta-commit] SF.net SVN: gridarta: [1042] trunk/crossfire/src/cfeditor/menu/ AggregateMenuLocation.java

[<chr...@us...>]

Revision: 1042
          http://svn.sourceforge.net/gridarta/?rev=1042&view=rev
Author:   christianhujer
Date:     2006-12-10 13:13:16 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
Fixed bug: equals() between objects of inconvertible types.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java

Modified: trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java
===================================================================
--- trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java	2006-12-10 20:35:11 UTC (rev 1041)
+++ trunk/crossfire/src/cfeditor/menu/AggregateMenuLocation.java	2006-12-10 21:13:16 UTC (rev 1042)
@@ -57,8 +57,8 @@
         @Override public boolean equals(final Object obj) {
             if (obj instanceof WrappedMenuLocation) {
                 final WrappedMenuLocation loc = (WrappedMenuLocation) obj;
-                return ((loc.name == null ? name == null : loc.equals(name)) &&
-                        (loc.location == null ? location == null : loc.equals(location)));
+                return ((loc.name == null ? name == null : loc.name.equals(name)) &&
+                        (loc.location == null ? location == null : loc.location.equals(location)));
             }
             return false;
         }


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