Index: /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/guimodel/JFCGUIElementSpec.java
===================================================================
--- /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/guimodel/JFCGUIElementSpec.java	(revision 1079)
+++ /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/guimodel/JFCGUIElementSpec.java	(revision 1080)
@@ -115,9 +115,9 @@
         JFCGUIElementSpec otherSpec = (JFCGUIElementSpec) other;
 
-        if ((type != otherSpec.type) && ((type != null) && (!type.equals(otherSpec.type)))) {
+        if (type == null ? otherSpec.type != null : !type.equals(otherSpec.type)) {
             return false;
         }
 
-        if ((icon != otherSpec.icon) && ((icon != null) && (!icon.equals(otherSpec.icon)))) {
+        if (icon == null ? otherSpec.icon != null : !icon.equals(otherSpec.icon)) {
             return false;
         }
@@ -203,7 +203,8 @@
         JFCGUIElementSpec otherSpec = (JFCGUIElementSpec) other;
 
-        return ((name == otherSpec.name) || ((name != null) && (name.equals(otherSpec.name)))) &&
-            ((type == otherSpec.type) || ((type != null) && (type.equals(otherSpec.type)))) &&
-            ((icon == otherSpec.icon) || ((icon != null) && (icon.equals(otherSpec.icon)))) &&
+        return
+            (name == null ? otherSpec.name == null : name.equals(otherSpec.name)) &&
+            (type == null ? otherSpec.type == null : type.equals(otherSpec.type)) &&
+            (icon == null ? otherSpec.icon == null : icon.equals(otherSpec.icon)) &&
             (index == otherSpec.index) && (elementHash == otherSpec.elementHash);
     }
@@ -404,5 +405,5 @@
             }
 
-            if ((name != other.name) && (name != null) && (!name.equals(other.name))) {
+            if ((name == null) || (!name.equals(other.name))) {
                 setName(other.name);
             }