Index: trunk/autoquest-plugin-jfc/data/guimappings/guimapping-freemind.txt
===================================================================
--- trunk/autoquest-plugin-jfc/data/guimappings/guimapping-freemind.txt	(revision 1084)
+++ trunk/autoquest-plugin-jfc/data/guimappings/guimapping-freemind.txt	(revision 1097)
@@ -1,4 +1,8 @@
+freemind.controller.MainToolBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCToolBar
+freemind.controller.MenuBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenuBar
 freemind.main.FreeMind = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCFrame
-freemind.controller.MainToolBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCToolBar
+freemind.main.FreeMindSplashModern = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCFrame
+freemind.main.FreeMindSplashModern$1 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+freemind.modes.FreeMindJFileDialog = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
 freemind.modes.mindmapmode.MindMapToolBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCToolBar
 freemind.view.mindmapview.MapView$ScrollPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCScrollPane
@@ -6,5 +10,5 @@
 freemind.view.mindmapview.NodeView = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCShape
 freemind.view.mindmapview.RootMainView = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCShape
-freemind.controller.MenuBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenuBar
 freemind.view.mindmapview.ForkMainView = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCShape
-freemind.modes.FreeMindJFileDialog = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
+
+com.lightdev.app.shtm.SHTMLMenuBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenuBar
Index: trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt
===================================================================
--- trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 1084)
+++ trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 1097)
@@ -27,4 +27,5 @@
 javax.swing.JTextArea = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextArea
 javax.swing.JTextField = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextField
+javax.swing.JToggleButton = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCButton
 javax.swing.JToolBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCToolBar
 javax.swing.JToolBar$1 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCToolBar
@@ -40,4 +41,5 @@
 javax.swing.plaf.metal.MetalScrollButton = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCScrollBar
 javax.swing.plaf.metal.MetalSplitPaneDivider = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCShape
+javax.swing.plaf.synth.SynthSplitPaneDivider = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCShape
 javax.swing.table.JTableHeader = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 sun.swing.FilePane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
Index: trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCReplayIDCalculator.java
===================================================================
--- trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCReplayIDCalculator.java	(revision 1084)
+++ trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCReplayIDCalculator.java	(revision 1097)
@@ -163,5 +163,5 @@
 		
 		IEventTarget target = event.getTarget();
-		if (!target.getPlatform().equals("JFC")){
+		if (!"JFC".equals(target.getPlatform())) {
 			throw new IllegalArgumentException("Event target must be of type JFC.");
 		}