hg/stx-libbasic: comparison Class.st

equal deleted inserted replaced

-:e3c8dbff09b0
+:d8f2044c6634
 hereby transferred.
 "
 ClassDescription subclass:#Class
 	 instanceVariableNames:'classvars comment subclasses classFilename package revision
-history'
+		history'
 	 classVariableNames:'UpdatingChanges LockChangesFile FileOutErrorSignal
-CatchMethodRedefinitions MethodRedefinitionSignal
+		CatchMethodRedefinitions MethodRedefinitionSignal
-UpdateChangeFileQuerySignal'
+		UpdateChangeFileQuerySignal'
 	 poolDictionaries:''
 	 category:'Kernel-Classes'
 !
 !Class class methodsFor:'documentation'!
 revisionInfoFromString:aString
 "return a dictionary filled with revision info.
 This extracts the relevant info from aString."
-|words info nm|
+|words info nm mgr|
 info := IdentityDictionary new.
 words := aString asCollectionOfWords.
 "/
 ].
 "/
 "/ mhmh - maybe its some other source code system
 "/
-SourceCodeManager notNil ifTrue:[
+(mgr := Smalltalk at:SourceCodeManager) notNil ifTrue:[
-	^ SourceCodeManager revisionInfoFromString:aString
+	^ mgr revisionInfoFromString:aString
 ].
 ^ nil
 "Created: 15.11.1995 / 14:58:35 / cg"
+"Modified: 7.12.1995 / 13:21:40 / cg"
 ! !
 !Class methodsFor:'ST/V subclass creation'!
 subclass:t instanceVariableNames:f classVariableNames:d poolDictionaries:s
 aStream close.
 OperatingSystem removeFile:'__temp'.
 ^ code
 !
+sourceCodeManager
+"return my source code manager.
+For now, all classes return the same global manager.
+But future versions may support mixed reporitories"
+^ Smalltalk at:#SourceCodeManager
+"Created: 7.12.1995 / 13:16:46 / cg"
+!
 sourceStream
 "return an open stream on my sourcefile, nil if that is not available"
-|source fileName aStream cls|
+|source fileName aStream cls mgr|
 self isMeta ifTrue:[
 	cls := self soleInstance
 ] ifFalse:[
 	cls := self
 "/
 "/ if there is no SourceCodeManager, look in
 "/ standard places first
 "/
-SourceCodeManager isNil ifTrue:[
+(mgr := self sourceCodeManager) isNil ifTrue:[
 	fileName := Smalltalk getSourceFileName:source.
 	fileName notNil ifTrue:[
 	    aStream := fileName asFilename readStream.
 	]
 ].
 	"/ If there is a SourceCodeManager, ask it to aquire the
 	"/ the source for my class, and return an open stream on it.
 	"/ if that one does not know about the source, look in
 	"/ standard places
-	SourceCodeManager notNil ifTrue:[
+	mgr notNil ifTrue:[
-	    aStream := SourceCodeManager sourceStreamFor:cls.
+	    aStream := mgr sourceStreamFor:cls.
 	    aStream isNil ifTrue:[
 		fileName := Smalltalk getSourceFileName:cls name.
 		fileName notNil ifTrue:[
 		    aStream := fileName asFilename readStream.
 		]
 Clock sourceStream
 Autoload sourceStream
 "
 "Created: 10.11.1995 / 21:05:13 / cg"
-"Modified: 25.11.1995 / 16:55:17 / cg"
+"Modified: 7.12.1995 / 13:21:16 / cg"
 ! !
 !Class methodsFor:'adding/removing'!
 addSelector:newSelector withMethod:newMethod
 revisionInfo
 "return a dictionary filled with revision info.
 This extracts the relevant info from the revisionString.
 The revisionInfo contains all or a subset of:
-#binaryRevision - the revision upon which the binary of this class is based
+	#binaryRevision - the revision upon which the binary of this class is based
-#revision       - the revision upon which the class is based logically
+	#revision       - the revision upon which the class is based logically
-(different, if a changed class was checked in, but not yet recompiled)
+			  (different, if a changed class was checked in, but not yet recompiled)
-#user           - the user who checked in the logical revision
+	#user           - the user who checked in the logical revision
-#date           - the date when the logical revision was checked in
+	#date           - the date when the logical revision was checked in
-#time           - the time when the logical revision was checked in
+	#time           - the time when the logical revision was checked in
-#fileName       - the classes source file name
+	#fileName       - the classes source file name
-#repositoryPath - the classes source container
+	#repositoryPath - the classes source container
 "
 |vsnString info|
 vsnString := self revisionString.
 vsnString notNil ifTrue:[
-info := Class revisionInfoFromString:vsnString.
+	info := Class revisionInfoFromString:vsnString.
-info at:#binaryRevision put:revision.
+	info at:#binaryRevision put:revision.
 ].
 ^ info
 "
 Object revisionString
 |cls vs m idx leftPart rightPart vsnString newVsn|
 cls := self.
 self isMeta ifFalse:[
-cls := self class
+	cls := self class
 ].
 m := cls compiledMethodAt:#version.
 m isNil ifTrue:[^ false].
 vs := self revisionString.
 vs isNil ifTrue:[^ false].
 idx == 0 ifTrue:[^ false].
 vsnString := rightPart copyTo:idx - 1.
 rightPart := rightPart copyFrom:idx + 1.
 newRevision isNil ifTrue:[
-(vsnString endsWith:'mod') ifTrue:[
+	(vsnString endsWith:'mod') ifTrue:[
-"/ alread a modified class
+	     "/ alread a modified class
 "/            ('already modified: ' , vsnString) printNL.
-^ false
+	    ^ false
-].
+	].
-newVsn := vsnString , 'mod'
+	newVsn := vsnString , 'mod'
 ] ifFalse:[
-newVsn := newRevision
+	newVsn := newRevision
 ].
 m source:'version
-^ ''' , leftPart , ' ' , newVsn , ' ' , rightPart , ''''.
+^ ''' , leftPart , ' ' , newVsn , ' ' , rightPart , '''
+'.
 "/ ('updated to :' , newVsn) printNL.
 cls recompile:#version.
 ^ true
 "Created: 29.10.1995 / 19:25:15 / cg"
-"Modified: 7.12.1995 / 12:29:01 / cg"
+"Modified: 7.12.1995 / 13:12:21 / cg"
 ! !
 !Class methodsFor:'queries'!
 allCategories
 ! !
 !Class class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.96 1995-12-07 11:46:07 cg Exp $'! !
+^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.97 1995-12-07 15:15:02 cg Exp $'! !
 Class initialize!

changeset 689	d8f2044c6634
parent 686	5cde213f9093
child 702	6a5a2ebff51b