Index: trunk/autoquest-plugin-jfc/data/guimappings/guimapping-jedit.txt
===================================================================
--- trunk/autoquest-plugin-jfc/data/guimappings/guimapping-jedit.txt	(revision 1737)
+++ trunk/autoquest-plugin-jfc/data/guimappings/guimapping-jedit.txt	(revision 1737)
@@ -0,0 +1,6 @@
+sun.awt.X11.XTrayIconPeer$XTrayIconEmbeddedFrame = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCFrame
+sun.awt.X11.XTrayIconPeer$TrayIconCanvas = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCCanvas
+org.gjt.sp.jedit.textarea.JEditTextArea = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextArea
+org.gjt.sp.jedit.textarea.TextAreaPainter = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.gjt.sp.jedit.textarea.Gutter = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.gjt.sp.jedit.gui.statusbar.MemoryStatusWidgetFactory$MemoryStatus = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
Index: trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt
===================================================================
--- trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 1566)
+++ trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 1737)
@@ -1,2 +1,3 @@
+javax.swing.Box = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 javax.swing.Box$Filler = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 javax.swing.CellRendererPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
@@ -12,4 +13,5 @@
 javax.swing.JMenu = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenu
 javax.swing.JMenu$1 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenu
+javax.swing.JMenuBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenu
 javax.swing.JMenuItem = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenuButton
 javax.swing.JOptionPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
@@ -22,4 +24,5 @@
 javax.swing.JScrollPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCScrollPane
 javax.swing.JScrollPane$ScrollBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCScrollBar
+javax.swing.JScrollBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCScrollBar
 javax.swing.JSeparator = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCShape
 javax.swing.JSplitPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCSplitPane
@@ -34,4 +37,5 @@
 javax.swing.JToolTip = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 javax.swing.JViewport = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+javax.swing.JWindow = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCFrame
 javax.swing.Popup$HeavyWeightWindow = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
 javax.swing.plaf.basic.BasicComboBoxEditor$BorderlessTextField = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextField