Index: trunk/autoquest-plugin-jfc/data/guimappings/guimapping-argouml.txt
===================================================================
--- trunk/autoquest-plugin-jfc/data/guimappings/guimapping-argouml.txt	(revision 906)
+++ trunk/autoquest-plugin-jfc/data/guimappings/guimapping-argouml.txt	(revision 922)
@@ -1,43 +1,43 @@
-org.argouml.cognitive.checklist.ui.TabChecklist = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.cognitive.ui.TabToDo = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.cognitive.ui.WizDescription = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.core.propertypanels.ui.LabelledComponent = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.core.propertypanels.ui.OldScrollList = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCScrollPane
-org.argouml.core.propertypanels.ui.ScrollListImpl = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCScrollPane
-org.argouml.core.propertypanels.ui.UMLComboBox = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCComboBox
-org.argouml.core.propertypanels.ui.UMLEditableComboBox$UMLComboBoxEditor$UMLImagePanel = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.core.propertypanels.ui.UMLExpressionBodyField = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextField
-org.argouml.core.propertypanels.ui.UMLExpressionLanguageField = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextField
-org.argouml.core.propertypanels.ui.UMLLinkedList = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCListBox
-org.argouml.core.propertypanels.ui.UMLMultiplicityPanel$MultiplicityCheckBox = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCCheckBox
-org.argouml.core.propertypanels.ui.UMLMutableLinkedList = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCListBox
-org.argouml.core.propertypanels.ui.UMLTextField = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextField
-org.argouml.ui.ArgoJMenu = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenu
-org.argouml.ui.DetailsPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.ui.HelpBox = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCDialog
-org.argouml.ui.MenuBar14 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenuBar
-org.argouml.ui.MultiEditorPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.ui.NavigatorPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.ui.ProjectBrowser = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCFrame
-org.argouml.ui.SettingsDialog = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCDialog
-org.argouml.ui.explorer.DnDExplorerTree = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTree
-org.argouml.ui.explorer.PerspectiveComboBox = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCComboBox
-org.argouml.uml.diagram.ui.DnDJGraph = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCCanvas
-org.argouml.uml.diagram.ui.TabDiagram = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.uml.ui.TabDocumentation = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.uml.ui.TabStereotype = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.uml.ui.TabTaggedValues = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.uml.ui.UMLComboBox2 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCComboBox
-org.argouml.uml.ui.UMLEditableComboBox$UMLComboBoxEditor$UMLImagePanel = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-org.argouml.uml.ui.UMLLinkedList = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCListBox
-org.argouml.uml.ui.UMLTextArea2 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextArea
-org.tigris.gef.graph.presentation.JGraphInternalPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCCanvas
-org.tigris.gef.presentation.FigTextEditor = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextField
-org.tigris.swidgets.ArrowButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCButton
-org.tigris.swidgets.BorderSplitPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCSplitPane
-org.tigris.swidgets.MultipleSplitPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCSplitPane
-org.tigris.swidgets.Splitter = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCSplitPane
-org.tigris.toolbar.ToolBar = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCToolBar
-org.tigris.toolbar.toolbutton.ModalButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCButton
-org.tigris.toolbar.toolbutton.PopupToolBoxButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenuButton
-org.argouml.core.propertypanels.ui.UMLExpressionLanguageField = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextField
+org.argouml.cognitive.checklist.ui.TabChecklist = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.cognitive.ui.TabToDo = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.cognitive.ui.WizDescription = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.core.propertypanels.ui.LabelledComponent = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.core.propertypanels.ui.OldScrollList = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCScrollPane
+org.argouml.core.propertypanels.ui.ScrollListImpl = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCScrollPane
+org.argouml.core.propertypanels.ui.UMLComboBox = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCComboBox
+org.argouml.core.propertypanels.ui.UMLEditableComboBox$UMLComboBoxEditor$UMLImagePanel = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.core.propertypanels.ui.UMLExpressionBodyField = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextField
+org.argouml.core.propertypanels.ui.UMLExpressionLanguageField = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextField
+org.argouml.core.propertypanels.ui.UMLLinkedList = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCListBox
+org.argouml.core.propertypanels.ui.UMLMultiplicityPanel$MultiplicityCheckBox = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCCheckBox
+org.argouml.core.propertypanels.ui.UMLMutableLinkedList = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCListBox
+org.argouml.core.propertypanels.ui.UMLTextField = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextField
+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.HelpBox = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
+org.argouml.ui.MenuBar14 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenuBar
+org.argouml.ui.MultiEditorPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.ui.NavigatorPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+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.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.TabDocumentation = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.uml.ui.TabStereotype = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.uml.ui.TabTaggedValues = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+org.argouml.uml.ui.UMLComboBox2 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCComboBox
+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.UMLTextArea2 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextArea
+org.tigris.gef.graph.presentation.JGraphInternalPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCCanvas
+org.tigris.gef.presentation.FigTextEditor = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextField
+org.tigris.swidgets.ArrowButton = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCButton
+org.tigris.swidgets.BorderSplitPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCSplitPane
+org.tigris.swidgets.MultipleSplitPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCSplitPane
+org.tigris.swidgets.Splitter = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCSplitPane
+org.tigris.toolbar.ToolBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCToolBar
+org.tigris.toolbar.toolbutton.ModalButton = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCButton
+org.tigris.toolbar.toolbutton.PopupToolBoxButton = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenuButton
+org.argouml.core.propertypanels.ui.UMLExpressionLanguageField = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextField
Index: trunk/autoquest-plugin-jfc/data/guimappings/guimapping-freemind.txt
===================================================================
--- trunk/autoquest-plugin-jfc/data/guimappings/guimapping-freemind.txt	(revision 906)
+++ trunk/autoquest-plugin-jfc/data/guimappings/guimapping-freemind.txt	(revision 922)
@@ -1,10 +1,10 @@
-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
-freemind.view.mindmapview.MapView$ScrollPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCScrollPane
-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.JFCShape
-freemind.modes.FreeMindJFileDialog = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCDialog
+freemind.main.FreeMind = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCFrame
+freemind.controller.MainToolBar = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCToolBar
+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
+freemind.view.mindmapview.MapView = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCCanvas
+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
Index: trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt
===================================================================
--- trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 906)
+++ trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt	(revision 922)
@@ -1,34 +1,34 @@
-javax.swing.JButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCButton
-javax.swing.JComboBox = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCComboBox
-javax.swing.JDialog = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCDialog
-javax.swing.JEditorPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextArea
-javax.swing.JFileChooser = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCDialog
-javax.swing.JLayeredPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-javax.swing.JMenu = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenu
-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.JPopupMenu = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenu
-javax.swing.JPopupMenu$1 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenu
-javax.swing.JRadioButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCRadioButton
-javax.swing.JRootPane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-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
-javax.swing.JTextArea = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextArea
-javax.swing.JTextField = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextField
-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
-javax.swing.plaf.metal.MetalComboBoxButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCButton
-javax.swing.plaf.metal.MetalFileChooserUI$1 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-javax.swing.plaf.metal.MetalFileChooserUI$3 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCTextField
-javax.swing.plaf.metal.MetalScrollButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCScrollBar
-sun.swing.FilePane = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-sun.swing.FilePane$3 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
-sun.swing.FilePane$4 = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCPanel
+javax.swing.JButton = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCButton
+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.JLayeredPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+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.JMenuItem = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenu
+javax.swing.JOptionPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
+javax.swing.JPanel = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+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.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.JSplitPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCSplitPane
+javax.swing.JTabbedPane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTabbedPane
+javax.swing.JTable = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTable
+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$1 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCToolBar
+javax.swing.JViewport = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+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
+javax.swing.plaf.basic.BasicComboPopup$1 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenu
+javax.swing.plaf.metal.MetalComboBoxButton = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCButton
+javax.swing.plaf.metal.MetalFileChooserUI$1 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+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
+sun.swing.FilePane = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+sun.swing.FilePane$3 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel
+sun.swing.FilePane$4 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCPanel