Index: /trunk/quest-plugin-jfc/data/guimappings/guimapping-freemind.txt
===================================================================
--- /trunk/quest-plugin-jfc/data/guimappings/guimapping-freemind.txt	(revision 810)
+++ /trunk/quest-plugin-jfc/data/guimappings/guimapping-freemind.txt	(revision 811)
@@ -1,15 +1,9 @@
-freemind.main.FreeMind = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
+freemind.main.FreeMind = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCFrame
 freemind.controller.MainToolBar = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCToolBar
 freemind.modes.mindmapmode.MindMapToolBar = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCToolBar
-javax.swing.Popup$HeavyWeightWindow = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
-javax.swing.JPopupMenu = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenu
-javax.swing.JMenuItem = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
-javax.swing.JOptionPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
-javax.swing.JSplitPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCSplitPane
 freemind.view.mindmapview.MapView$ScrollPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCScrollPane
-freemind.view.mindmapview.MapView = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
-freemind.view.mindmapview.NodeView = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
-freemind.view.mindmapview.RootMainView = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+freemind.view.mindmapview.MapView = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCCanvas
+freemind.view.mindmapview.NodeView = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCShape
+freemind.view.mindmapview.RootMainView = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCShape
 freemind.controller.MenuBar = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenuBar
-freemind.view.mindmapview.ForkMainView = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
-freemind.modes.FreeMindJFileDialog = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement
+freemind.view.mindmapview.ForkMainView = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCShape
Index: /trunk/quest-plugin-jfc/data/guimappings/guimapping-swing.txt
===================================================================
--- /trunk/quest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 810)
+++ /trunk/quest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 811)
@@ -8,6 +8,6 @@
 javax.swing.JMenu$1 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenu
 javax.swing.JMenuItem = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenu
+javax.swing.JOptionPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCDialog
 javax.swing.JPanel = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-javax.swing.Popup$HeavyWeightWindow = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCDialog
 javax.swing.JPopupMenu = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenu
 javax.swing.JPopupMenu$1 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenu
@@ -16,4 +16,5 @@
 javax.swing.JScrollPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCScrollPane
 javax.swing.JScrollPane$ScrollBar = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCScrollBar
+javax.swing.JSplitPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCSplitPane
 javax.swing.JTabbedPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTabbedPane
 javax.swing.JTable = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTable
@@ -22,4 +23,5 @@
 javax.swing.JToolBar$1 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCToolBar
 javax.swing.JViewport = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
+javax.swing.Popup$HeavyWeightWindow = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCDialog
 javax.swing.plaf.basic.BasicComboBoxEditor$BorderlessTextField = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextField
 javax.swing.plaf.basic.BasicComboPopup$1 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenu