--- a/ProjectDefinition.st Fri Jan 20 15:38:38 2012 +0100
+++ b/ProjectDefinition.st Fri Jan 20 15:43:06 2012 +0100
@@ -4731,7 +4731,7 @@
|abbrevs|
AccessLock critical:[
- |mustRead file|
+ |mustRead file myPackageDirectory|
AbbrevDictionary isNil ifTrue:[
AbbrevDictionary := WeakIdentityDictionary new.
@@ -4741,15 +4741,19 @@
abbrevs := AbbrevDictionary at:self ifAbsent:[ mustRead := true. Dictionary new ].
mustRead ifTrue:[
- file := self packageDirectory / 'abbrev.stc'.
- file exists ifTrue: [
- file readingFileDo:[:stream |
- Smalltalk
- withAbbreviationsFromStream:stream
- do:[:nm :fn :pkg :cat :sz|
- abbrevs at: nm put: (AbbrevEntry new className:nm fileName:fn category:cat numClassInstVars:sz)
- ]
- ]
+ myPackageDirectory := self packageDirectory.
+ myPackageDirectory isNil ifTrue:[
+ ] ifFalse:[
+ file := myPackageDirectory / 'abbrev.stc'.
+ file exists ifTrue: [
+ file readingFileDo:[:stream |
+ Smalltalk
+ withAbbreviationsFromStream:stream
+ do:[:nm :fn :pkg :cat :sz|
+ abbrevs at: nm put: (AbbrevEntry new className:nm fileName:fn category:cat numClassInstVars:sz)
+ ]
+ ]
+ ].
].
].
].
@@ -4757,7 +4761,7 @@
^abbrevs
"Created: / 06-03-2011 / 18:25:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-08-2011 / 14:24:15 / cg"
+ "Modified: / 20-01-2012 / 15:42:47 / cg"
!
additionalClassAttributesFor: aClass
@@ -6651,11 +6655,11 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.378 2012-01-19 16:27:09 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.379 2012-01-20 14:43:06 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.378 2012-01-19 16:27:09 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.379 2012-01-20 14:43:06 cg Exp $'
!
version_SVN