Index: /trunk/quest-plugin-jfc/data/guimappings/guimapping-argouml.txt
===================================================================
--- /trunk/quest-plugin-jfc/data/guimappings/guimapping-argouml.txt	(revision 587)
+++ /trunk/quest-plugin-jfc/data/guimappings/guimapping-argouml.txt	(revision 588)
@@ -18,2 +18,5 @@
 org.argouml.core.propertypanels.ui.UMLTextField = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextField
 org.argouml.core.propertypanels.ui.UMLComboBox = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+org.argouml.ui.explorer.DnDExplorerTree = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+org.argouml.ui.NavigatorPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+org.argouml.ui.explorer.PerspectiveComboBox = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
Index: /trunk/quest-plugin-jfc/data/guimappings/guimapping-swing.txt
===================================================================
--- /trunk/quest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 587)
+++ /trunk/quest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 588)
@@ -15,2 +15,4 @@
 sun.swing.FilePane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
 sun.swing.FilePane$3 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+javax.swing.plaf.metal.MetalComboBoxButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+javax.swing.JButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCButton
Index: /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParser.java
===================================================================
--- /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParser.java	(revision 587)
+++ /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/JFCLogParser.java	(revision 588)
@@ -347,6 +347,5 @@
                     }
                     else if ("hash".equals(atts.getValue("name"))) {
-                        currentGuiElementSpec.setElementHash
-                            (Integer.parseInt(atts.getValue("value"), 16));
+                        currentGuiElementSpec.setElementHash(atts.getValue("value"));
                     }
                 }
@@ -654,5 +653,5 @@
             currentGuiElementSpec.setIcon("unknown");
             currentGuiElementSpec.setIndex(-1);
-            currentGuiElementSpec.setElementHash(-1);
+            currentGuiElementSpec.setElementHash("-1");
         }
         catch (Exception e)
Index: /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElement.java
===================================================================
--- /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElement.java	(revision 587)
+++ /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElement.java	(revision 588)
@@ -75,5 +75,5 @@
      * @return the hashCode
      */
-    int getElementHash() {
+    String getElementHash() {
         return specification.getElementHash();
     }
Index: /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElementSpec.java
===================================================================
--- /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElementSpec.java	(revision 587)
+++ /trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElementSpec.java	(revision 588)
@@ -19,17 +19,17 @@
 
     /** */
-    private String name;
+    private String name = null;
     
     /** */
-    private String type;
+    private String type = null;
     
     /** */
-    private String icon;
+    private String icon = null;
     
     /** */
-    private int index;
+    private int index = -1;
     
     /** */
-    private int elementHash;
+    private String elementHash = null;
     
     /* (non-Javadoc)
@@ -67,5 +67,5 @@
         }
 
-        if (elementHash == otherSpec.elementHash) {
+        if (elementHash == otherSpec.elementHash || ((elementHash!=null) && elementHash.equals(otherSpec.elementHash))) {
             result += 15;
         }
@@ -129,5 +129,5 @@
      * @return the elementHash
      */
-    public int getElementHash() {
+    public String getElementHash() {
         return elementHash;
     }
@@ -164,5 +164,5 @@
      * @param elementHash the elementHash to set
      */
-    public void setElementHash(int elementHash) {
+    public void setElementHash(String elementHash) {
         this.elementHash = elementHash;
     }