--- a/Method.st	Tue Mar 16 21:16:41 2004 +0100
+++ b/Method.st	Wed Mar 17 11:13:55 2004 +0100
@@ -1715,14 +1715,28 @@
     "try to open a stream from a local source file,
      searching in standard places."
 
-    |fileName aStream|
+    |dir fileName aStream|
 
     package notNil ifTrue:[
+        "/
+        "/ old: look in 'source/<filename>'
+        "/ this is still kept in order to find user-private
+        "/ classes in her currentDirectory.
+        "/
         fileName := Smalltalk getSourceFileName:(package copyReplaceAll:$: with:$/) , '/' , source.
         fileName notNil ifTrue:[
             aStream := fileName asFilename readStreamOrNil.
             aStream notNil ifTrue:[^ aStream].
         ].
+        "/
+        "/ new: look in package-dir
+        "/
+        dir := Smalltalk getPackageDirectoryForPackage:package.
+        dir notNil ifTrue:[
+            fileName := dir construct:source.
+            aStream := fileName asFilename readStreamOrNil.
+            aStream notNil ifTrue:[^ aStream].
+        ].
     ].
     fileName := Smalltalk getSourceFileName:source.
     fileName notNil ifTrue:[
@@ -2899,7 +2913,7 @@
 !Method class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.269 2004-03-12 12:46:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.270 2004-03-17 10:13:55 ca Exp $'
 ! !
 
 Method initialize!