--- a/UIPainter.st	Fri May 16 09:19:47 2014 +0200
+++ b/UIPainter.st	Fri May 16 17:58:43 2014 +0200
@@ -20,6 +20,13 @@
 	category:'Interface-UIPainter'
 !
 
+Query subclass:#ApplicationClassQuery
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:UIPainter
+!
+
 SelectionInTreeView subclass:#TreeView
 	instanceVariableNames:'lastDrawnMaster canvasEventsDisabled windowSpec windowSpecClass
 		painter'
@@ -2910,6 +2917,12 @@
       )
 ! !
 
+!UIPainter class methodsFor:'private class access'!
+
+applicationClassQuery
+    ^ ApplicationClassQuery
+! !
+
 !UIPainter methodsFor:'aspects'!
 
 alignToGridHolder
@@ -4019,13 +4032,15 @@
     ifFalse:[self isHelpToolSelected   ifTrue:[tool := helpTool   ]
     ifFalse:[
         tool := specTool.
-        tool notNil ifTrue:[ 
-            "/ the spectool needs to know, in which nameSpace the application class is located, to find out
-            "/ how to resolve short majorKeys...
-            UISpecification uiMajorKeyBindingNameSpaceQuery 
-                answer:(specClass notNil ifTrue:[specClass nameSpace] ifFalse:Smalltalk)
-                do:[
-                    specTool selection:tabSelection 
+        tool notNil ifTrue:[
+            ApplicationClassQuery answer:specClass do:[
+                    "/ the spectool needs to know, in which nameSpace the application class is located, to find out
+                    "/ how to resolve short majorKeys...
+                    UISpecification uiMajorKeyBindingNameSpaceQuery 
+                        answer:(specClass notNil ifTrue:[specClass nameSpace] ifFalse:Smalltalk)
+                        do:[
+                            specTool selection:tabSelection 
+                        ].
                 ].
         ].
     ]].
@@ -6055,6 +6070,12 @@
     "Modified: / 05-09-2012 / 19:24:40 / cg"
 ! !
 
+!UIPainter::ApplicationClassQuery class methodsFor:'documentation'!
+
+documentation
+    "This Query answers the application class, that is currently being edited"
+! !
+
 !UIPainter::TreeView class methodsFor:'documentation'!
 
 documentation