Index: /trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElementSpec.java
===================================================================
--- /trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElementSpec.java	(revision 1183)
+++ /trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElementSpec.java	(revision 1184)
@@ -253,5 +253,5 @@
         MFCGUIElementSpec otherSpec = (MFCGUIElementSpec) other;
 
-        if ((type != otherSpec.type) && ((type != null) && (!type.equals(otherSpec.type)))) {
+        if ((type == null) ? otherSpec.type != null : !type.equals(otherSpec.type)) {
             return false;
         }
@@ -337,6 +337,6 @@
         return (hwnd == otherSpec.hwnd) && (isModal == otherSpec.isModal) &&
             (resourceId == otherSpec.resourceId) &&
-            ((type == otherSpec.type) || ((type != null) && (type.equals(otherSpec.type)))) &&
-            ((name == otherSpec.name) || ((name != null) && (name.equals(otherSpec.name))));
+            (type == null ? otherSpec.type == null : type.equals(otherSpec.type)) &&
+            (name == null ? otherSpec.name == null : name.equals(otherSpec.name));
     }
 
@@ -403,5 +403,5 @@
             }
 
-            if ((name != other.name) && (name != null) && (!name.equals(other.name))) {
+            if (name == null ? other.name != null : !name.equals(other.name)) {
                 setName(other.name);
             }