--- a/UIPainter.st	Tue Jan 28 21:48:47 2014 +0100
+++ b/UIPainter.st	Tue Jan 28 21:58:50 2014 +0100
@@ -5046,9 +5046,13 @@
             generateActionMethodFor:aspect 
             spec:nil 
             inClass:cls.
-        code readStream fileIn.
+        Class packageQuerySignal answer:painter targetClass package do:[
+            code readStream fileIn.
+        ].
     ].
     UserPreferences current systemBrowserClass openInClass:cls selector:aspect
+
+    "Modified: / 28-01-2014 / 21:55:56 / cg"
 !
 
 doBrowseAspectMethod:aspectSelector
@@ -5400,15 +5404,23 @@
         |code|
 
         code := self painter generateAspectMethodCode.
-        code readStream fileIn.
+        Class packageQuerySignal answer:painter targetClass package do:[
+            code readStream fileIn.
+        ]
     ]
+
+    "Modified: / 28-01-2014 / 21:56:03 / cg"
 !
 
 doGenerateAspectMethodsForAll:selectorsToGenerateCode
     |code|
 
     code := self painter generateAspectMethodCodeFiltering:selectorsToGenerateCode.
-    code readStream fileIn.
+    Class packageQuerySignal answer:painter targetClass package do:[
+        code readStream fileIn.
+    ]
+
+    "Modified: / 28-01-2014 / 21:56:06 / cg"
 !
 
 doGenerateAspectSelectorsMethod
@@ -5419,8 +5431,12 @@
     self askForSectionModification.
     aspectSelectorsAsString := self painter generateAspectSelectorsMethod.
     aspectSelectorsAsString notEmptyOrNil ifTrue:[
-        (ReadStream on:aspectSelectorsAsString) fileIn.
-    ].
+        Class packageQuerySignal answer:painter targetClass package do:[
+            (ReadStream on:aspectSelectorsAsString) fileIn.
+        ].
+    ].
+
+    "Modified: / 28-01-2014 / 21:56:09 / cg"
 !
 
 doGenerateHookMethods
@@ -5428,8 +5444,11 @@
 
     self askForSectionModification.
 
-    (ReadStream on:self painter generateHookMethods) fileIn.
-
+    Class packageQuerySignal answer:painter targetClass package do:[
+        (ReadStream on:painter generateHookMethods) fileIn.
+    ]
+
+    "Modified: / 28-01-2014 / 21:56:13 / cg"
 !
 
 doGenerateMenuMethods
@@ -5437,9 +5456,11 @@
 
     self askForSectionModification.
 
-    (ReadStream on:self painter generateMenuMethods) fileIn.
-
-    "Created: / 23.8.1998 / 16:10:04 / cg"
+    Class packageQuerySignal answer:painter targetClass package do:[
+        (ReadStream on:painter generateMenuMethods) fileIn.
+    ]
+
+    "Created: / 23-08-1998 / 16:10:04 / cg"
 !
 
 doInspectSpec
@@ -5669,7 +5690,9 @@
     ].
 
     code := painter generateWindowSpecMethodSource withCRs.
-    (ReadStream on:code) fileIn.
+    Class packageQuerySignal answer:specClass package do:[
+        (ReadStream on:code) fileIn.
+    ].
     self doGenerateAspectSelectorsMethod.
     self helpTool doSave.
     self updateInfoLabel.
@@ -5678,6 +5701,8 @@
     (specClass respondsTo:specSelector) ifTrue:[
         self addHistoryEntryForClass:specClass selector:specSelector.
     ].
+
+    "Modified: / 28-01-2014 / 21:52:32 / cg"
 !
 
 doSaveAs
@@ -5751,8 +5776,12 @@
 
     fullSpec := treeView generateFullSpecForComponents:(Array with:spec) named:subSpecSelector asUppercaseFirst.
     code := painter generateWindowSpecMethodSourceFor:fullSpec class:subSpecClassName selector:subSpecSelector.
-    (ReadStream on:code) fileIn.
+    Class packageQuerySignal answer:subSpecClass package do:[
+        (ReadStream on:code) fileIn.
+    ].
     ^ true
+
+    "Modified: / 28-01-2014 / 21:53:35 / cg"
 !
 
 doSelectAspectMethod:aspectSelector