Index: trunk/autoquest-plugin-jfc/data/guimappings/guimapping-argouml.txt
===================================================================
--- trunk/autoquest-plugin-jfc/data/guimappings/guimapping-argouml.txt	(revision 922)
+++ trunk/autoquest-plugin-jfc/data/guimappings/guimapping-argouml.txt	(revision 1052)
@@ -15,4 +15,6 @@
 org.argouml.ui.ArgoJMenu = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenu
 org.argouml.ui.DetailsPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.ui.DisplayTextTree = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTree
+org.argouml.ui.HeapMonitor = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 org.argouml.ui.HelpBox = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
 org.argouml.ui.MenuBar14 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenuBar
@@ -21,8 +23,11 @@
 org.argouml.ui.ProjectBrowser = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCFrame
 org.argouml.ui.SettingsDialog = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
+org.argouml.ui.SplashScreen = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
+org.argouml.ui.SplashPanel$1 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 org.argouml.ui.explorer.DnDExplorerTree = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTree
 org.argouml.ui.explorer.PerspectiveComboBox = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCComboBox
 org.argouml.uml.diagram.ui.DnDJGraph = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCCanvas
 org.argouml.uml.diagram.ui.TabDiagram = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.uml.ui.UMLDeprecatedCheckBox = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCCheckBox
 org.argouml.uml.ui.TabDocumentation = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 org.argouml.uml.ui.TabStereotype = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
@@ -31,4 +36,5 @@
 org.argouml.uml.ui.UMLEditableComboBox$UMLComboBoxEditor$UMLImagePanel = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 org.argouml.uml.ui.UMLLinkedList = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCListBox
+org.argouml.uml.ui.UMLStereotypeList = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCListBox
 org.argouml.uml.ui.UMLTextArea2 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextArea
 org.tigris.gef.graph.presentation.JGraphInternalPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCCanvas
Index: trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt
===================================================================
--- trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 922)
+++ trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 1052)
@@ -1,7 +1,11 @@
+javax.swing.Box$Filler = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+javax.swing.CellRendererPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 javax.swing.JButton = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCButton
+javax.swing.JCheckBox = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCCheckBox
 javax.swing.JComboBox = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCComboBox
 javax.swing.JDialog = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
 javax.swing.JEditorPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextArea
 javax.swing.JFileChooser = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
+javax.swing.JLabel = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCText
 javax.swing.JLayeredPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 javax.swing.JMenu = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenu
@@ -12,8 +16,10 @@
 javax.swing.JPopupMenu = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenu
 javax.swing.JPopupMenu$1 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenu
+javax.swing.JProgressBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCProgressBar
 javax.swing.JRadioButton = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCRadioButton
 javax.swing.JRootPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 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.JSeparator = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCShape
 javax.swing.JSplitPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCSplitPane
 javax.swing.JTabbedPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTabbedPane
@@ -21,5 +27,8 @@
 javax.swing.JTextArea = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextArea
 javax.swing.JTextField = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextField
+javax.swing.JToolBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCToolBar
 javax.swing.JToolBar$1 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCToolBar
+javax.swing.JToolBar$Separator = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCShape
+javax.swing.JToolTip = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 javax.swing.JViewport = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 javax.swing.Popup$HeavyWeightWindow = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
@@ -30,4 +39,6 @@
 javax.swing.plaf.metal.MetalFileChooserUI$3 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextField
 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.table.JTableHeader = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 sun.swing.FilePane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
 sun.swing.FilePane$3 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel