hg/stx-libtool: comparison ChangesBrowser.st

equal deleted inserted replaced

-:cff12ff7dc25
+:95e37428f3aa
 autoCompare onChangeSend:#autoCompareChanged to:self.
 autoUpdate := false asValue.
 autoloadAsRequired := false asValue.
 applyInOriginalNameSpace := true asValue.
 applyInOriginalNameSpace
-	onChangeEvaluate:[
+onChangeEvaluate:[
-	    autoCompare value ifTrue:[
+autoCompare value ifTrue:[
-		self doUpdate
+self doUpdate
-	    ].
+].
-	].
+].
 updateChangeSet := true "false" asValue.
 "
 checkBlock is executed by the Processor.
 We use #pushEvent: to perform the update
 in our windowgroups process.
 "
 checkBlock := [self pushEvent:#checkIfFileHasChanged].
 oldStyle ifFalse:[
-	menuPanel := MenuPanel in:self.
+menuPanel := MenuPanel in:self.
-	"/ menuPanel level:1.
+"/ menuPanel level:1.
-	menuPanel verticalLayout:false.
+menuPanel verticalLayout:false.
-	menuPanel receiver:self.
+menuPanel receiver:self.
-	menuPanel menu:(self pullDownMenu).
+menuPanel menu:(self pullDownMenu).
-	mH := menuPanel preferredExtent y.
+mH := menuPanel preferredExtent y.
-	menuPanel origin:(0.0 @ 0.0) corner:(1.0 @ (mH)).
+menuPanel origin:(0.0 @ 0.0) corner:(1.0 @ (mH)).
-	mH := mH + 1.
+mH := mH + 1.
 ] ifTrue:[
-	mH := 0.0
+mH := 0.0
 ].
 panel := VariableVerticalPanel origin:(0.0 @ mH)
-				   corner:(1.0 @ 1.0)
+corner:(1.0 @ 1.0)
-			      borderWidth:0
+borderWidth:0
-				       in:self.
+in:self.
 upperFrame := panel.
 oldStyle ifTrue:[
-	upperFrame := VariableHorizontalPanel origin:(0.0 @ 0.0) corner:(1.0 @ 0.3) in:panel.
+upperFrame := VariableHorizontalPanel origin:(0.0 @ 0.0) corner:(1.0 @ 0.3) in:panel.
 ].
 v := HVScrollableView for:SelectionInListView miniScrollerH:true in:upperFrame.
 oldStyle ifTrue:[
-	v origin:(0.0 @ 0.0) corner:(0.75 @ 1.0).
+v origin:(0.0 @ 0.0) corner:(0.75 @ 1.0).
 ] ifFalse:[
-	v origin:(0.0 @ 0.0) corner:(1.0 @ 0.3).
+v origin:(0.0 @ 0.0) corner:(1.0 @ 0.3).
 ].
 changeListView := v scrolledView.
 changeListView delegate:self.
 changeListView menuHolder:self; menuPerformer:self; menuMessage:#changeListMenu.
 changeListView doubleClickAction:[:line | self doubleClickOnChange:line].
 oldStyle ifFalse:[
-	changeListView multipleSelectOk:true.
+changeListView multipleSelectOk:true.
 ].
 oldStyle ifTrue:[
-	buttonPanel := VerticalPanelView in:upperFrame.
+buttonPanel := VerticalPanelView in:upperFrame.
-	buttonPanel origin:(0.75 @ 0.0) corner:(1.0 @ 1.0).
+buttonPanel origin:(0.75 @ 0.0) corner:(1.0 @ 1.0).
-	buttonPanel verticalLayout:#topSpace; horizontalLayout:#leftSpace.
+buttonPanel verticalLayout:#topSpace; horizontalLayout:#leftSpace.
-	checkBox := CheckBox new model:autoCompare.
+checkBox := CheckBox new model:autoCompare.
-	checkBox label:(resources string:'Auto Compare').
+checkBox label:(resources string:'Auto Compare').
-	checkBox action:[:val | autoCompare value:val].
+checkBox action:[:val | autoCompare value:val].
-	buttonPanel addSubView:checkBox.
+buttonPanel addSubView:checkBox.
-	checkBox := CheckBox new model:autoUpdate.
+checkBox := CheckBox new model:autoUpdate.
-	checkBox label:(resources string:'Auto Update').
+checkBox label:(resources string:'Auto Update').
-	checkBox action:[:val | autoUpdate value:val].
+checkBox action:[:val | autoUpdate value:val].
-	buttonPanel addSubView:checkBox.
+buttonPanel addSubView:checkBox.
-	checkBox := CheckBox new.
+checkBox := CheckBox new.
-	checkBox label:(resources string:'Apply in original NameSpace' withCRs).
+checkBox label:(resources stringWithCRs:'Apply in original NameSpace').
-	checkBox model:applyInOriginalNameSpace.
+checkBox model:applyInOriginalNameSpace.
-	buttonPanel addSubView:checkBox.
+buttonPanel addSubView:checkBox.
 ].
 "/    protectExistingMethods := CheckBox new.
 "/    protectExistingMethods label:(resources string:'Protect existing code' withCRs).
 "/    protectExistingMethods model:protectExistingMethods.
 diffViewBox := View in:codeViewBox.
 diffViewBox origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 lbl := Label label:'Current' in:diffViewBox.
 lbl layout:(LayoutFrame
-			leftFraction:0.0 offset:0
+leftFraction:0.0 offset:0
-			rightFraction:0.5 offset:0
+rightFraction:0.5 offset:0
-			topFraction:0.0 offset:0
+topFraction:0.0 offset:0
-			bottomFraction:0.0 offset:20).
+bottomFraction:0.0 offset:20).
 lbl := Label label:'Change' in:diffViewBox.
 lbl layout:(LayoutFrame
-			leftFraction:0.5 offset:0
+leftFraction:0.5 offset:0
-			rightFraction:1.0 offset:0
+rightFraction:1.0 offset:0
-			topFraction:0.0 offset:0
+topFraction:0.0 offset:0
-			bottomFraction:0.0 offset:20).
+bottomFraction:0.0 offset:20).
 "/    diffView := DiffTextView in:diffViewBox.
 "/    diffView layout:(LayoutFrame
 "/                        leftFraction:0.0 offset:0
 "/                        rightFraction:1.0 offset:0
 "/                        topFraction:0.0 offset:20
 "/                        bottomFraction:1.0 offset:0).
 v := HVScrollableView for:DiffTextView miniScrollerH:true miniScrollerV:false in:diffViewBox.
 v layout:(LayoutFrame
-			leftFraction:0.0 offset:0
+leftFraction:0.0 offset:0
-			rightFraction:1.0 offset:0
+rightFraction:1.0 offset:0
-			topFraction:0.0 offset:20
+topFraction:0.0 offset:20
-			bottomFraction:1.0 offset:0).
+bottomFraction:1.0 offset:0).
 diffView := v scrolledView.
 self showingDiffs value ifFalse:[
-	self makeDiffViewInvisible
+self makeDiffViewInvisible
 ].
 anyChanges := false.
 ObjectMemory addDependent:self.   "to get shutdown-update"
 |cls answer|
 cls := aClass theNonMetaclass.
 cls isLoaded ifTrue:[
-	^ true.
+^ true.
 ].
 autoloadAsRequired value == true ifTrue:[
-	answer := true
+answer := true
 ] ifFalse:[
-	answer := (self confirmWithCancel:(resources
+answer := (self confirmWithCancel:(resources
-		    string:'%1 is an autoloaded class.\I can only compare the methods source if its loaded first.\\Shall the class be loaded now ?'
+stringWithCRs:'%1 is an autoloaded class.\I can only compare the methods source if its loaded first.\\Shall the class be loaded now ?'
-		    with:cls name allBold) withCRs).
+with:cls name allBold)).
 ].
 answer == true ifTrue:[
-	Autoload autoloadFailedSignal handle:[:ex |
+Autoload autoloadFailedSignal handle:[:ex |
-	    AbortOperationRequest raise.
+AbortOperationRequest raise.
-	    ^ false
+^ false
-	] do:[
+] do:[
-	    ^ cls autoload isLoaded
+^ cls autoload isLoaded
-	]
+]
 ].
 answer isNil ifTrue:[
-	"cancel the operation"
+"cancel the operation"
-	AbortAllOperationRequest raiseRequest.
+AbortAllOperationRequest raiseRequest.
-	^ false.
+^ false.
 ].
 "cancel operation for this change, (but possibly continue with others)"
 AbortOperationRequest raiseRequest.
 ^ false.
 aStream isNil ifTrue:[^ nil].
 showDiff := false.
 (self changeIsFollowupMethodChange:changeNr) ifFalse:[
-	sawExcla := aStream peekFor:(aStream class chunkSeparator).
+sawExcla := aStream peekFor:(aStream class chunkSeparator).
-	chunk := aStream nextChunk.
+chunk := aStream nextChunk.
 ] ifTrue:[
-	chunk := (changeChunks at:changeNr).
+chunk := (changeChunks at:changeNr).
-	sawExcla := true.
+sawExcla := true.
 ].
 isSame := nil.
 beep := false.
 sawExcla ifFalse:[
-	outcome := 'cannot compare this change\\(i.e. this is not a method change).'.
+outcome := 'cannot compare this change\\(i.e. this is not a method change).'.
-	Class nameSpaceQuerySignal answer:(self nameSpaceForApply)
+Class nameSpaceQuerySignal answer:(self nameSpaceForApply)
-	do:[
+do:[
-	    parseTree := Parser parseExpression:chunk.
+parseTree := Parser parseExpression:chunk.
-	].
+].
-	(parseTree notNil and:[parseTree ~~ #Error and:[ parseTree isMessage ]]) ifTrue:[
+(parseTree notNil and:[parseTree ~~ #Error and:[ parseTree isMessage ]]) ifTrue:[
-	    selector := parseTree selector.
+selector := parseTree selector.
-	    selector == #'removeSelector:' ifTrue:[
+selector == #'removeSelector:' ifTrue:[
-		thisClass := (parseTree receiver evaluate).
+thisClass := (parseTree receiver evaluate).
-		thisClass isBehavior ifTrue:[
+thisClass isBehavior ifTrue:[
-		    (self checkClassIsLoaded:thisClass) ifTrue:[
+(self checkClassIsLoaded:thisClass) ifTrue:[
-			selector := (parseTree arg1 evaluate).
+selector := (parseTree arg1 evaluate).
-			(thisClass includesSelector:selector) ifTrue:[
+(thisClass includesSelector:selector) ifTrue:[
-			    outcome := 'Change removes the #' , selector , ' method from ' , thisClass name.
+outcome := 'Change removes the #' , selector , ' method from ' , thisClass name.
-			    isSame := false.
+isSame := false.
-			] ifFalse:[
+] ifFalse:[
-			    outcome := 'Change has no effect\\(there is no method for #' , selector , ' in ' , thisClass name , ')'.
+outcome := 'Change has no effect\\(there is no method for #' , selector , ' in ' , thisClass name , ')'.
-			    isSame := true.
+isSame := true.
-			]
+]
-		    ] ifFalse:[
+] ifFalse:[
-			beep := true.
+beep := true.
-			outcome := 'Cannot compare this change (compare requires class to be loaded).'.
+outcome := 'Cannot compare this change (compare requires class to be loaded).'.
-			isSame := nil.
+isSame := nil.
-		    ]
+]
-		] ifFalse:[
+] ifFalse:[
-		    outcome := 'Cannot compare this change (class not present)'.
+outcome := 'Cannot compare this change (class not present)'.
-		    isSame := nil.
+isSame := nil.
-		].
+].
-	    ].
+].
-	    selector == #'category:' ifTrue:[
+selector == #'category:' ifTrue:[
-		parseTree receiver isMessage ifTrue:[
+parseTree receiver isMessage ifTrue:[
-		    parseTree receiver selector == #compiledMethodAt: ifTrue:[
+parseTree receiver selector == #compiledMethodAt: ifTrue:[
-			|receiver|
+|receiver|
-			receiver := parseTree receiver.
+receiver := parseTree receiver.
-			(receiver receiver evaluate isBehavior
+(receiver receiver evaluate isBehavior
-			 and:[(method := receiver evaluate) isMethod]) ifTrue:[
+and:[(method := receiver evaluate) isMethod]) ifTrue:[
-			    method category = parseTree arg1 evaluate ifTrue:[
+method category = parseTree arg1 evaluate ifTrue:[
-				outcome := 'Change has no effect\\(same category)'.
+outcome := 'Change has no effect\\(same category)'.
-				isSame := true.
+isSame := true.
-			    ] ifFalse:[
+] ifFalse:[
-				outcome := 'Category is different (''' , method category , ''' vs. ''' , parseTree arg1 evaluate , ''')'.
+outcome := 'Category is different (''' , method category , ''' vs. ''' , parseTree arg1 evaluate , ''')'.
-				isSame := false.
+isSame := false.
-			    ]
+]
-			] ifFalse:[
+] ifFalse:[
-			    beep := true.
+beep := true.
-			    outcome := 'There is no such method'.
+outcome := 'There is no such method'.
-			    isSame := nil.
+isSame := nil.
-			]
+]
-		    ]
+]
-		]
+]
-	    ].
+].
-	    selector == #'comment:' ifTrue:[
+selector == #'comment:' ifTrue:[
-		thisClass := (parseTree receiver evaluate).
+thisClass := (parseTree receiver evaluate).
-		thisClass isBehavior ifTrue:[
+thisClass isBehavior ifTrue:[
-		    (self checkClassIsLoaded:thisClass) ifTrue:[
+(self checkClassIsLoaded:thisClass) ifTrue:[
-			(thisClass comment = parseTree arg1 evaluate) ifTrue:[
+(thisClass comment = parseTree arg1 evaluate) ifTrue:[
-			    outcome := 'Change has no effect\\(same comment)'.
+outcome := 'Change has no effect\\(same comment)'.
-			    isSame := true.
+isSame := true.
-			] ifFalse:[
+] ifFalse:[
-			    outcome := 'Comment is different'.
+outcome := 'Comment is different'.
-			    isSame := false.
+isSame := false.
-			]
+]
-		    ] ifFalse:[
+] ifFalse:[
-			beep := true.
+beep := true.
-			outcome := 'Cannot compare this change (compare requires class to be loaded).'.
+outcome := 'Cannot compare this change (compare requires class to be loaded).'.
-			isSame := nil.
+isSame := nil.
-		    ]
+]
-		] ifFalse:[
+] ifFalse:[
-		    outcome := 'Cannot compare this change (class not present)'.
+outcome := 'Cannot compare this change (class not present)'.
-		    isSame := nil.
+isSame := nil.
-		].
+].
-	    ].
+].
-	    selector == #'instanceVariableNames:' ifTrue:[
+selector == #'instanceVariableNames:' ifTrue:[
-		parseTree receiver isMessage ifTrue:[
+parseTree receiver isMessage ifTrue:[
-		    parseTree receiver selector == #class ifTrue:[
+parseTree receiver selector == #class ifTrue:[
-			thisClass := (parseTree receiver evaluate).
+thisClass := (parseTree receiver evaluate).
-			varsHere := thisClass instanceVariableString asCollectionOfWords.
+varsHere := thisClass instanceVariableString asCollectionOfWords.
-			varsInChange := (parseTree arguments at:1) evaluate asCollectionOfWords.
+varsInChange := (parseTree arguments at:1) evaluate asCollectionOfWords.
-			varsHere = varsInChange ifTrue:[
+varsHere = varsInChange ifTrue:[
-			    outcome := 'Change has no effect\\(same definition)'.
+outcome := 'Change has no effect\\(same definition)'.
-			    isSame := true.
+isSame := true.
-			] ifFalse:[
+] ifFalse:[
-			    outcome := 'Class-instanceVariable definition is different'.
+outcome := 'Class-instanceVariable definition is different'.
-			    isSame := false.
+isSame := false.
-			].
+].
-		    ].
+].
-		]
+]
-	    ].
+].
-	    (Class definitionSelectors includes:selector)
+(Class definitionSelectors includes:selector)
-	    "/ selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:category:'
+"/ selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:category:'
-	    ifTrue:[
+ifTrue:[
-		superClass := (parseTree receiver evaluate).
+superClass := (parseTree receiver evaluate).
-		superClass isBehavior ifFalse:[
+superClass isBehavior ifFalse:[
-		    outcome := 'Cannot compare this change\\(superclass not loaded).'.
+outcome := 'Cannot compare this change\\(superclass not loaded).'.
-		    isSame := nil.
+isSame := nil.
-		] ifTrue:[
+] ifTrue:[
-		    (self checkClassIsLoaded:superClass) ifTrue:[
+(self checkClassIsLoaded:superClass) ifTrue:[
-			thisClassSym := (parseTree arguments at:1) evaluate.
+thisClassSym := (parseTree arguments at:1) evaluate.
-			(selector endsWith:':privateIn:') ifTrue:[
+(selector endsWith:':privateIn:') ifTrue:[
-			    ownerClass := (parseTree arguments at:5) evaluate.
+ownerClass := (parseTree arguments at:5) evaluate.
-			    ownerClass isBehavior ifTrue:[
+ownerClass isBehavior ifTrue:[
-				thisClass := ownerClass privateClassesAt:thisClassSym.
+thisClass := ownerClass privateClassesAt:thisClassSym.
-			    ].
+].
-			] ifFalse:[
+] ifFalse:[
-			    thisClass := (self nameSpaceForApply) at:thisClassSym ifAbsent:nil.
+thisClass := (self nameSpaceForApply) at:thisClassSym ifAbsent:nil.
-			].
+].
-			thisClass isNil ifTrue:[
+thisClass isNil ifTrue:[
-			    outcome := 'Change defines the class: ' , thisClassSym allBold.
+outcome := 'Change defines the class: ' , thisClassSym allBold.
-			    isSame := false.
+isSame := false.
-			] ifFalse:[
+] ifFalse:[
-			    (isLoaded := self checkClassIsLoaded:thisClass) ifFalse:[
+(isLoaded := self checkClassIsLoaded:thisClass) ifFalse:[
-				outcome := 'Cannot compare this change\\(compare requires class to be loaded).'.
+outcome := 'Cannot compare this change\\(compare requires class to be loaded).'.
-				isSame := nil.
+isSame := nil.
-			    ] ifTrue:[
+] ifTrue:[
-				superClassHere := thisClass superclass name.
+superClassHere := thisClass superclass name.
-				superClassInChange := parseTree receiver name.
+superClassInChange := parseTree receiver name.
-				superClassHere ~~ superClassInChange ifTrue:[
+superClassHere ~~ superClassInChange ifTrue:[
-				    outcome := 'Superclass is different.'.
+outcome := 'Superclass is different.'.
-				    isSame := false.
+isSame := false.
-				] ifFalse:[
+] ifFalse:[
-				    varsHere := thisClass instanceVariableString asCollectionOfWords.
+varsHere := thisClass instanceVariableString asCollectionOfWords.
-				    varsInChange := (parseTree arguments at:2) evaluate asCollectionOfWords.
+varsInChange := (parseTree arguments at:2) evaluate asCollectionOfWords.
-				    varsHere = varsInChange ifTrue:[
+varsHere = varsInChange ifTrue:[
-					thisClass classVariableString asCollectionOfWords = (parseTree arguments at:3) evaluate asCollectionOfWords ifTrue:[
+thisClass classVariableString asCollectionOfWords = (parseTree arguments at:3) evaluate asCollectionOfWords ifTrue:[
-					    ((thisClass sharedPools size == 0) and:[(parseTree arguments at:4) evaluate = '']) ifTrue:[
+((thisClass sharedPools size == 0) and:[(parseTree arguments at:4) evaluate = '']) ifTrue:[
-						((selector endsWith:':category:')
+((selector endsWith:':category:')
-						and:[thisClass category ~= (parseTree arguments at:5) evaluate]) ifTrue:[
+and:[thisClass category ~= (parseTree arguments at:5) evaluate]) ifTrue:[
-						    outcome := 'Category is different'.
+outcome := 'Category is different'.
-						    isSame := false.
+isSame := false.
-						] ifFalse:[
+] ifFalse:[
-						    outcome := 'Change has no effect\\(same definition)'.
+outcome := 'Change has no effect\\(same definition)'.
-						    isSame := true.
+isSame := true.
-						]
+]
 "/                                            thisClass category = (parseTree arguments at:5) evaluate ifTrue:[
 "/                                                outcome := 'Change has no effect\\(same definition)'.
 "/                                                isSame := true.
 "/                                            ] ifFalse:[
 "/                                                outcome := 'Category is different'.
 "/                                                isSame := false.
 "/                                            ]
-					    ] ifFalse:[
+] ifFalse:[
-						outcome := 'SharedPool definition is different'.
+outcome := 'SharedPool definition is different'.
-						isSame := false.
+isSame := false.
-					    ].
+].
-					] ifFalse:[
+] ifFalse:[
-					    outcome := 'ClassVariable definition is different'.
+outcome := 'ClassVariable definition is different'.
-					    isSame := false.
+isSame := false.
-					]
+]
-				    ] ifFalse:[
+] ifFalse:[
-					outcome := 'InstanceVariable definition is different'.
+outcome := 'InstanceVariable definition is different'.
-					isSame := false.
+isSame := false.
-					addedVars := varsInChange select:[:eachVar | (varsHere includes:eachVar) not].
+addedVars := varsInChange select:[:eachVar | (varsHere includes:eachVar) not].
-					removedVars := varsHere select:[:eachVar | (varsInChange includes:eachVar) not].
+removedVars := varsHere select:[:eachVar | (varsInChange includes:eachVar) not].
-					addedVars isEmpty ifTrue:[
+addedVars isEmpty ifTrue:[
-					    removedVars isEmpty ifTrue:[
+removedVars isEmpty ifTrue:[
-						outcome := 'Change reorders instanceVariable(s)'.
+outcome := 'Change reorders instanceVariable(s)'.
-					    ] ifFalse:[
+] ifFalse:[
-						removedVars := removedVars collect:[:eachVar | '''' , eachVar , ''''].
+removedVars := removedVars collect:[:eachVar | '''' , eachVar , ''''].
-						outcome := 'Change removes instanceVariable(s): ' , (removedVars asStringWith:Character space) allBold.
+outcome := 'Change removes instanceVariable(s): ' , (removedVars asStringWith:Character space) allBold.
-					    ]
+]
-					] ifFalse:[
+] ifFalse:[
-					    removedVars isEmpty ifTrue:[
+removedVars isEmpty ifTrue:[
-						addedVars := addedVars collect:[:eachVar | '''' , eachVar , ''''].
+addedVars := addedVars collect:[:eachVar | '''' , eachVar , ''''].
-						outcome := 'Change adds instanceVariable(s): ' , (addedVars asStringWith:Character space) allBold.
+outcome := 'Change adds instanceVariable(s): ' , (addedVars asStringWith:Character space) allBold.
-					    ].
+].
-					].
+].
-				    ]
+]
-				]
+]
-			    ]
+]
-			]
+]
-		    ]
+]
-		]
+]
-	    ]
+]
-	]
+]
 ] ifTrue:[
-	Class nameSpaceQuerySignal answer:(self nameSpaceForApply)
+Class nameSpaceQuerySignal answer:(self nameSpaceForApply)
-	do:[
+do:[
-	    parseTree := Parser parseExpression:chunk.
+parseTree := Parser parseExpression:chunk.
-	].
+].
-	(parseTree notNil
+(parseTree notNil
-	 and:[parseTree ~~ #Error
+and:[parseTree ~~ #Error
-	 and:[parseTree isMessage]]) ifTrue:[
+and:[parseTree isMessage]]) ifTrue:[
-	    "/ Squeak support (#methodsFor:***)
+"/ Squeak support (#methodsFor:***)
-	    (#(
+(#(
-	       #methodsFor:
+#methodsFor:
-	       #privateMethodsFor:
+#privateMethodsFor:
-	       #publicMethodsFor:
+#publicMethodsFor:
-	       #ignoredMethodsFor:
+#ignoredMethodsFor:
-	       #protectedMethodsFor:
+#protectedMethodsFor:
-	       #methodsFor:stamp:             "/ Squeak support
+#methodsFor:stamp:             "/ Squeak support
-	       #methodsFor                    "/ Dolphin support
+#methodsFor                    "/ Dolphin support
-	       #methods                       "/ STV support
+#methods                       "/ STV support
-	      )
+)
-	    includes:parseTree selector) ifTrue:[
+includes:parseTree selector) ifTrue:[
-		thisClass := (parseTree receiver evaluate).
+thisClass := (parseTree receiver evaluate).
-		(thisClass notNil and:[thisClass isKindOf:UndefinedVariable]) ifTrue:[
+(thisClass notNil and:[thisClass isKindOf:UndefinedVariable]) ifTrue:[
-		    |thisName path|
+|thisName path|
-		    thisName := thisClass name.
+thisName := thisClass name.
-		    path := thisName asCollectionOfSubstringsSeparatedByAll:'::'.
+path := thisName asCollectionOfSubstringsSeparatedByAll:'::'.
-		    1 to:path size do:[:length |
+1 to:path size do:[:length |
-			|ownerName owner|
+|ownerName owner|
-			ownerName := (path copyTo:length) asStringCollection asStringWith:'::'.
+ownerName := (path copyTo:length) asStringCollection asStringWith:'::'.
-			owner := Smalltalk classNamed:ownerName.
+owner := Smalltalk classNamed:ownerName.
-			(owner notNil and:[owner isBehavior and:[owner isLoaded not]]) ifTrue:[
+(owner notNil and:[owner isBehavior and:[owner isLoaded not]]) ifTrue:[
-			    self checkClassIsLoaded:owner.
+self checkClassIsLoaded:owner.
-			].
+].
-		    ].
+].
-		    thisClass := (parseTree receiver evaluate).
+thisClass := (parseTree receiver evaluate).
-		].
+].
-		thisClass isBehavior ifTrue:[
+thisClass isBehavior ifTrue:[
-		    (isLoaded := self checkClassIsLoaded:thisClass) ifFalse:[
+(isLoaded := self checkClassIsLoaded:thisClass) ifFalse:[
-			outcome := 'Cannot compare this change\\(compare requires class to be loaded).'.
+outcome := 'Cannot compare this change\\(compare requires class to be loaded).'.
-			isSame := nil.
+isSame := nil.
-		    ].
+].
-		    parseTree selector == #methodsFor ifTrue:[
+parseTree selector == #methodsFor ifTrue:[
-			cat := 'Dolphin methods'.
+cat := 'Dolphin methods'.
-		    ] ifFalse:[
+] ifFalse:[
-			parseTree selector == #methods ifTrue:[
+parseTree selector == #methods ifTrue:[
-			    cat := 'STV methods'.
+cat := 'STV methods'.
-			] ifFalse:[
+] ifFalse:[
-			    cat := parseTree arg1 evaluate.
+cat := parseTree arg1 evaluate.
-			].
+].
-		    ].
+].
-		    newSource := aStream nextChunk.
+newSource := aStream nextChunk.
-		    Class nameSpaceQuerySignal answer:(self nameSpaceForApply)
+Class nameSpaceQuerySignal answer:(self nameSpaceForApply)
-		    do:[
+do:[
-			parser := Parser parseMethod:newSource in:thisClass.
+parser := Parser parseMethod:newSource in:thisClass.
-		    ].
+].
-		    (parser notNil and:[parser ~~ #Error]) ifTrue:[
+(parser notNil and:[parser ~~ #Error]) ifTrue:[
-			sel := parser selector.
+sel := parser selector.
-			oldMethod := thisClass compiledMethodAt:sel.
+oldMethod := thisClass compiledMethodAt:sel.
-			oldMethod notNil ifTrue:[
+oldMethod notNil ifTrue:[
-			    (oldMethod category = cat) ifFalse:[
+(oldMethod category = cat) ifFalse:[
-				Transcript showCR:'category changed.'.
+Transcript showCR:'category changed.'.
-			    ].
+].
-			    oldSource := oldMethod source.
+oldSource := oldMethod source.
-			    (oldSource = newSource) ifTrue:[
+(oldSource = newSource) ifTrue:[
-				outcome := 'Same source'.
+outcome := 'Same source'.
-				isSame := true.
+isSame := true.
-			    ] ifFalse:[
+] ifFalse:[
-				oldSource isNil ifTrue:[
+oldSource isNil ifTrue:[
-				    beep := true.
+beep := true.
-				    outcome := 'No source for compare.'.
+outcome := 'No source for compare.'.
-				    isSame := true.
+isSame := true.
-				] ifFalse:[
+] ifFalse:[
-				    "/
+"/
-				    "/ compare for tabulator <-> space changes
+"/ compare for tabulator <-> space changes
-				    "/ before showing diff ...
+"/ before showing diff ...
-				    "/
+"/
-				    t1 := oldSource asCollectionOfLines collect:[:s | s withTabsExpanded].
+t1 := oldSource asCollectionOfLines collect:[:s | s withTabsExpanded].
-				    t2 := newSource asCollectionOfLines collect:[:s | s withTabsExpanded].
+t2 := newSource asCollectionOfLines collect:[:s | s withTabsExpanded].
-				    t1 = t2 ifTrue:[
+t1 = t2 ifTrue:[
-					outcome := 'Same source'.
+outcome := 'Same source'.
-					isSame := true.
+isSame := true.
-				    ] ifFalse:[
+] ifFalse:[
-					outcome := 'Source changed.'.
+outcome := 'Source changed.'.
-					showDiff := true.
+showDiff := true.
-					isSame := false.
+isSame := false.
-					"/
+"/
-					"/ check if only historyLine diffs
+"/ check if only historyLine diffs
-					"/
+"/
-					(HistoryManager notNil
+(HistoryManager notNil
-					and:[HistoryManager isActive]) ifTrue:[
+and:[HistoryManager isActive]) ifTrue:[
-					    (HistoryManager withoutHistoryLines:newSource)
+(HistoryManager withoutHistoryLines:newSource)
-					    =
+=
-					    (HistoryManager withoutHistoryLines:oldSource)
+(HistoryManager withoutHistoryLines:oldSource)
-					    ifTrue:[
+ifTrue:[
-						outcome := 'Same source (history only)'.
+outcome := 'Same source (history only)'.
-						isSame := true.
+isSame := true.
-						showDiff := false.
+showDiff := false.
-					    ]
+]
-					].
+].
-				    ]
+]
-				]
+]
-			    ]
+]
-			] ifFalse:[
+] ifFalse:[
-			    isLoaded ifTrue:[
+isLoaded ifTrue:[
-				beep := true.
+beep := true.
-				outcome := 'Method does not exist.'.
+outcome := 'Method does not exist.'.
-				isSame := nil.
+isSame := nil.
-			    ]
+]
-			]
+]
-		    ] ifFalse:[
+] ifFalse:[
-			outcome := 'Change is unparsable (parse error).'.
+outcome := 'Change is unparsable (parse error).'.
-			isSame := nil.
+isSame := nil.
-		    ].
+].
-		    doShowResult ifTrue:[
+doShowResult ifTrue:[
-			(showDiff and:[oldSource notNil and:[newSource notNil]]) ifTrue:[
+(showDiff and:[oldSource notNil and:[newSource notNil]]) ifTrue:[
-			    d := DiffTextView
+d := DiffTextView
-				    openOn:oldSource label:(resources string:'current version (in image)')
+openOn:oldSource label:(resources string:'current version (in image)')
-				    and:newSource label:(resources string:'change version').
+and:newSource label:(resources string:'change version').
-			    d label:'method differences'.
+d label:'method differences'.
-			]
+]
-		    ]
+]
-		] ifFalse:[
+] ifFalse:[
-		    beep := true.
+beep := true.
-		    outcome := 'Class does not exist.'.
+outcome := 'Class does not exist.'.
-		    isSame := nil.
+isSame := nil.
-		]
+]
-	    ] ifFalse:[
+] ifFalse:[
-		beep := true.
+beep := true.
-		outcome := 'Not comparable.'.
+outcome := 'Not comparable.'.
-		isSame := nil.
+isSame := nil.
-	    ]
+]
-	] ifFalse:[
+] ifFalse:[
-	    beep := true.
+beep := true.
-	    outcome := 'Not comparable.'.
+outcome := 'Not comparable.'.
-	    isSame := nil.
+isSame := nil.
-	]
+]
 ].
 aStream close.
 doShowResult ifTrue:[
-	showDiff ifFalse:[
+showDiff ifFalse:[
-	    outcome := (resources string:outcome) withCRs.
+outcome := (resources stringWithCRs:outcome).
-	    beep ifTrue:[
+beep ifTrue:[
-		self warn:outcome.
+self warn:outcome.
-	    ] ifFalse:[
+] ifFalse:[
-		self information:outcome.
+self information:outcome.
-	    ]
+]
 "/        Transcript showCR:outcome.
-	].
+].
 ].
 ^ isSame.
 "Created: / 24.11.1995 / 14:30:46 / cg"
 "Modified: / 13.2.2000 / 15:04:39 / cg"
 anyChanges ifFalse:[^ self].
 again := true.
 [again] whileTrue:[
-	action := OptionBox
+action := OptionBox
-			  request:(resources at:'The modified changelist has not been written back to the change file.\\Write change file before closing ?') withCRs
+request:(resources stringWithCRs:'The modified changelist has not been written back to the change file.\\Write change file before closing ?')
-			  label:'ChangesBrowser'
+label:'ChangesBrowser'
-			  image:(WarningBox iconBitmap)
+image:(WarningBox iconBitmap)
-			  buttonLabels:(resources array:#('Cancel' 'Don''t Write' 'Write'))
+buttonLabels:(resources array:#('Cancel' 'Don''t Write' 'Write'))
-			  values:#(#abort #ignore #save)
+values:#(#abort #ignore #save)
-			  default:#save
+default:#save
-			  onCancel:#abort.
+onCancel:#abort.
-	again := false.
+again := false.
-	action == #abort ifTrue:[AbortSignal raise. ^ self].
+action == #abort ifTrue:[AbortSignal raise. ^ self].
-	action  == #save ifTrue:[
+action  == #save ifTrue:[
-	    again := self writeBackChanges not
+again := self writeBackChanges not
-	].
+].
 ].
 !
 closeRequest
 "window manager wants us to go away"
 ! !
 !ChangesBrowser class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.332 2005-06-07 16:28:48 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.333 2005-07-13 15:53:58 cg Exp $'
 ! !

changeset 6357	95e37428f3aa
parent 6317	055a38c8a566
child 6378	d29af7307c7c