--- a/ResourcePack.st	Tue Feb 03 14:51:19 2004 +0100
+++ b/ResourcePack.st	Tue Feb 03 16:47:58 2004 +0100
@@ -197,22 +197,19 @@
     "get the full resource definitions for aClass (i.e. with super packs).
      Also leave the resulting pack in the cache for faster access next time."
 
-    |nm pack prjDir baseName|
+    |nm pack rsrcDir baseName|
 
     nm := aClass resourcePackName.
     pack := self searchCacheFor:nm.
     pack notNil ifTrue:[^ pack].
 
     baseName := (Smalltalk fileNameForClass:nm) , '.rs'.
-
-    "/ search in the classes package directory first ...
-    prjDir := Smalltalk projectDirectoryForClass:aClass.
+    rsrcDir := aClass resourceDirectory.
 
-    (prjDir notNil 
-    and:[(prjDir := prjDir asFilename) exists
-    and:[(prjDir := prjDir construct:'resources') exists
-    and:[(prjDir construct:baseName) exists]]]) ifTrue:[
-        pack := self fromFile:baseName directory:prjDir pathName.
+    (rsrcDir notNil 
+    and:[rsrcDir exists 
+    and:[(rsrcDir construct:baseName) exists]]) ifTrue:[
+        pack := self fromFile:baseName directory:rsrcDir pathName.
     ] ifFalse:[
         pack := self fromFile:baseName.
     ].
@@ -232,8 +229,6 @@
      ResourcePack for:NewLauncher 
      Workspace classResources
     "
-
-    "Modified: / 29.1.1998 / 22:42:53 / cg"
 !
 
 fromFile:aFileName
@@ -885,7 +880,7 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.80 2004-02-03 13:51:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.81 2004-02-03 15:47:58 cg Exp $'
 ! !
 
 ResourcePack initialize!