hg/stx-libtool: comparison BrwsrView.st

equal deleted inserted replaced

-:037323660c45
+:d78f92a07d5d
 BrowserView comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
 	     All Rights Reserved
-$Header: /cvs/stx/stx/libtool/Attic/BrwsrView.st,v 1.1 1995-03-06 19:30:54 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/BrwsrView.st,v 1.2 1995-03-09 03:30:40 claus Exp $
 '!
 !BrowserView class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libtool/Attic/BrwsrView.st,v 1.1 1995-03-06 19:30:54 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/BrwsrView.st,v 1.2 1995-03-09 03:30:40 claus Exp $
 "
 !
 documentation
 "
 listOfAllMethodCategoriesInClass:aClass
 "answer a list of all method categories of the argument, aClass"
 |newList|
-newList := OrderedCollection new.
+newList := Set new.
 aClass methodArray do:[:aMethod |
 	|cat|
 	cat := aMethod category.
 	cat isNil ifTrue:[
 	    cat := '* no category *'
 	].
-	(newList includes:cat) ifFalse:[newList add:cat]
+	newList add:cat
 ].
 (newList size == 0) ifTrue:[^ nil].
 newList add:'* all *'.
-^ newList sort
+^ newList asOrderedCollection sort
 !
 methodCategorySelection:lineNr
 "user clicked on a method category line - show selectors"
 and all of its superclasses.
 Used with fullProtocol browsing."
 |newList|
-newList := OrderedCollection new.
+newList := Set new.
 self classesInFullProtocolHierarchy:aClass do:[:c |
 	|cat|
 	c methodArray do:[:aMethod |
 	    cat := aMethod category.
 	    cat isNil ifTrue:[
 		cat := '* no category *'
 	    ].
-	    (newList includes:cat) ifFalse:[newList add:cat]
+	    newList add:cat
 	]
 ].
 (newList size == 0) ifTrue:[^ nil].
 newList add:'* all *'.
-^ newList sort
+^ newList asOrderedCollection sort
 !
 checkMethodCategorySelected
 currentMethodCategory isNil ifTrue:[
 	self warn:'select a method category first'.
 			changedMethod isNil ifTrue:[
 			    self warnLabel:'the method shown was removed'.
 			    ^ self
 			].
 			"compare the source codes"
-			self warnLabel:'the code shown may not up to date'.
+			currentMethod notNil ifTrue:[
+			    changedMethod source = codeView contents ifFalse:[
+				self warnLabel:'the code shown may not up to date'.
+			    ]
+			].
 			^ self
 		    ].
 		    ^ self
 		]
 	    ].
 !
 listOfAllClassesInCategory:aCategory
 "return a list of all classes in a given category"
-|newList classList searchCategory string|
+|newList classes searchCategory nm|
-newList := OrderedCollection new.
+(aCategory = '* hierarchy *') ifTrue:[
+	newList := OrderedCollection new.
+	classes := Set new.
+	self classHierarchyDo:[:aClass :lvl|
+	    nm := aClass name.
+	    (classes includes:nm) ifFalse:[
+		classes add:nm.
+		newList add:(String new:lvl) , nm
+	    ]
+	].
+	^ newList
+].
+newList := Set new.
 (aCategory = '* all *') ifTrue:[
 	Smalltalk allBehaviorsDo:[:aClass |
-	    string := aClass name.
+	    newList add:aClass name
-	    newList indexOf:string ifAbsent:[newList add:string]
 	]
 ] ifFalse:[
-	(aCategory = '* hierarchy *') ifTrue:[
+	(aCategory = '* no category *') ifTrue:[
-	    classList := OrderedCollection new.
+	    searchCategory := nil
-	    self classHierarchyDo:[:aClass :lvl|
+	] ifFalse:[
-		string := aClass name.
+	    searchCategory := aCategory
-		classList indexOf:string ifAbsent:[
+	].
-		    classList add:string.
+	Smalltalk allBehaviorsDo:[:aClass |
-		    newList add:(String new:lvl) , string
+	    aClass isMeta ifFalse:[
+		(aClass category = searchCategory) ifTrue:[
+		    newList add:aClass name
 		]
-	    ].
-	    ^ newList
-	] ifFalse:[
-	    (aCategory = '* no category *') ifTrue:[
-		searchCategory := nil
-	    ] ifFalse:[
-		searchCategory := aCategory
-	    ].
-	    Smalltalk allBehaviorsDo:[:aClass |
-		aClass isMeta ifFalse:[
-		    (aClass category = searchCategory) ifTrue:[
-			string := aClass name.
-			newList indexOf:string ifAbsent:[newList add:string]
-		    ]
-		]
 	    ]
 	]
 ].
 (newList size == 0) ifTrue:[^ nil].
-^ newList sort
+^ newList asOrderedCollection sort
 !
 classSelection:lineNr
 "user clicked on a class line - show method categories"
 ] ifFalse:[
 	nm := 'Object'
 ].
 cat := currentClassCategory.
 cat isNil ifTrue:[
-	cat := 'no category'
+	cat := '* no category *'
 ].
 self classClassDefinitionTemplateFor:nm in:cat.
 aspect := nil.
 !
 !
 classLoad
 "load an autoloaded class"
+|nm|
 self checkClassSelected ifFalse:[^ self].
+nm := currentClass name.
+currentClass autoload.
+self switchToClassNamed:nm
+!
+classUnload
+"unload an autoloaded class"
+|nm|
+self checkClassSelected ifFalse:[^ self].
+nm := currentClass name.
 currentClass unload.
-self switchToClassNamed:currentClass name
+self switchToClassNamed:nm
-!
-classUnload
-"load an autoloaded class"
-self checkClassSelected ifFalse:[^ self].
-currentClass unload.
-self switchToClassNamed:currentClass name
 !
 classProtocols
 ^ self
 !
 "answer a list of all method categories of the argument, aClass,
 and all of its superclasses"
 |newList cat|
-newList := OrderedCollection new.
+newList := Set new.
 self classesInHierarchy:aClass do:[:c |
 	c methodArray do:[:aMethod |
 	    cat := aMethod category.
 	    cat isNil ifTrue:[
 		cat := '* no category *'
 	    ].
-	    (newList includes:cat) ifFalse:[newList add:cat]
+	    newList add:cat
 	]
 ].
 (newList size == 0) ifTrue:[^ nil].
 newList add:'* all *'.
-^ newList sort
+^ newList asOrderedCollection sort
 ! !
 !BrowserView methodsFor:'class category stuff'!
 listOfAllClassCategories
 "return a list of all class categories"
 |newList cat|
-newList := OrderedCollection with:'* all *' with:'* hierarchy *'.
+newList := Set with:'* all *' with:'* hierarchy *'.
 Smalltalk allBehaviorsDo:[:aClass |
 	cat := aClass category.
 	cat isNil ifTrue:[
 	    cat := '* no category *'
 	].
-	newList indexOf:cat ifAbsent:[newList add:cat]
+	newList add:cat
 ].
-^ newList asArray sort.
+^ newList asOrderedCollection sort.
 !
 classCategorySelectionChanged
 "class category has changed - update dependent views"
 box := self enterBoxTitle:'name of new class category:' okText:'create'.
 box action:[:aString |
 	|categories|
 	currentClass notNil ifTrue:[
-	    categories := OrderedCollection new.
+	    categories := Set new.
 	    currentClass withAllSuperclasses do:[:aClass |
 		aClass methodArray do:[:aMethod |
-		    (categories includes:aMethod category) ifFalse:[
+		    categories add:aMethod category
-			categories add:aMethod category
-		    ]
 		]
 	    ].
+	    categories := categories asOrderedCollection
 	].
 	categories isNil ifTrue:[
 	    categories := classCategoryListView list.
 	].
 	(categories includes:aString) ifFalse:[

changeset 79	d78f92a07d5d
parent 74	f2c56efa3599
child 81	b3b4d34c5ada