--- a/AbstractFileBrowser.st	Wed May 30 21:46:55 2012 +0100
+++ b/AbstractFileBrowser.st	Tue Jun 05 15:49:00 2012 +0100
@@ -516,14 +516,14 @@
 userPreferencesAspectList
     " list of all aspects that will be saved with save settings
       that aspects will be image consistent if the settings are saved in Launcher
-      dont forget to add a access methos in UserPreferences if you add a aspect here
+      don't forget to add a access methods in UserPreferences if you add a aspect here
     "
 
     ^ Dictionary 
         withKeysAndValues:#(
            viewDirsInContentsBrowser   true
            showDirectoryTree           true
-           showHiddenFiles             false
+           showHiddenFiles             true
            viewDescription             false
            viewDetails                 true
            viewDirectoryDescription    false
@@ -546,7 +546,7 @@
            useCodeView2InTools         true
       )
 
-    "Modified: / 06-10-2011 / 11:30:09 / cg"
+    "Modified: / 11-05-2012 / 09:22:04 / cg"
 ! !
 
 !AbstractFileBrowser class methodsFor:'help specs'!
@@ -9194,13 +9194,13 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.493 2012/05/03 06:04:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.494 2012/05/11 07:32:00 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.493 2012/05/03 06:04:27 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.494 2012/05/11 07:32:00 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: AbstractFileBrowser.st 7990 2012-05-05 22:06:53Z vranyj1 $'
+    ^ '$Id: AbstractFileBrowser.st 8007 2012-06-05 14:49:00Z vranyj1 $'
 ! !

--- a/AbstractSettingsApplication.st	Wed May 30 21:46:55 2012 +0100
+++ b/AbstractSettingsApplication.st	Tue Jun 05 15:49:00 2012 +0100
@@ -5553,14 +5553,25 @@
 !
 
 informationLabel
-    ^ resources 
+    |info|
+
+    info := resources 
         string:'HTTPSTARTINFO'
         default:
 'This dialog enables you to create (possibly multiple) HTTP Server processes. 
 (i.e. it is possible to serve multiple ports)
 
 Once created, select the individual server in the left tree, 
-configure its services, and finally start it up.'
+configure its services, and finally start it up.'.
+
+    self hasHTTPServerClass ifFalse:[
+        info := info , 
+                '\\' withCRs, 
+                (resources string:'ATTENTION: Disabled because HTTPServer class is missing.') allBold
+    ].
+    ^ info
+
+    "Modified: / 14-05-2012 / 12:35:46 / cg"
 !
 
 portNumberChannel
@@ -17734,13 +17745,13 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Id: AbstractSettingsApplication.st 7969 2012-04-04 16:35:25Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.438 2012/05/14 10:40:01 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.437 2012/03/20 20:54:16 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.438 2012/05/14 10:40:01 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: AbstractSettingsApplication.st 7969 2012-04-04 16:35:25Z vranyj1 $'
-! !
+    ^ '$Id: AbstractSettingsApplication.st 8007 2012-06-05 14:49:00Z vranyj1 $'
+! !

--- a/ChangesBrowser.st	Wed May 30 21:46:55 2012 +0100
+++ b/ChangesBrowser.st	Tue Jun 05 15:49:00 2012 +0100
@@ -1615,6 +1615,1285 @@
 
 !ChangesBrowser methodsFor:'menu actions'!
 
+doApply
+    "user wants a change to be applied"
+
+    self withSelectedChangesDo:[:changeNr |
+        (self applyChange:changeNr) ifFalse:[
+            ^ self "/ cancel
+        ].
+        self autoSelect:(changeNr + 1)
+    ]
+!
+
+doApplyAll
+    "user wants all changes to be applied"
+
+    self withExecuteCursorDo:[
+        |lastNr "{ Class: SmallInteger }" |
+
+        self clearCodeView.
+        lastNr := self numberOfChanges.
+
+        "if we apply multiple changes, and an error occurs,
+         ask the user if all operations should be aborted..."
+        multipleApply := lastNr > 1.
+
+        1 to:lastNr do:[:changeNr |
+            changeListView setSelection:changeNr.
+            self applyChange:changeNr
+        ].
+        self autoSelectLast
+    ]
+
+    "Modified: 21.1.1997 / 22:26:30 / cg"
+!
+
+doApplyClassFromBeginning
+    "user wants all changes for this class from 1 to changeNr to be applied"
+
+    self withSingleSelectedChangeDo:[:changeNr |
+        |thisClassName classNameToApply lastChange
+         lastNr "{ Class: SmallInteger }" |
+
+        classNameToApply := self classNameOfChange:changeNr.
+        classNameToApply notNil ifTrue:[
+            self clearCodeView.
+
+            "if we apply multiple changes, and an error occurs,
+             ask the user if all operations should be aborted..."
+            multipleApply := changeNr ~= 1.
+
+            1 to:changeNr do:[:changeNr |
+                thisClassName := self classNameOfChange:changeNr.
+                thisClassName = classNameToApply ifTrue:[
+                    changeListView setSelection:changeNr.
+                    self applyChange:changeNr.
+                    lastChange := changeNr
+                ].
+            ].
+            self autoSelect:changeNr+1.
+        ]
+    ]
+
+    "Modified: 21.1.1997 / 22:26:04 / cg"
+!
+
+doApplyClassRest
+    "user wants all changes for this class from changeNr to be applied"
+
+    self withSingleSelectedChangeDo:[:changeNr |
+        |thisClassName classNameToApply lastChange
+         lastNr "{ Class: SmallInteger }" |
+
+        classNameToApply := self classNameOfChange:changeNr.
+        classNameToApply notNil ifTrue:[
+            self clearCodeView.
+
+            lastNr := self numberOfChanges.
+
+            "if we apply multiple changes, and an error occurs,
+             ask the user if all operations should be aborted..."
+            multipleApply := (lastNr - changeNr) > 1.
+
+            changeNr to:lastNr do:[:changeNr |
+                thisClassName := self classNameOfChange:changeNr.
+                thisClassName = classNameToApply ifTrue:[
+                    changeListView setSelection:changeNr.
+                    self applyChange:changeNr.
+                    lastChange := changeNr
+                ].
+            ].
+            self autoSelect:lastChange.
+        ]
+    ]
+
+    "Modified: 21.1.1997 / 22:26:04 / cg"
+!
+
+doApplyFromBeginning
+    "user wants all changes from 1 to changeNr to be applied"
+
+    self withSingleSelectedChangeDo:[:changeNr |
+        |lastNr "{ Class: SmallInteger }" |
+
+        self clearCodeView.
+
+        "if we apply multiple changes, and an error occurs,
+         ask the user if all operations should be aborted..."
+        multipleApply := changeNr ~= 1.
+
+        1 to:changeNr do:[:changeNr |
+            changeListView setSelection:changeNr.
+            self applyChange:changeNr
+        ].
+        self autoSelect:changeNr+1.
+    ]
+!
+
+doApplyRest
+    "apply all changes from changeNr to the end"
+
+    self withSingleSelectedChangeDo:[:changeNr |
+        |lastNr "{ Class: SmallInteger }" |
+
+        self clearCodeView.
+
+        lastNr := self numberOfChanges.
+
+        "if we apply multiple changes, and an error occurs,
+         ask the user if all operations should be aborted..."
+        multipleApply := (lastNr - changeNr) > 1.
+
+        changeNr to:lastNr do:[:changeNr |
+            changeListView setSelection:changeNr.
+            self applyChange:changeNr
+        ].
+        self autoSelect:self numberOfChanges.
+    ]
+
+    "Modified: 21.1.1997 / 22:25:29 / cg"
+!
+
+doApplyToConflictOrEnd
+    "apply all changes from changeNr to either a conflict (i.e. method exists)
+     or the end."
+
+    self withSingleSelectedChangeDo:[:changeNr |
+        |lastNr "{ Class: SmallInteger }"|
+
+        self clearCodeView.
+
+        lastNr := self numberOfChanges.
+
+        "if we apply multiple changes, and an error occurs,
+         ask the user if all operations should be aborted..."
+        multipleApply := (lastNr - changeNr) > 1.
+
+        changeNr to:lastNr do:[:changeNr |
+            | cls sel |
+            changeListView setSelection:changeNr.
+
+            ((cls := self classOfChange:changeNr ifAbsent:[:className| nil]) notNil
+            and:[(sel := self selectorOfMethodChange:changeNr) notNil])
+            ifTrue:[
+                (cls includesSelector:sel) ifTrue:[
+                    self autoSelect:changeNr.
+                    ^ self
+                ].
+            ].
+            self applyChange:changeNr
+        ].
+        self autoSelect:self numberOfChanges.
+    ]
+!
+
+doBrowse
+    "user wants a browser on the class of a change"
+
+    self withSingleSelectedChangeDo:[:changeNr |
+	|cls|
+
+	cls := self classOfChange:changeNr.
+	cls notNil ifTrue:[
+	    UserPreferences systemBrowserClass
+		openInClass:cls
+		selector:(self selectorOfMethodChange:changeNr)
+	]
+    ]
+!
+
+doBrowseImplementors
+    "open an implementors-browser"
+
+    |changeNr initial selector|
+
+    (changeNr := self theSingleSelection) notNil ifTrue:[
+	initial := self selectorOfMethodChange:changeNr.
+    ].
+
+    selector := Dialog
+		    request:'Selector to browse implementors of:'
+		    initialAnswer:(initial ? '').
+    selector size ~~ 0 ifTrue:[
+	UserPreferences systemBrowserClass
+	    browseImplementorsMatching:selector.
+    ]
+!
+
+doBrowseSenders
+    "user wants a browser on the class of a change"
+
+    |changeNr initial selector|
+
+    (changeNr := self theSingleSelection) notNil ifTrue:[
+	initial := self selectorOfMethodChange:changeNr.
+    ].
+
+    selector := Dialog
+		    request:'Selector to browse senders of:'
+		    initialAnswer:(initial ? '').
+    selector size ~~ 0 ifTrue:[
+	UserPreferences systemBrowserClass
+	    browseAllCallsOn:selector asSymbol.
+    ]
+!
+
+doCheckinAndDeleteClassAll
+    "first checkin the selected changes class then delete all changes
+     for it."
+
+    |classes answer logTitle checkinInfo|
+
+"/    self theSingleSelection isNil ifTrue:[
+"/        ^ self information:'Only possible if a single change is selected.'.
+"/    ].
+
+    self withExecuteCursorDo:[
+        classes := IdentitySet new.
+
+        self withSelectedChangesDo:[:changeNr |
+            | className class |
+
+            className := self classNameOfChange:changeNr.
+            className notNil ifTrue:[
+                class := Smalltalk classNamed:className.
+                class isNil ifTrue:[
+                    self error:'oops - no class: ', className mayProceed:true.
+                ].
+                class notNil ifTrue:[
+                    class := class theNonMetaclass.
+                    (classes includes:class) ifFalse:[
+                        class isPrivate ifTrue:[
+                            (classes includes:class owningClass) ifFalse:[
+                                answer := self confirmWithCancel:('This is a private class.\\CheckIn the owner ''%1'' and all of its private classes ?'
+                                                                    bindWith:class owningClass name allBold) withCRs.
+                                answer isNil ifTrue:[^ self].
+                                answer ifTrue:[
+                                    classes add:class owningClass
+                                ]
+                            ]
+                        ] ifFalse:[
+                            classes add:class
+                        ].
+                    ]
+                ]
+            ]
+        ].
+
+        classes size == 1 ifTrue:[
+            logTitle := classes first name.
+        ] ifFalse:[
+            logTitle := '%1 classes' bindWith:classes size.
+        ].
+        checkinInfo := SourceCodeManagerUtilities default
+                        getCheckinInfoFor:logTitle
+                        initialAnswer:nil.
+        checkinInfo isNil ifTrue:[^ self ].
+
+        changeListView setSelection:nil.
+        classes do:[:eachClass |
+            (SourceCodeManagerUtilities default checkinClass:eachClass withInfo:checkinInfo)
+                ifTrue:[
+                    self silentDeleteChangesForClassAndPrivateClasses:eachClass name
+                           from:1 to:(self numberOfChanges).
+                ]
+        ].
+        self setChangeList.
+    ]
+
+    "Modified: / 6.9.1995 / 17:11:16 / claus"
+    "Modified: / 17.11.2001 / 14:21:13 / cg"
+!
+
+doCompare
+    "compare change with current system version"
+
+    classesNotToBeAutoloaded removeAll.
+
+    self withSingleSelectedChangeDo:[:changeNr |
+        self withExecuteCursorDo:[
+            self compareChange:changeNr
+        ].
+        self newLabel:''
+    ].
+
+    "Modified: 24.2.1996 / 19:37:19 / cg"
+!
+
+doCompareAndCompress
+    "remove all changes, which are equivalent to the current image version"
+
+    |toDelete|
+
+    classesNotToBeAutoloaded removeAll.
+    toDelete := OrderedCollection new.
+    self withExecuteCursorDo:[
+        1 to:self numberOfChanges do:[:changeNr |
+            (self compareChange:changeNr showResult:false) == true ifTrue:[
+                toDelete add:changeNr
+            ]
+        ].
+    ].
+
+    toDelete reverseDo:[:changeNr |
+        self silentDeleteChange:changeNr.
+    ].
+    self setChangeList.
+    "
+     scroll back a bit, if we are left way behind the list
+    "
+    changeListView firstLineShown > self numberOfChanges ifTrue:[
+        changeListView makeLineVisible:self numberOfChanges
+    ].
+    self clearCodeView.
+
+    self newLabel:''.
+    classesNotToBeAutoloaded removeAll.
+!
+
+doCompress
+    "compress the change-set; this replaces multiple method-changes by the last
+     (i.e. the most recent) change"
+
+    self compressForClass:nil
+
+    "Modified: / 29.10.1997 / 01:03:26 / cg"
+!
+
+doCompressClass
+    "compress changes for the selected class.
+     this replaces multiple method-changes by the last (i.e. the most recent) change."
+
+    self theSingleSelection isNil ifTrue:[
+	^ self information:'Only possible if a single change is selected.'.
+    ].
+
+    self selectedClassNames do:[:classNameToCompress |
+	self compressForClass:classNameToCompress.
+    ]
+
+    "Created: / 29.10.1997 / 01:05:16 / cg"
+    "Modified: / 19.11.2001 / 21:55:17 / cg"
+!
+
+doCompressSelector
+    "compress changes for the selected class & selector.
+     this replaces multiple method-changes by the last (i.e. the most recent) change."
+
+    |classSelectorPairs|
+
+    self theSingleSelection isNil ifTrue:[
+	^ self information:'Only possible if a single change is selected.'.
+    ].
+
+    classSelectorPairs := Set new.
+    self withSelectedChangesDo:[:changeNr |
+	| classNameToCompress selector |
+
+	classNameToCompress := self classNameOfChange:changeNr.
+	classNameToCompress notNil ifTrue:[
+	    selector := self selectorOfMethodChange:changeNr.
+	    selector notNil ifTrue:[
+		classSelectorPairs add:(classNameToCompress -> selector).
+	    ]
+	]
+    ].
+
+    classSelectorPairs do:[:pair |
+	self compressForClass:pair key selector:pair value.
+    ]
+
+    "Created: / 19.11.2001 / 21:50:59 / cg"
+    "Modified: / 19.11.2001 / 22:10:08 / cg"
+!
+
+doDelete
+    "delete currently selected change(s)"
+
+    |rangeEnd rangeStart firstDeleted|
+
+    changeListView selection size <= 5 ifTrue:[
+	self withSelectedChangesReverseDo:[:changeNr |
+	    self deleteChange:changeNr.
+	    self autoSelectOrEnd:changeNr
+	].
+	^ self
+    ].
+
+    self withSelectedChangesReverseDo:[:changeNr |
+	rangeEnd isNil ifTrue:[
+	    rangeEnd := rangeStart := changeNr
+	] ifFalse:[
+	    (changeNr = (rangeEnd + 1)) ifTrue:[
+		rangeEnd := changeNr
+	    ] ifFalse:[
+		(changeNr = (rangeStart - 1)) ifTrue:[
+		    rangeStart := changeNr
+		] ifFalse:[
+		    self deleteChangesFrom:rangeStart to:rangeEnd.
+		    firstDeleted := (firstDeleted ? rangeStart) min:rangeStart.
+		    rangeStart := rangeEnd := nil.
+		].
+	    ].
+	].
+    ].
+    rangeStart notNil ifTrue:[
+	self deleteChangesFrom:rangeStart to:rangeEnd.
+	firstDeleted := (firstDeleted ? rangeStart) min:rangeStart.
+    ].
+    self autoSelectOrEnd:firstDeleted
+!
+
+doDeleteAndSelectPrevious
+    "delete currently selected change(s)"
+
+    self withSelectedChangesReverseDo:[:changeNr |
+	self deleteChange:changeNr.
+	self autoSelectOrEnd:changeNr-1
+    ]
+!
+
+doDeleteClassAll
+    "delete all changes with same class as currently selected change"
+
+    |classNamesToDelete lastChangeNr overAllNumDeletedBefore|
+
+    lastChangeNr := -1.
+    classNamesToDelete := Set new.
+    self withSelectedChangesDo:[:changeNr |
+	|classNameToDelete|
+
+	classNameToDelete := self classNameOfChange:changeNr.
+	classNameToDelete notNil ifTrue:[
+	    classNamesToDelete add:classNameToDelete.
+	].
+	lastChangeNr := lastChangeNr max:changeNr.
+    ].
+
+    overAllNumDeletedBefore := 0.
+    changeListView setSelection:nil.
+
+    self withExecuteCursorDo:[
+	classNamesToDelete do:[:classNameToDelete |
+	    |numDeletedBefore|
+
+	    self silentDeleteChangesFor:classNameToDelete
+				   from:lastChangeNr
+				     to:(self numberOfChanges).
+	    numDeletedBefore := self
+				   silentDeleteChangesFor:classNameToDelete
+				   from:1
+				   to:(lastChangeNr-1).
+	    lastChangeNr := lastChangeNr - numDeletedBefore.
+	    overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
+	].
+    ].
+
+    self setChangeList.
+    self autoSelectOrEnd:lastChangeNr
+
+    "Created: / 13.12.1995 / 16:07:14 / cg"
+    "Modified: / 28.1.1998 / 20:42:14 / cg"
+!
+
+doDeleteClassAndPrivateClassesAll
+    "delete all changes with same class and private classes
+     as currently selected change"
+
+    |lastChangeNr classNamesToDelete overAllNumDeletedBefore|
+
+    lastChangeNr := -1.
+    classNamesToDelete := Set new.
+    self withSelectedChangesDo:[:changeNr |
+	|classNameToDelete|
+
+	classNameToDelete := self ownerClassNameOfChange:changeNr.
+	classNameToDelete notNil ifTrue:[
+	    classNamesToDelete add:classNameToDelete.
+	].
+	lastChangeNr := lastChangeNr max:changeNr.
+    ].
+
+    overAllNumDeletedBefore := 0.
+    changeListView setSelection:nil.
+
+    self withExecuteCursorDo:[
+	classNamesToDelete do:[:classNameToDelete |
+	    | changeNr numDeletedBefore|
+
+	    classNameToDelete notNil ifTrue:[
+		changeListView setSelection:nil.
+		self silentDeleteChangesForClassAndPrivateClasses:classNameToDelete
+				       from:lastChangeNr
+					 to:(self numberOfChanges).
+		numDeletedBefore := self
+				       silentDeleteChangesForClassAndPrivateClasses:classNameToDelete
+				       from:1
+				       to:(lastChangeNr-1).
+		lastChangeNr := lastChangeNr - numDeletedBefore.
+		overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
+	    ]
+	]
+    ].
+    self setChangeList.
+    self autoSelectOrEnd:lastChangeNr
+
+    "Created: / 13.12.1995 / 16:07:14 / cg"
+    "Modified: / 28.1.1998 / 20:42:14 / cg"
+!
+
+doDeleteClassFromBeginning
+    "delete changes with same class as currently selected change from the beginning
+     up to the selected change.
+     Useful to get rid of obsolete changes before a fileout or checkin entry."
+
+    self withSingleSelectedChangeDo:[:changeNr |
+	|classNameToDelete prevSelection numDeleted|
+
+	classNameToDelete := self classNameOfChange:changeNr.
+	classNameToDelete notNil ifTrue:[
+	    prevSelection := changeNr.
+	    changeListView setSelection:nil.
+	    numDeleted := self
+				silentDeleteChangesFor:classNameToDelete
+				from:1
+				to:changeNr.
+	    self setChangeList.
+	    self autoSelectOrEnd:(changeNr + 1 - numDeleted)
+	]
+    ].
+
+    "Created: 13.12.1995 / 15:41:58 / cg"
+    "Modified: 25.5.1996 / 12:26:34 / cg"
+!
+
+doDeleteClassRest
+    "delete rest of changes with same class as currently selected change"
+
+    self withSingleSelectedChangeDo:[:changeNr |
+	| classNameToDelete |
+
+	classNameToDelete := self classNameOfChange:changeNr.
+	classNameToDelete notNil ifTrue:[
+	    changeListView setSelection:nil.
+	    self silentDeleteChangesFor:classNameToDelete
+				   from:changeNr
+				     to:(self numberOfChanges).
+	    self setChangeList.
+	    self autoSelectOrEnd:changeNr
+	]
+    ]
+
+    "Modified: / 18.5.1998 / 14:25:07 / cg"
+!
+
+doDeleteClassSelectorAll
+    "delete all changes with same class and selector as currently selected change"
+
+    |classNameSelectorPairsToDelete lastChangeNr overAllNumDeletedBefore|
+
+    lastChangeNr := -1.
+    classNameSelectorPairsToDelete := Set new.
+    self withSelectedChangesDo:[:changeNr |
+	|className selector|
+
+	className := self classNameOfChange:changeNr.
+	selector := self selectorOfMethodChange:changeNr.
+	selector notNil ifTrue:[
+	    (className notNil and:[selector notNil]) ifTrue:[
+		classNameSelectorPairsToDelete add:(className -> selector).
+	    ]
+	].
+	lastChangeNr := lastChangeNr max:changeNr.
+    ].
+
+    overAllNumDeletedBefore := 0.
+    changeListView setSelection:nil.
+
+    self withExecuteCursorDo:[
+	classNameSelectorPairsToDelete do:[:pair |
+	    |numDeletedBefore className selector|
+
+	    className := pair key.
+	    selector  := pair value.
+	    self silentDeleteChangesFor:className selector:selector
+				   from:lastChangeNr
+				     to:(self numberOfChanges).
+	    numDeletedBefore := self
+				   silentDeleteChangesFor:className selector:selector
+				   from:1
+				   to:(lastChangeNr-1).
+	    lastChangeNr := lastChangeNr - numDeletedBefore.
+	    overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
+	].
+    ].
+
+    self setChangeList.
+    self autoSelectOrEnd:lastChangeNr
+
+    "Created: / 13.12.1995 / 16:07:14 / cg"
+    "Modified: / 28.1.1998 / 20:42:14 / cg"
+!
+
+doDeleteFromBeginning
+    "delete all changes from 1 to the current"
+
+    self withSingleSelectedChangeDo:[:changeNr |
+	self deleteChangesFrom:1 to:changeNr.
+	self clearCodeView.
+	self autoSelectOrEnd:changeNr
+    ]
+!
+
+doDeleteRest
+    "delete all changes from current to the end"
+
+    self withSingleSelectedChangeDo:[:changeNr |
+	self deleteChangesFrom:changeNr to:(self numberOfChanges).
+	self clearCodeView.
+	self autoSelectOrEnd:changeNr-1
+    ]
+!
+
+doFileoutAndDeleteClassAll
+    "first fileOut the selected changes class then delete all changes
+     for it."
+
+    self withSingleSelectedChangeDo:[:changeNr |
+	| className class |
+
+	className := self classNameOfChange:changeNr.
+	className notNil ifTrue:[
+	    class := Smalltalk classNamed:className.
+	    class notNil ifTrue:[
+		Class fileOutErrorSignal handle:[:ex |
+		    self warn:('fileout failed: ' , ex description).
+		] do:[
+		    class fileOut.
+		    self doDeleteClassAll
+		].
+	    ].
+
+	].
+    ]
+
+    "Modified: 6.9.1995 / 17:11:16 / claus"
+!
+
+doMakePatch
+    "user wants a change to be made a patch
+     - copy it over to the patches file"
+
+    self withSelectedChangesDo:[:changeNr |
+	self makeChangeAPatch:changeNr.
+	self autoSelect:(changeNr + 1)
+    ]
+!
+
+doMakePermanent
+    "user wants a change to be made permanent
+     - rewrite the source file where this change has to go"
+
+    |yesNoBox|
+
+    (self theSingleSelection) isNil ifTrue:[
+        ^ self information:'Only possible if a single change is selected.'.
+    ].
+
+    yesNoBox := YesNoBox new.
+    yesNoBox title:(resources string:'Warning: this operation cannot be undone').
+    yesNoBox okText:(resources string:'continue') noText:(resources string:'abort').
+    yesNoBox okAction:[   |changeNr|
+
+                          changeNr := self theSingleSelection.
+                          changeNr notNil ifTrue:[
+                              self makeChangePermanent:changeNr.
+                              self autoSelect:(changeNr + 1)
+                          ]
+                      ].
+    yesNoBox showAtPointer.
+    yesNoBox destroy
+
+    "Modified: 7.1.1997 / 23:03:33 / cg"
+!
+
+doSave
+    "user wants a change to be appended to a file"
+
+    |fileName|
+
+    self withSelectedChangesDo:[:changeNr |
+        fileName := Dialog
+                        requestFileNameForSave:(resources string:'Append change to:')
+                        default:(lastSaveFileName ? '')
+                        ok:(resources string:'Append')
+                        abort:(resources string:'Abort')
+                        pattern:'*.chg'.
+
+        fileName notNil ifTrue:[
+            lastSaveFileName := fileName.
+            self withCursor:(Cursor write) do:[
+                self appendChange:changeNr toFile:fileName.
+            ].
+            self autoSelect:(changeNr + 1)
+        ].
+    ]
+
+    "Modified: / 27-10-2010 / 11:30:07 / cg"
+!
+
+doSaveClass
+    "user wants changes for some class from current to end to be appended to a file"
+
+    (self theSingleSelection) isNil ifTrue:[
+	^ self information:'Only possible if a single change is selected.'.
+    ].
+    self doSaveClassFrom:1
+!
+
+doSaveClassAll
+    "user wants changes for some class from current to end to be appended to a file"
+
+    (self theSingleSelection) isNil ifTrue:[
+	^ self information:'Only possible if a single change is selected.'.
+    ].
+    self doSaveClassFrom:1
+!
+
+doSaveClassFrom:startNr
+    "user wants changes from current to end to be appended to a file"
+
+    |changeNr classNameToSave|
+
+    (changeNr := self theSingleSelection) isNil ifTrue:[
+	^ self information:'Only possible if a single change is selected.'.
+    ].
+    classNameToSave := self classNameOfChange:changeNr.
+    classNameToSave notNil ifTrue:[
+	self saveClass:classNameToSave from:startNr
+    ]
+!
+
+doSaveClassRest
+    "user wants changes for some class from current to end to be appended to a file"
+
+    |changeNr|
+
+    (changeNr := self theSingleSelection) isNil ifTrue:[
+        ^ self information:'Only possible if a single change is selected.'.
+    ].
+    self doSaveClassFrom:changeNr.
+
+    changeListView setSelection:changeNr.
+    "/ self changeSelection:changeNr.
+!
+
+doSaveRest
+    "user wants changes from current to end to be appended to a file"
+
+    |changeNr fileName|
+
+    (changeNr := self theSingleSelection) isNil ifTrue:[
+        ^ self information:(resources string:'Only possible if a single change is selected.').
+    ].
+
+    fileName := Dialog
+                    requestFileNameForSave:(resources string:'Append changes to:')
+                    default:(lastSaveFileName ? '')
+                    ok:(resources string:'Append')
+                    abort:(resources string:'Abort')
+                    pattern:'*.chg'.
+
+    fileName notNil ifTrue:[
+        lastSaveFileName := fileName.
+        self withCursor:(Cursor write) do:[
+            changeNr to:(self numberOfChanges) do:[:changeNr |
+                changeListView setSelection:changeNr.
+                (self appendChange:changeNr toFile:fileName) ifFalse:[
+                    ^ self
+                ]
+            ]
+        ]
+    ]
+
+    "Modified: / 27-10-2010 / 11:30:37 / cg"
+!
+
+doUpdate
+    "reread the changes-file"
+
+    self readChangesFileInBackground:true.
+    self newLabel:''.
+    realized ifTrue:[
+	self setChangeList.
+    ]
+!
+
+doWriteBack
+    "write back the list onto the changes file"
+
+    anyChanges ifTrue:[
+        (self writeBackChanges) ifTrue:[
+            realized ifTrue:[
+                self readChangesFile.
+                realized ifTrue:[
+                    self setChangeList
+                ]
+            ]
+        ]
+    ]
+
+    "Modified: 5.9.1996 / 17:19:46 / cg"
+!
+
+findClass
+    "findClass menu action: let user enter a classes name, and select the next change for that class"
+
+    |current|
+
+    changeNrShown notNil ifTrue:[
+        current := self classNameOfChange:changeNrShown.
+    ].
+
+    self
+        askForSearch:'Class to search for:'
+        initialAnswer:current
+        thenSearchUsing:[:searchString :changeNr |
+                            |thisClassName|
+
+                            thisClassName := self classNameOfChange:changeNr.
+                            thisClassName notNil
+                            and:[
+                                (thisClassName sameAs: searchString)
+                                or:[searchString includesMatchCharacters and:[searchString match:thisClassName ignoreCase:true]]]
+                        ]
+        onCancel:[^ self].
+
+    lastSearchType := #class.
+    changeNrShown == 0 ifTrue:[changeNrShown := nil].
+!
+
+findFirstForClass
+    "findNextForClass menu action: select the next change for the selected changes class"
+
+    self findNextForClassStartingAt:1
+
+    "Created: / 20-11-2006 / 16:37:56 / cg"
+!
+
+findLastForClass
+    "findPreviousForClass menu action: select the previous change for the selected changes class"
+
+    self findPreviousForClassStartingAt:(self numberOfChanges)
+
+    "Created: / 20-11-2006 / 16:39:15 / cg"
+!
+
+findLastSnapshot
+    "findLastSnapshot menu action: select the last change which is for a snapShot-image save action"
+
+    "/ lastSearchType := #snapshot.
+
+    self 
+        findPreviousForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ]
+        startingAt:(self numberOfChanges)
+
+    "Created: / 06-10-2006 / 11:03:39 / cg"
+!
+
+findNext
+    "findNext menu action: select the next change.
+     Searches for what the last search was for; i.e. either same class or same selector"
+
+    lastSearchType == #selector ifTrue:[
+	^ self findNextForSelector
+    ].
+    lastSearchType == #snapshot ifTrue:[
+	^ self findNextSnapshot
+    ].
+    lastSearchType == #string ifTrue:[
+	^ self findNextForString
+    ].
+    lastSearchType == #difference ifTrue:[
+	^ self findNextDifference
+    ].
+
+    ^ self findNextForClass
+
+    "Created: / 18.6.1998 / 22:15:00 / cg"
+    "Modified: / 18.6.1998 / 22:15:25 / cg"
+!
+
+findNextDifference
+    lastSearchType := #difference.
+    changeNrShown isNil ifTrue:[^ self].
+
+    self findNextForWhich:[:changeNr |
+	    (self compareChange:changeNr showResult:false) == true ifTrue:[
+		"/ same
+		false
+	    ] ifFalse:[
+		"/ different
+		true
+	    ]
+	]
+!
+
+findNextForClass
+    "findNextForClass menu action: select the next change for the selected changes class"
+
+    self findNextForClassStartingAt: changeNrShown + 1
+
+    "Modified: / 20-11-2006 / 16:37:49 / cg"
+!
+
+findNextForClassStartingAt:startNr
+    "findNextForClass menu action: select the next change for the selected changes class"
+
+    |cls|
+
+    lastSearchType := #class.
+    changeNrShown isNil ifTrue:[^ self].
+
+    cls := self classNameOfChange:changeNrShown.
+    cls isNil ifTrue:[^ self].
+
+    self 
+        findNextForWhich:[:changeNr |
+                |thisClass|
+
+                thisClass := self classNameOfChange:changeNr.
+                (thisClass = cls
+                or:[cls includesMatchCharacters and:[cls match:thisClass]])]
+        startingAt:startNr
+
+    "Created: / 20-11-2006 / 16:37:37 / cg"
+!
+
+findNextForSelector
+    "findNextForSelector menu action: select the next change for the selected changes selector"
+
+    |sel|
+
+    lastSearchType := #selector.
+    changeNrShown isNil ifTrue:[^ self].
+
+    sel := self selectorOfMethodChange:changeNrShown.
+    sel isNil ifTrue:[^ self].
+
+    self findNextForWhich: [:changeNr |
+		|thisSelector|
+
+		thisSelector := self selectorOfMethodChange:changeNr.
+		(thisSelector = sel or:[sel includesMatchCharacters and:[sel match:thisSelector]])
+	]
+
+!
+
+findNextForString
+    lastSearchString isNil ifTrue:[
+	^ self findString
+    ].
+    self findNextWithString:lastSearchString
+!
+
+findNextForWhich:aBlock
+    "helper: select the next change for which aBlock evaluates to true"
+
+    ^ self findNextForWhich:aBlock startingAt:changeNrShown + 1
+
+    "Modified: / 20-11-2006 / 16:34:23 / cg"
+!
+
+findNextForWhich:aBlock startingAt:changeNrToStartSearch
+    "helper: select the next change for which aBlock evaluates to true"
+
+    ^ self     
+        findNextOrPrevious:#next 
+        forWhich:aBlock startingAt:changeNrToStartSearch
+
+    "Created: / 20-11-2006 / 16:34:06 / cg"
+!
+
+findNextOrPrevious:direction forWhich:aBlock startingAt:changeNrToStartSearch
+    "helper: find and select the next or previous change for which aBlock evaluates to true"
+
+    self withCursor:Cursor questionMark do:[
+        Object userInterruptSignal handle:[:ex |
+            self beep.
+            ^ 0
+        ] do:[
+            |increment nr lastNr|
+
+            increment := (direction == #previous) ifTrue:[-1] ifFalse:[1].
+            lastNr := self numberOfChanges.
+            nr := changeNrToStartSearch.
+            [ (direction == #previous and:[nr >= 1])
+              or:[ direction == #next and:[ nr <= lastNr]] 
+            ] whileTrue:[
+                (aBlock value:nr) ifTrue:[
+                    changeListView setSelection:nr.
+                    self changeSelection:nr.
+                    ^ nr
+                ].
+                nr := nr + increment.
+            ].
+        ]
+    ].
+    self showNotFound.
+    self windowGroup sensor flushKeyboard. "/ avoid multiple beeps, in case of type ahead
+    ^ 0
+
+    "Created: / 08-03-2012 / 11:57:26 / cg"
+!
+
+findNextSnapshot
+    "findNextSnapshot menu action: select the next change which is for a snapShot-image save action"
+
+    lastSearchType := #snapshot.
+    changeNrShown isNil ifTrue:[^ self].
+
+    self findNextForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ]
+!
+
+findNextWithString:searchString
+    lastSearchType := #string.
+
+    lastSearchString := searchString.
+
+    changeNrShown isNil ifTrue:[
+	changeNrShown := 0.
+    ].
+
+    self findNextForWhich:
+	[:changeNr |
+	    |s|
+
+	    s := self sourceOfMethodChange:changeNr.
+	    s notNil and:[
+		(searchString includesMatchCharacters not
+			    and:[(s findString:searchString) ~~ 0])
+		or:[ searchString includesMatchCharacters
+			    and:[('*' , searchString , '*') match:s ]]]
+	].
+
+    changeNrShown == 0 ifTrue:[changeNrShown := nil].
+
+    codeView setSearchPattern:searchString.
+    codeView
+	searchFwd:searchString
+	ignoreCase:false
+	startingAtLine:1 col:0
+	ifAbsent:nil.
+
+!
+
+findPrevious
+    "findPrevious menu action: select the previous change.
+     Searches for what the last search was for; i.e. either same class or same selector"
+
+    lastSearchType == #selector ifTrue:[
+	^ self findPreviousForSelector
+    ].
+    lastSearchType == #snapshot ifTrue:[
+	^ self findPreviousSnapshot
+    ].
+    lastSearchType == #string ifTrue:[
+	^ self findPreviousForString
+    ].
+    lastSearchType == #difference ifTrue:[
+	^ self findPreviousDifference
+    ].
+
+    ^ self findPreviousForClass
+
+    "Created: / 18.6.1998 / 22:15:15 / cg"
+!
+
+findPreviousDifference
+    lastSearchType := #difference.
+    changeNrShown isNil ifTrue:[^ self].
+
+    self findPreviousForWhich:[:changeNr |
+	    (self compareChange:changeNr showResult:false) == true ifTrue:[
+		"/ same
+		false
+	    ] ifFalse:[
+		"/ different
+		true
+	    ]
+	]
+!
+
+findPreviousForClass
+    "findPreviousForClass menu action: select the previous change for the selected changes class"
+
+    self findPreviousForClassStartingAt:(changeNrShown - 1)
+
+    "Modified: / 20-11-2006 / 16:39:04 / cg"
+!
+
+findPreviousForClassStartingAt:startNr
+    "findPreviousForClass menu action: select the previous change for the selected changes class"
+
+    |cls|
+
+    lastSearchType := #class.
+    changeNrShown isNil ifTrue:[^ self].
+
+    cls := self classNameOfChange:changeNrShown.
+    cls isNil ifTrue:[^ self].
+
+    self 
+        findPreviousForWhich:
+            [:changeNr |
+                    |thisClass|
+
+                    thisClass := self classNameOfChange:changeNr.
+                    (thisClass = cls
+                    or:[cls includesMatchCharacters and:[cls match:thisClass]])]
+        startingAt:startNr
+
+    "Created: / 20-11-2006 / 16:38:37 / cg"
+!
+
+findPreviousForSelector
+    "findPreviousForSelector menu action: select the previous change for the selected changes selector"
+
+    |sel|
+
+    lastSearchType := #selector.
+    changeNrShown isNil ifTrue:[^ self].
+
+    sel := self selectorOfMethodChange:changeNrShown.
+    sel isNil ifTrue:[^ self].
+
+    self findPreviousForWhich:
+	[:changeNr |
+		|thisSelector|
+
+		thisSelector := self selectorOfMethodChange:changeNr.
+		(thisSelector = sel
+		or:[sel includesMatchCharacters and:[sel match:thisSelector]])
+	]
+
+!
+
+findPreviousForString
+    lastSearchString isNil ifTrue:[
+	^ self findString
+    ].
+    self findPreviousWithString:lastSearchString
+!
+
+findPreviousForWhich:aBlock
+    "helper: select the previous change for which aBlock evaluates to true"
+
+    ^ self findPreviousForWhich:aBlock startingAt:(changeNrShown - 1)
+
+    "Modified: / 06-10-2006 / 11:01:38 / cg"
+!
+
+findPreviousForWhich:aBlock startingAt:changeNrToStartSearch
+    "helper: select the previous change for which aBlock evaluates to true"
+
+    ^ self     
+        findNextOrPrevious:#previous 
+        forWhich:aBlock startingAt:changeNrToStartSearch
+
+    "Created: / 06-10-2006 / 11:01:09 / cg"
+!
+
+findPreviousSnapshot
+    "findPreviousSnapshot menu action: select the previous change which is for a snapShot-image save action"
+
+    lastSearchType := #snapshot.
+    changeNrShown isNil ifTrue:[^ self].
+
+    self findPreviousForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ]
+!
+
+findPreviousWithString:searchString
+    lastSearchType := #string.
+
+    lastSearchString := searchString.
+
+    changeNrShown isNil ifTrue:[
+	changeNrShown := 0.
+    ].
+
+    self findPreviousForWhich:
+	[:changeNr |
+	    |s includesMatchCharacters|
+
+	    includesMatchCharacters := searchString includesMatchCharacters.
+	    s := self sourceOfMethodChange:changeNr.
+	    s notNil and:[
+		(includesMatchCharacters not and:[(s findString:searchString) ~~ 0])
+		or:[includesMatchCharacters and:[('*' , searchString , '*') match:s ]]]
+	].
+
+    changeNrShown == 0 ifTrue:[changeNrShown := nil].
+
+    codeView setSearchPattern:searchString.
+    codeView
+	searchFwd:searchString
+	ignoreCase:false
+	startingAtLine:1 col:0
+	ifAbsent:nil.
+
+!
+
+findSelector
+    "findSelector menu action: let user enter a selector, and select the next change for that selector"
+
+    |current|
+
+    changeNrShown notNil ifTrue:[
+	current := self selectorOfMethodChange:changeNrShown.
+    ].
+
+    self
+	askForSearch:'Selector to search for:'
+	initialAnswer:current
+	thenSearchUsing:[:searchString :changeNr |
+			    |thisSelector|
+
+			    thisSelector := self selectorOfMethodChange:changeNr.
+			    (thisSelector = searchString
+			    or:[searchString includesMatchCharacters and:[searchString match:thisSelector]])
+			]
+	onCancel:[^ self].
+
+    lastSearchType := #selector.
+    changeNrShown == 0 ifTrue:[changeNrShown := nil].
+!
+
+findString
+    |searchString directionHolder|
+
+    lastSearchType := #string.
+
+    searchString := codeView selection.
+    searchString size == 0 ifTrue:[searchString := lastSearchString].
+
+    searchString := self
+	askForSearchString:'String to search for:'
+	initialAnswer:(searchString ? '')
+	directionInto:(directionHolder := ValueHolder new).
+
+    searchString size == 0 ifTrue:[
+	^ self
+    ].
+
+    directionHolder value == #backward ifTrue:[
+	self findPreviousWithString:searchString.
+    ] ifFalse:[
+	self findNextWithString:searchString.
+    ]
+!
+
 ignorePublicPrivateCategories:aBoolean
     UserPreferences current ignorePublicPrivateCategories:aBoolean
 
@@ -1659,6 +2938,75 @@
     settingsApp openWindow.
 !
 
+setEnforcedNameSpace
+    |nsName listOfKnownNameSpaces keepAsDefaultHolder|
+
+    listOfKnownNameSpaces := Set new.
+    NameSpace
+        allNameSpaces
+            do:[:eachNameSpace |
+                listOfKnownNameSpaces add:eachNameSpace name
+            ].
+    listOfKnownNameSpaces := listOfKnownNameSpaces asOrderedCollection sort.
+
+    Dialog aboutToOpenBoxNotificationSignal handle:[:ex |
+        |box|
+
+        keepAsDefaultHolder := true asValue.
+        box := ex parameter.
+        box verticalPanel
+            add:((CheckBox 
+                    label:(resources string:'Use this as default in the future')) 
+                    model:keepAsDefaultHolder).
+        ex proceed.
+    ] do:[
+        nsName := Dialog
+                request:'When applying, new classes are created in nameSpace:'
+                initialAnswer:(enforcedNameSpace ? LastEnforcedNameSpace ? Class nameSpaceQuerySignal query name)
+                list:listOfKnownNameSpaces.
+    ].
+    nsName isNil ifTrue:[^ self].
+
+    (nsName isEmpty or:[nsName = 'Smalltalk']) ifTrue:[
+        applyInOriginalNameSpace value:true.
+        LastEnforcedNameSpace := enforcedNameSpace := nil.
+    ] ifFalse:[
+        applyInOriginalNameSpace value:false.
+        LastEnforcedNameSpace := enforcedNameSpace := NameSpace name:nsName.
+        autoCompare value ifTrue:[
+            self doUpdate
+        ].
+    ].
+    KeepEnforcedNameSpace := keepAsDefaultHolder value.
+    codeView namespaceForDoits:enforcedNameSpace.
+    diffView textViews do:[:each | each namespaceForDoits:enforcedNameSpace].
+
+    "Modified: / 08-05-2012 / 14:04:19 / cg"
+!
+
+setEnforcedPackage
+    |pkg listOfKnownPackages|
+
+    listOfKnownPackages := Set new.
+    Smalltalk allClassesDo:[:eachClass |
+				|package|
+
+				package := eachClass package.
+				package size > 0 ifTrue:[
+				    listOfKnownPackages add:package
+				]
+			   ].
+    listOfKnownPackages := listOfKnownPackages asOrderedCollection sort.
+
+    pkg := Dialog
+		request:'When applying, changes go into package:'
+		initialAnswer:(enforcedPackage ? Class packageQuerySignal query)
+		list:listOfKnownPackages.
+    pkg size ~~ 0 ifTrue:[
+	enforcedPackage := pkg
+    ]
+!
+
 showAboutSTX
     ToolApplicationModel openAboutSTX
 ! !
@@ -4377,838 +5725,6 @@
     ^ cls
 !
 
-doApply
-    "user wants a change to be applied"
-
-    self withSelectedChangesDo:[:changeNr |
-        (self applyChange:changeNr) ifFalse:[
-            ^ self "/ cancel
-        ].
-        self autoSelect:(changeNr + 1)
-    ]
-!
-
-doApplyAll
-    "user wants all changes to be applied"
-
-    self withExecuteCursorDo:[
-        |lastNr "{ Class: SmallInteger }" |
-
-        self clearCodeView.
-        lastNr := self numberOfChanges.
-
-        "if we apply multiple changes, and an error occurs,
-         ask the user if all operations should be aborted..."
-        multipleApply := lastNr > 1.
-
-        1 to:lastNr do:[:changeNr |
-            changeListView setSelection:changeNr.
-            self applyChange:changeNr
-        ].
-        self autoSelectLast
-    ]
-
-    "Modified: 21.1.1997 / 22:26:30 / cg"
-!
-
-doApplyClassFromBeginning
-    "user wants all changes for this class from 1 to changeNr to be applied"
-
-    self withSingleSelectedChangeDo:[:changeNr |
-        |thisClassName classNameToApply lastChange
-         lastNr "{ Class: SmallInteger }" |
-
-        classNameToApply := self classNameOfChange:changeNr.
-        classNameToApply notNil ifTrue:[
-            self clearCodeView.
-
-            "if we apply multiple changes, and an error occurs,
-             ask the user if all operations should be aborted..."
-            multipleApply := changeNr ~= 1.
-
-            1 to:changeNr do:[:changeNr |
-                thisClassName := self classNameOfChange:changeNr.
-                thisClassName = classNameToApply ifTrue:[
-                    changeListView setSelection:changeNr.
-                    self applyChange:changeNr.
-                    lastChange := changeNr
-                ].
-            ].
-            self autoSelect:changeNr+1.
-        ]
-    ]
-
-    "Modified: 21.1.1997 / 22:26:04 / cg"
-!
-
-doApplyClassRest
-    "user wants all changes for this class from changeNr to be applied"
-
-    self withSingleSelectedChangeDo:[:changeNr |
-        |thisClassName classNameToApply lastChange
-         lastNr "{ Class: SmallInteger }" |
-
-        classNameToApply := self classNameOfChange:changeNr.
-        classNameToApply notNil ifTrue:[
-            self clearCodeView.
-
-            lastNr := self numberOfChanges.
-
-            "if we apply multiple changes, and an error occurs,
-             ask the user if all operations should be aborted..."
-            multipleApply := (lastNr - changeNr) > 1.
-
-            changeNr to:lastNr do:[:changeNr |
-                thisClassName := self classNameOfChange:changeNr.
-                thisClassName = classNameToApply ifTrue:[
-                    changeListView setSelection:changeNr.
-                    self applyChange:changeNr.
-                    lastChange := changeNr
-                ].
-            ].
-            self autoSelect:lastChange.
-        ]
-    ]
-
-    "Modified: 21.1.1997 / 22:26:04 / cg"
-!
-
-doApplyFromBeginning
-    "user wants all changes from 1 to changeNr to be applied"
-
-    self withSingleSelectedChangeDo:[:changeNr |
-        |lastNr "{ Class: SmallInteger }" |
-
-        self clearCodeView.
-
-        "if we apply multiple changes, and an error occurs,
-         ask the user if all operations should be aborted..."
-        multipleApply := changeNr ~= 1.
-
-        1 to:changeNr do:[:changeNr |
-            changeListView setSelection:changeNr.
-            self applyChange:changeNr
-        ].
-        self autoSelect:changeNr+1.
-    ]
-!
-
-doApplyRest
-    "apply all changes from changeNr to the end"
-
-    self withSingleSelectedChangeDo:[:changeNr |
-        |lastNr "{ Class: SmallInteger }" |
-
-        self clearCodeView.
-
-        lastNr := self numberOfChanges.
-
-        "if we apply multiple changes, and an error occurs,
-         ask the user if all operations should be aborted..."
-        multipleApply := (lastNr - changeNr) > 1.
-
-        changeNr to:lastNr do:[:changeNr |
-            changeListView setSelection:changeNr.
-            self applyChange:changeNr
-        ].
-        self autoSelect:self numberOfChanges.
-    ]
-
-    "Modified: 21.1.1997 / 22:25:29 / cg"
-!
-
-doApplyToConflictOrEnd
-    "apply all changes from changeNr to either a conflict (i.e. method exists)
-     or the end."
-
-    self withSingleSelectedChangeDo:[:changeNr |
-        |lastNr "{ Class: SmallInteger }"|
-
-        self clearCodeView.
-
-        lastNr := self numberOfChanges.
-
-        "if we apply multiple changes, and an error occurs,
-         ask the user if all operations should be aborted..."
-        multipleApply := (lastNr - changeNr) > 1.
-
-        changeNr to:lastNr do:[:changeNr |
-            | cls sel |
-            changeListView setSelection:changeNr.
-
-            ((cls := self classOfChange:changeNr ifAbsent:[:className| nil]) notNil
-            and:[(sel := self selectorOfMethodChange:changeNr) notNil])
-            ifTrue:[
-                (cls includesSelector:sel) ifTrue:[
-                    self autoSelect:changeNr.
-                    ^ self
-                ].
-            ].
-            self applyChange:changeNr
-        ].
-        self autoSelect:self numberOfChanges.
-    ]
-!
-
-doBrowse
-    "user wants a browser on the class of a change"
-
-    self withSingleSelectedChangeDo:[:changeNr |
-	|cls|
-
-	cls := self classOfChange:changeNr.
-	cls notNil ifTrue:[
-	    UserPreferences systemBrowserClass
-		openInClass:cls
-		selector:(self selectorOfMethodChange:changeNr)
-	]
-    ]
-!
-
-doBrowseImplementors
-    "open an implementors-browser"
-
-    |changeNr initial selector|
-
-    (changeNr := self theSingleSelection) notNil ifTrue:[
-	initial := self selectorOfMethodChange:changeNr.
-    ].
-
-    selector := Dialog
-		    request:'Selector to browse implementors of:'
-		    initialAnswer:(initial ? '').
-    selector size ~~ 0 ifTrue:[
-	UserPreferences systemBrowserClass
-	    browseImplementorsMatching:selector.
-    ]
-!
-
-doBrowseSenders
-    "user wants a browser on the class of a change"
-
-    |changeNr initial selector|
-
-    (changeNr := self theSingleSelection) notNil ifTrue:[
-	initial := self selectorOfMethodChange:changeNr.
-    ].
-
-    selector := Dialog
-		    request:'Selector to browse senders of:'
-		    initialAnswer:(initial ? '').
-    selector size ~~ 0 ifTrue:[
-	UserPreferences systemBrowserClass
-	    browseAllCallsOn:selector asSymbol.
-    ]
-!
-
-doCheckinAndDeleteClassAll
-    "first checkin the selected changes class then delete all changes
-     for it."
-
-    |classes answer logTitle checkinInfo|
-
-"/    self theSingleSelection isNil ifTrue:[
-"/        ^ self information:'Only possible if a single change is selected.'.
-"/    ].
-
-    self withExecuteCursorDo:[
-        classes := IdentitySet new.
-
-        self withSelectedChangesDo:[:changeNr |
-            | className class |
-
-            className := self classNameOfChange:changeNr.
-            className notNil ifTrue:[
-                class := Smalltalk classNamed:className.
-                class isNil ifTrue:[
-                    self error:'oops - no class: ', className mayProceed:true.
-                ].
-                class notNil ifTrue:[
-                    class := class theNonMetaclass.
-                    (classes includes:class) ifFalse:[
-                        class isPrivate ifTrue:[
-                            (classes includes:class owningClass) ifFalse:[
-                                answer := self confirmWithCancel:('This is a private class.\\CheckIn the owner ''%1'' and all of its private classes ?'
-                                                                    bindWith:class owningClass name allBold) withCRs.
-                                answer isNil ifTrue:[^ self].
-                                answer ifTrue:[
-                                    classes add:class owningClass
-                                ]
-                            ]
-                        ] ifFalse:[
-                            classes add:class
-                        ].
-                    ]
-                ]
-            ]
-        ].
-
-        classes size == 1 ifTrue:[
-            logTitle := classes first name.
-        ] ifFalse:[
-            logTitle := '%1 classes' bindWith:classes size.
-        ].
-        checkinInfo := SourceCodeManagerUtilities default
-                        getCheckinInfoFor:logTitle
-                        initialAnswer:nil.
-        checkinInfo isNil ifTrue:[^ self ].
-
-        changeListView setSelection:nil.
-        classes do:[:eachClass |
-            (SourceCodeManagerUtilities default checkinClass:eachClass withInfo:checkinInfo)
-                ifTrue:[
-                    self silentDeleteChangesForClassAndPrivateClasses:eachClass name
-                           from:1 to:(self numberOfChanges).
-                ]
-        ].
-        self setChangeList.
-    ]
-
-    "Modified: / 6.9.1995 / 17:11:16 / claus"
-    "Modified: / 17.11.2001 / 14:21:13 / cg"
-!
-
-doCompare
-    "compare change with current system version"
-
-    classesNotToBeAutoloaded removeAll.
-
-    self withSingleSelectedChangeDo:[:changeNr |
-        self withExecuteCursorDo:[
-            self compareChange:changeNr
-        ].
-        self newLabel:''
-    ].
-
-    "Modified: 24.2.1996 / 19:37:19 / cg"
-!
-
-doCompareAndCompress
-    "remove all changes, which are equivalent to the current image version"
-
-    |toDelete|
-
-    classesNotToBeAutoloaded removeAll.
-    toDelete := OrderedCollection new.
-    self withExecuteCursorDo:[
-        1 to:self numberOfChanges do:[:changeNr |
-            (self compareChange:changeNr showResult:false) == true ifTrue:[
-                toDelete add:changeNr
-            ]
-        ].
-    ].
-
-    toDelete reverseDo:[:changeNr |
-        self silentDeleteChange:changeNr.
-    ].
-    self setChangeList.
-    "
-     scroll back a bit, if we are left way behind the list
-    "
-    changeListView firstLineShown > self numberOfChanges ifTrue:[
-        changeListView makeLineVisible:self numberOfChanges
-    ].
-    self clearCodeView.
-
-    self newLabel:''.
-    classesNotToBeAutoloaded removeAll.
-!
-
-doCompress
-    "compress the change-set; this replaces multiple method-changes by the last
-     (i.e. the most recent) change"
-
-    self compressForClass:nil
-
-    "Modified: / 29.10.1997 / 01:03:26 / cg"
-!
-
-doCompressClass
-    "compress changes for the selected class.
-     this replaces multiple method-changes by the last (i.e. the most recent) change."
-
-    self theSingleSelection isNil ifTrue:[
-	^ self information:'Only possible if a single change is selected.'.
-    ].
-
-    self selectedClassNames do:[:classNameToCompress |
-	self compressForClass:classNameToCompress.
-    ]
-
-    "Created: / 29.10.1997 / 01:05:16 / cg"
-    "Modified: / 19.11.2001 / 21:55:17 / cg"
-!
-
-doCompressSelector
-    "compress changes for the selected class & selector.
-     this replaces multiple method-changes by the last (i.e. the most recent) change."
-
-    |classSelectorPairs|
-
-    self theSingleSelection isNil ifTrue:[
-	^ self information:'Only possible if a single change is selected.'.
-    ].
-
-    classSelectorPairs := Set new.
-    self withSelectedChangesDo:[:changeNr |
-	| classNameToCompress selector |
-
-	classNameToCompress := self classNameOfChange:changeNr.
-	classNameToCompress notNil ifTrue:[
-	    selector := self selectorOfMethodChange:changeNr.
-	    selector notNil ifTrue:[
-		classSelectorPairs add:(classNameToCompress -> selector).
-	    ]
-	]
-    ].
-
-    classSelectorPairs do:[:pair |
-	self compressForClass:pair key selector:pair value.
-    ]
-
-    "Created: / 19.11.2001 / 21:50:59 / cg"
-    "Modified: / 19.11.2001 / 22:10:08 / cg"
-!
-
-doDelete
-    "delete currently selected change(s)"
-
-    |rangeEnd rangeStart firstDeleted|
-
-    changeListView selection size <= 5 ifTrue:[
-	self withSelectedChangesReverseDo:[:changeNr |
-	    self deleteChange:changeNr.
-	    self autoSelectOrEnd:changeNr
-	].
-	^ self
-    ].
-
-    self withSelectedChangesReverseDo:[:changeNr |
-	rangeEnd isNil ifTrue:[
-	    rangeEnd := rangeStart := changeNr
-	] ifFalse:[
-	    (changeNr = (rangeEnd + 1)) ifTrue:[
-		rangeEnd := changeNr
-	    ] ifFalse:[
-		(changeNr = (rangeStart - 1)) ifTrue:[
-		    rangeStart := changeNr
-		] ifFalse:[
-		    self deleteChangesFrom:rangeStart to:rangeEnd.
-		    firstDeleted := (firstDeleted ? rangeStart) min:rangeStart.
-		    rangeStart := rangeEnd := nil.
-		].
-	    ].
-	].
-    ].
-    rangeStart notNil ifTrue:[
-	self deleteChangesFrom:rangeStart to:rangeEnd.
-	firstDeleted := (firstDeleted ? rangeStart) min:rangeStart.
-    ].
-    self autoSelectOrEnd:firstDeleted
-!
-
-doDeleteAndSelectPrevious
-    "delete currently selected change(s)"
-
-    self withSelectedChangesReverseDo:[:changeNr |
-	self deleteChange:changeNr.
-	self autoSelectOrEnd:changeNr-1
-    ]
-!
-
-doDeleteClassAll
-    "delete all changes with same class as currently selected change"
-
-    |classNamesToDelete lastChangeNr overAllNumDeletedBefore|
-
-    lastChangeNr := -1.
-    classNamesToDelete := Set new.
-    self withSelectedChangesDo:[:changeNr |
-	|classNameToDelete|
-
-	classNameToDelete := self classNameOfChange:changeNr.
-	classNameToDelete notNil ifTrue:[
-	    classNamesToDelete add:classNameToDelete.
-	].
-	lastChangeNr := lastChangeNr max:changeNr.
-    ].
-
-    overAllNumDeletedBefore := 0.
-    changeListView setSelection:nil.
-
-    self withExecuteCursorDo:[
-	classNamesToDelete do:[:classNameToDelete |
-	    |numDeletedBefore|
-
-	    self silentDeleteChangesFor:classNameToDelete
-				   from:lastChangeNr
-				     to:(self numberOfChanges).
-	    numDeletedBefore := self
-				   silentDeleteChangesFor:classNameToDelete
-				   from:1
-				   to:(lastChangeNr-1).
-	    lastChangeNr := lastChangeNr - numDeletedBefore.
-	    overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
-	].
-    ].
-
-    self setChangeList.
-    self autoSelectOrEnd:lastChangeNr
-
-    "Created: / 13.12.1995 / 16:07:14 / cg"
-    "Modified: / 28.1.1998 / 20:42:14 / cg"
-!
-
-doDeleteClassAndPrivateClassesAll
-    "delete all changes with same class and private classes
-     as currently selected change"
-
-    |lastChangeNr classNamesToDelete overAllNumDeletedBefore|
-
-    lastChangeNr := -1.
-    classNamesToDelete := Set new.
-    self withSelectedChangesDo:[:changeNr |
-	|classNameToDelete|
-
-	classNameToDelete := self ownerClassNameOfChange:changeNr.
-	classNameToDelete notNil ifTrue:[
-	    classNamesToDelete add:classNameToDelete.
-	].
-	lastChangeNr := lastChangeNr max:changeNr.
-    ].
-
-    overAllNumDeletedBefore := 0.
-    changeListView setSelection:nil.
-
-    self withExecuteCursorDo:[
-	classNamesToDelete do:[:classNameToDelete |
-	    | changeNr numDeletedBefore|
-
-	    classNameToDelete notNil ifTrue:[
-		changeListView setSelection:nil.
-		self silentDeleteChangesForClassAndPrivateClasses:classNameToDelete
-				       from:lastChangeNr
-					 to:(self numberOfChanges).
-		numDeletedBefore := self
-				       silentDeleteChangesForClassAndPrivateClasses:classNameToDelete
-				       from:1
-				       to:(lastChangeNr-1).
-		lastChangeNr := lastChangeNr - numDeletedBefore.
-		overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
-	    ]
-	]
-    ].
-    self setChangeList.
-    self autoSelectOrEnd:lastChangeNr
-
-    "Created: / 13.12.1995 / 16:07:14 / cg"
-    "Modified: / 28.1.1998 / 20:42:14 / cg"
-!
-
-doDeleteClassFromBeginning
-    "delete changes with same class as currently selected change from the beginning
-     up to the selected change.
-     Useful to get rid of obsolete changes before a fileout or checkin entry."
-
-    self withSingleSelectedChangeDo:[:changeNr |
-	|classNameToDelete prevSelection numDeleted|
-
-	classNameToDelete := self classNameOfChange:changeNr.
-	classNameToDelete notNil ifTrue:[
-	    prevSelection := changeNr.
-	    changeListView setSelection:nil.
-	    numDeleted := self
-				silentDeleteChangesFor:classNameToDelete
-				from:1
-				to:changeNr.
-	    self setChangeList.
-	    self autoSelectOrEnd:(changeNr + 1 - numDeleted)
-	]
-    ].
-
-    "Created: 13.12.1995 / 15:41:58 / cg"
-    "Modified: 25.5.1996 / 12:26:34 / cg"
-!
-
-doDeleteClassRest
-    "delete rest of changes with same class as currently selected change"
-
-    self withSingleSelectedChangeDo:[:changeNr |
-	| classNameToDelete |
-
-	classNameToDelete := self classNameOfChange:changeNr.
-	classNameToDelete notNil ifTrue:[
-	    changeListView setSelection:nil.
-	    self silentDeleteChangesFor:classNameToDelete
-				   from:changeNr
-				     to:(self numberOfChanges).
-	    self setChangeList.
-	    self autoSelectOrEnd:changeNr
-	]
-    ]
-
-    "Modified: / 18.5.1998 / 14:25:07 / cg"
-!
-
-doDeleteClassSelectorAll
-    "delete all changes with same class and selector as currently selected change"
-
-    |classNameSelectorPairsToDelete lastChangeNr overAllNumDeletedBefore|
-
-    lastChangeNr := -1.
-    classNameSelectorPairsToDelete := Set new.
-    self withSelectedChangesDo:[:changeNr |
-	|className selector|
-
-	className := self classNameOfChange:changeNr.
-	selector := self selectorOfMethodChange:changeNr.
-	selector notNil ifTrue:[
-	    (className notNil and:[selector notNil]) ifTrue:[
-		classNameSelectorPairsToDelete add:(className -> selector).
-	    ]
-	].
-	lastChangeNr := lastChangeNr max:changeNr.
-    ].
-
-    overAllNumDeletedBefore := 0.
-    changeListView setSelection:nil.
-
-    self withExecuteCursorDo:[
-	classNameSelectorPairsToDelete do:[:pair |
-	    |numDeletedBefore className selector|
-
-	    className := pair key.
-	    selector  := pair value.
-	    self silentDeleteChangesFor:className selector:selector
-				   from:lastChangeNr
-				     to:(self numberOfChanges).
-	    numDeletedBefore := self
-				   silentDeleteChangesFor:className selector:selector
-				   from:1
-				   to:(lastChangeNr-1).
-	    lastChangeNr := lastChangeNr - numDeletedBefore.
-	    overAllNumDeletedBefore := overAllNumDeletedBefore + numDeletedBefore.
-	].
-    ].
-
-    self setChangeList.
-    self autoSelectOrEnd:lastChangeNr
-
-    "Created: / 13.12.1995 / 16:07:14 / cg"
-    "Modified: / 28.1.1998 / 20:42:14 / cg"
-!
-
-doDeleteFromBeginning
-    "delete all changes from 1 to the current"
-
-    self withSingleSelectedChangeDo:[:changeNr |
-	self deleteChangesFrom:1 to:changeNr.
-	self clearCodeView.
-	self autoSelectOrEnd:changeNr
-    ]
-!
-
-doDeleteRest
-    "delete all changes from current to the end"
-
-    self withSingleSelectedChangeDo:[:changeNr |
-	self deleteChangesFrom:changeNr to:(self numberOfChanges).
-	self clearCodeView.
-	self autoSelectOrEnd:changeNr-1
-    ]
-!
-
-doFileoutAndDeleteClassAll
-    "first fileOut the selected changes class then delete all changes
-     for it."
-
-    self withSingleSelectedChangeDo:[:changeNr |
-	| className class |
-
-	className := self classNameOfChange:changeNr.
-	className notNil ifTrue:[
-	    class := Smalltalk classNamed:className.
-	    class notNil ifTrue:[
-		Class fileOutErrorSignal handle:[:ex |
-		    self warn:('fileout failed: ' , ex description).
-		] do:[
-		    class fileOut.
-		    self doDeleteClassAll
-		].
-	    ].
-
-	].
-    ]
-
-    "Modified: 6.9.1995 / 17:11:16 / claus"
-!
-
-doMakePatch
-    "user wants a change to be made a patch
-     - copy it over to the patches file"
-
-    self withSelectedChangesDo:[:changeNr |
-	self makeChangeAPatch:changeNr.
-	self autoSelect:(changeNr + 1)
-    ]
-!
-
-doMakePermanent
-    "user wants a change to be made permanent
-     - rewrite the source file where this change has to go"
-
-    |yesNoBox|
-
-    (self theSingleSelection) isNil ifTrue:[
-        ^ self information:'Only possible if a single change is selected.'.
-    ].
-
-    yesNoBox := YesNoBox new.
-    yesNoBox title:(resources string:'Warning: this operation cannot be undone').
-    yesNoBox okText:(resources string:'continue') noText:(resources string:'abort').
-    yesNoBox okAction:[   |changeNr|
-
-                          changeNr := self theSingleSelection.
-                          changeNr notNil ifTrue:[
-                              self makeChangePermanent:changeNr.
-                              self autoSelect:(changeNr + 1)
-                          ]
-                      ].
-    yesNoBox showAtPointer.
-    yesNoBox destroy
-
-    "Modified: 7.1.1997 / 23:03:33 / cg"
-!
-
-doSave
-    "user wants a change to be appended to a file"
-
-    |fileName|
-
-    self withSelectedChangesDo:[:changeNr |
-        fileName := Dialog
-                        requestFileNameForSave:(resources string:'Append change to:')
-                        default:(lastSaveFileName ? '')
-                        ok:(resources string:'Append')
-                        abort:(resources string:'Abort')
-                        pattern:'*.chg'.
-
-        fileName notNil ifTrue:[
-            lastSaveFileName := fileName.
-            self withCursor:(Cursor write) do:[
-                self appendChange:changeNr toFile:fileName.
-            ].
-            self autoSelect:(changeNr + 1)
-        ].
-    ]
-
-    "Modified: / 27-10-2010 / 11:30:07 / cg"
-!
-
-doSaveClass
-    "user wants changes for some class from current to end to be appended to a file"
-
-    (self theSingleSelection) isNil ifTrue:[
-	^ self information:'Only possible if a single change is selected.'.
-    ].
-    self doSaveClassFrom:1
-!
-
-doSaveClassAll
-    "user wants changes for some class from current to end to be appended to a file"
-
-    (self theSingleSelection) isNil ifTrue:[
-	^ self information:'Only possible if a single change is selected.'.
-    ].
-    self doSaveClassFrom:1
-!
-
-doSaveClassFrom:startNr
-    "user wants changes from current to end to be appended to a file"
-
-    |changeNr classNameToSave|
-
-    (changeNr := self theSingleSelection) isNil ifTrue:[
-	^ self information:'Only possible if a single change is selected.'.
-    ].
-    classNameToSave := self classNameOfChange:changeNr.
-    classNameToSave notNil ifTrue:[
-	self saveClass:classNameToSave from:startNr
-    ]
-!
-
-doSaveClassRest
-    "user wants changes for some class from current to end to be appended to a file"
-
-    |changeNr|
-
-    (changeNr := self theSingleSelection) isNil ifTrue:[
-        ^ self information:'Only possible if a single change is selected.'.
-    ].
-    self doSaveClassFrom:changeNr.
-
-    changeListView setSelection:changeNr.
-    "/ self changeSelection:changeNr.
-!
-
-doSaveRest
-    "user wants changes from current to end to be appended to a file"
-
-    |changeNr fileName|
-
-    (changeNr := self theSingleSelection) isNil ifTrue:[
-        ^ self information:(resources string:'Only possible if a single change is selected.').
-    ].
-
-    fileName := Dialog
-                    requestFileNameForSave:(resources string:'Append changes to:')
-                    default:(lastSaveFileName ? '')
-                    ok:(resources string:'Append')
-                    abort:(resources string:'Abort')
-                    pattern:'*.chg'.
-
-    fileName notNil ifTrue:[
-        lastSaveFileName := fileName.
-        self withCursor:(Cursor write) do:[
-            changeNr to:(self numberOfChanges) do:[:changeNr |
-                changeListView setSelection:changeNr.
-                (self appendChange:changeNr toFile:fileName) ifFalse:[
-                    ^ self
-                ]
-            ]
-        ]
-    ]
-
-    "Modified: / 27-10-2010 / 11:30:37 / cg"
-!
-
-doUpdate
-    "reread the changes-file"
-
-    self readChangesFileInBackground:true.
-    self newLabel:''.
-    realized ifTrue:[
-	self setChangeList.
-    ]
-!
-
-doWriteBack
-    "write back the list onto the changes file"
-
-    anyChanges ifTrue:[
-        (self writeBackChanges) ifTrue:[
-            realized ifTrue:[
-                self readChangesFile.
-                realized ifTrue:[
-                    self setChangeList
-                ]
-            ]
-        ]
-    ]
-
-    "Modified: 5.9.1996 / 17:19:46 / cg"
-!
-
 doubleClickOnChange:lineNr
     "action performed when a change-list entry is doubleClicked"
 
@@ -5217,453 +5733,6 @@
     "Created: / 6.2.1998 / 13:08:49 / cg"
 !
 
-findClass
-    "findClass menu action: let user enter a classes name, and select the next change for that class"
-
-    |current|
-
-    changeNrShown notNil ifTrue:[
-        current := self classNameOfChange:changeNrShown.
-    ].
-
-    self
-        askForSearch:'Class to search for:'
-        initialAnswer:current
-        thenSearchUsing:[:searchString :changeNr |
-                            |thisClassName|
-
-                            thisClassName := self classNameOfChange:changeNr.
-                            thisClassName notNil
-                            and:[
-                                (thisClassName sameAs: searchString)
-                                or:[searchString includesMatchCharacters and:[searchString match:thisClassName ignoreCase:true]]]
-                        ]
-        onCancel:[^ self].
-
-    lastSearchType := #class.
-    changeNrShown == 0 ifTrue:[changeNrShown := nil].
-!
-
-findFirstForClass
-    "findNextForClass menu action: select the next change for the selected changes class"
-
-    self findNextForClassStartingAt:1
-
-    "Created: / 20-11-2006 / 16:37:56 / cg"
-!
-
-findLastForClass
-    "findPreviousForClass menu action: select the previous change for the selected changes class"
-
-    self findPreviousForClassStartingAt:(self numberOfChanges)
-
-    "Created: / 20-11-2006 / 16:39:15 / cg"
-!
-
-findLastSnapshot
-    "findLastSnapshot menu action: select the last change which is for a snapShot-image save action"
-
-    "/ lastSearchType := #snapshot.
-
-    self 
-        findPreviousForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ]
-        startingAt:(self numberOfChanges)
-
-    "Created: / 06-10-2006 / 11:03:39 / cg"
-!
-
-findNext
-    "findNext menu action: select the next change.
-     Searches for what the last search was for; i.e. either same class or same selector"
-
-    lastSearchType == #selector ifTrue:[
-	^ self findNextForSelector
-    ].
-    lastSearchType == #snapshot ifTrue:[
-	^ self findNextSnapshot
-    ].
-    lastSearchType == #string ifTrue:[
-	^ self findNextForString
-    ].
-    lastSearchType == #difference ifTrue:[
-	^ self findNextDifference
-    ].
-
-    ^ self findNextForClass
-
-    "Created: / 18.6.1998 / 22:15:00 / cg"
-    "Modified: / 18.6.1998 / 22:15:25 / cg"
-!
-
-findNextDifference
-    lastSearchType := #difference.
-    changeNrShown isNil ifTrue:[^ self].
-
-    self findNextForWhich:[:changeNr |
-	    (self compareChange:changeNr showResult:false) == true ifTrue:[
-		"/ same
-		false
-	    ] ifFalse:[
-		"/ different
-		true
-	    ]
-	]
-!
-
-findNextForClass
-    "findNextForClass menu action: select the next change for the selected changes class"
-
-    self findNextForClassStartingAt: changeNrShown + 1
-
-    "Modified: / 20-11-2006 / 16:37:49 / cg"
-!
-
-findNextForClassStartingAt:startNr
-    "findNextForClass menu action: select the next change for the selected changes class"
-
-    |cls|
-
-    lastSearchType := #class.
-    changeNrShown isNil ifTrue:[^ self].
-
-    cls := self classNameOfChange:changeNrShown.
-    cls isNil ifTrue:[^ self].
-
-    self 
-        findNextForWhich:[:changeNr |
-                |thisClass|
-
-                thisClass := self classNameOfChange:changeNr.
-                (thisClass = cls
-                or:[cls includesMatchCharacters and:[cls match:thisClass]])]
-        startingAt:startNr
-
-    "Created: / 20-11-2006 / 16:37:37 / cg"
-!
-
-findNextForSelector
-    "findNextForSelector menu action: select the next change for the selected changes selector"
-
-    |sel|
-
-    lastSearchType := #selector.
-    changeNrShown isNil ifTrue:[^ self].
-
-    sel := self selectorOfMethodChange:changeNrShown.
-    sel isNil ifTrue:[^ self].
-
-    self findNextForWhich: [:changeNr |
-		|thisSelector|
-
-		thisSelector := self selectorOfMethodChange:changeNr.
-		(thisSelector = sel or:[sel includesMatchCharacters and:[sel match:thisSelector]])
-	]
-
-!
-
-findNextForString
-    lastSearchString isNil ifTrue:[
-	^ self findString
-    ].
-    self findNextWithString:lastSearchString
-!
-
-findNextForWhich:aBlock
-    "helper: select the next change for which aBlock evaluates to true"
-
-    ^ self findNextForWhich:aBlock startingAt:changeNrShown + 1
-
-    "Modified: / 20-11-2006 / 16:34:23 / cg"
-!
-
-findNextForWhich:aBlock startingAt:changeNrToStartSearch
-    "helper: select the next change for which aBlock evaluates to true"
-
-    ^ self     
-        findNextOrPrevious:#next 
-        forWhich:aBlock startingAt:changeNrToStartSearch
-
-    "Created: / 20-11-2006 / 16:34:06 / cg"
-!
-
-findNextOrPrevious:direction forWhich:aBlock startingAt:changeNrToStartSearch
-    "helper: find and select the next or previous change for which aBlock evaluates to true"
-
-    self withCursor:Cursor questionMark do:[
-        Object userInterruptSignal handle:[:ex |
-            self beep.
-            ^ 0
-        ] do:[
-            |increment nr lastNr|
-
-            increment := (direction == #previous) ifTrue:[-1] ifFalse:[1].
-            lastNr := self numberOfChanges.
-            nr := changeNrToStartSearch.
-            [ (direction == #previous and:[nr >= 1])
-              or:[ direction == #next and:[ nr <= lastNr]] 
-            ] whileTrue:[
-                (aBlock value:nr) ifTrue:[
-                    changeListView setSelection:nr.
-                    self changeSelection:nr.
-                    ^ nr
-                ].
-                nr := nr + increment.
-            ].
-        ]
-    ].
-    self showNotFound.
-    self windowGroup sensor flushKeyboard. "/ avoid multiple beeps, in case of type ahead
-    ^ 0
-
-    "Created: / 08-03-2012 / 11:57:26 / cg"
-!
-
-findNextSnapshot
-    "findNextSnapshot menu action: select the next change which is for a snapShot-image save action"
-
-    lastSearchType := #snapshot.
-    changeNrShown isNil ifTrue:[^ self].
-
-    self findNextForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ]
-!
-
-findNextWithString:searchString
-    lastSearchType := #string.
-
-    lastSearchString := searchString.
-
-    changeNrShown isNil ifTrue:[
-	changeNrShown := 0.
-    ].
-
-    self findNextForWhich:
-	[:changeNr |
-	    |s|
-
-	    s := self sourceOfMethodChange:changeNr.
-	    s notNil and:[
-		(searchString includesMatchCharacters not
-			    and:[(s findString:searchString) ~~ 0])
-		or:[ searchString includesMatchCharacters
-			    and:[('*' , searchString , '*') match:s ]]]
-	].
-
-    changeNrShown == 0 ifTrue:[changeNrShown := nil].
-
-    codeView setSearchPattern:searchString.
-    codeView
-	searchFwd:searchString
-	ignoreCase:false
-	startingAtLine:1 col:0
-	ifAbsent:nil.
-
-!
-
-findPrevious
-    "findPrevious menu action: select the previous change.
-     Searches for what the last search was for; i.e. either same class or same selector"
-
-    lastSearchType == #selector ifTrue:[
-	^ self findPreviousForSelector
-    ].
-    lastSearchType == #snapshot ifTrue:[
-	^ self findPreviousSnapshot
-    ].
-    lastSearchType == #string ifTrue:[
-	^ self findPreviousForString
-    ].
-    lastSearchType == #difference ifTrue:[
-	^ self findPreviousDifference
-    ].
-
-    ^ self findPreviousForClass
-
-    "Created: / 18.6.1998 / 22:15:15 / cg"
-!
-
-findPreviousDifference
-    lastSearchType := #difference.
-    changeNrShown isNil ifTrue:[^ self].
-
-    self findPreviousForWhich:[:changeNr |
-	    (self compareChange:changeNr showResult:false) == true ifTrue:[
-		"/ same
-		false
-	    ] ifFalse:[
-		"/ different
-		true
-	    ]
-	]
-!
-
-findPreviousForClass
-    "findPreviousForClass menu action: select the previous change for the selected changes class"
-
-    self findPreviousForClassStartingAt:(changeNrShown - 1)
-
-    "Modified: / 20-11-2006 / 16:39:04 / cg"
-!
-
-findPreviousForClassStartingAt:startNr
-    "findPreviousForClass menu action: select the previous change for the selected changes class"
-
-    |cls|
-
-    lastSearchType := #class.
-    changeNrShown isNil ifTrue:[^ self].
-
-    cls := self classNameOfChange:changeNrShown.
-    cls isNil ifTrue:[^ self].
-
-    self 
-        findPreviousForWhich:
-            [:changeNr |
-                    |thisClass|
-
-                    thisClass := self classNameOfChange:changeNr.
-                    (thisClass = cls
-                    or:[cls includesMatchCharacters and:[cls match:thisClass]])]
-        startingAt:startNr
-
-    "Created: / 20-11-2006 / 16:38:37 / cg"
-!
-
-findPreviousForSelector
-    "findPreviousForSelector menu action: select the previous change for the selected changes selector"
-
-    |sel|
-
-    lastSearchType := #selector.
-    changeNrShown isNil ifTrue:[^ self].
-
-    sel := self selectorOfMethodChange:changeNrShown.
-    sel isNil ifTrue:[^ self].
-
-    self findPreviousForWhich:
-	[:changeNr |
-		|thisSelector|
-
-		thisSelector := self selectorOfMethodChange:changeNr.
-		(thisSelector = sel
-		or:[sel includesMatchCharacters and:[sel match:thisSelector]])
-	]
-
-!
-
-findPreviousForString
-    lastSearchString isNil ifTrue:[
-	^ self findString
-    ].
-    self findPreviousWithString:lastSearchString
-!
-
-findPreviousForWhich:aBlock
-    "helper: select the previous change for which aBlock evaluates to true"
-
-    ^ self findPreviousForWhich:aBlock startingAt:(changeNrShown - 1)
-
-    "Modified: / 06-10-2006 / 11:01:38 / cg"
-!
-
-findPreviousForWhich:aBlock startingAt:changeNrToStartSearch
-    "helper: select the previous change for which aBlock evaluates to true"
-
-    ^ self     
-        findNextOrPrevious:#previous 
-        forWhich:aBlock startingAt:changeNrToStartSearch
-
-    "Created: / 06-10-2006 / 11:01:09 / cg"
-!
-
-findPreviousSnapshot
-    "findPreviousSnapshot menu action: select the previous change which is for a snapShot-image save action"
-
-    lastSearchType := #snapshot.
-    changeNrShown isNil ifTrue:[^ self].
-
-    self findPreviousForWhich: [:changeNr | self changeIsSnapShotInfo:changeNr ]
-!
-
-findPreviousWithString:searchString
-    lastSearchType := #string.
-
-    lastSearchString := searchString.
-
-    changeNrShown isNil ifTrue:[
-	changeNrShown := 0.
-    ].
-
-    self findPreviousForWhich:
-	[:changeNr |
-	    |s includesMatchCharacters|
-
-	    includesMatchCharacters := searchString includesMatchCharacters.
-	    s := self sourceOfMethodChange:changeNr.
-	    s notNil and:[
-		(includesMatchCharacters not and:[(s findString:searchString) ~~ 0])
-		or:[includesMatchCharacters and:[('*' , searchString , '*') match:s ]]]
-	].
-
-    changeNrShown == 0 ifTrue:[changeNrShown := nil].
-
-    codeView setSearchPattern:searchString.
-    codeView
-	searchFwd:searchString
-	ignoreCase:false
-	startingAtLine:1 col:0
-	ifAbsent:nil.
-
-!
-
-findSelector
-    "findSelector menu action: let user enter a selector, and select the next change for that selector"
-
-    |current|
-
-    changeNrShown notNil ifTrue:[
-	current := self selectorOfMethodChange:changeNrShown.
-    ].
-
-    self
-	askForSearch:'Selector to search for:'
-	initialAnswer:current
-	thenSearchUsing:[:searchString :changeNr |
-			    |thisSelector|
-
-			    thisSelector := self selectorOfMethodChange:changeNr.
-			    (thisSelector = searchString
-			    or:[searchString includesMatchCharacters and:[searchString match:thisSelector]])
-			]
-	onCancel:[^ self].
-
-    lastSearchType := #selector.
-    changeNrShown == 0 ifTrue:[changeNrShown := nil].
-!
-
-findString
-    |searchString directionHolder|
-
-    lastSearchType := #string.
-
-    searchString := codeView selection.
-    searchString size == 0 ifTrue:[searchString := lastSearchString].
-
-    searchString := self
-	askForSearchString:'String to search for:'
-	initialAnswer:(searchString ? '')
-	directionInto:(directionHolder := ValueHolder new).
-
-    searchString size == 0 ifTrue:[
-	^ self
-    ].
-
-    directionHolder value == #backward ifTrue:[
-	self findPreviousWithString:searchString.
-    ] ifFalse:[
-	self findNextWithString:searchString.
-    ]
-!
-
 noChangesAllowed
     "show a warning that changes cannot be changed"
 
@@ -5709,73 +5778,6 @@
 self halt
 
     "Created: / 03-01-2012 / 15:26:36 / cg"
-!
-
-setEnforcedNameSpace
-    |nsName listOfKnownNameSpaces keepAsDefaultHolder|
-
-    listOfKnownNameSpaces := Set new.
-    NameSpace
-        allNameSpaces
-            do:[:eachNameSpace |
-                listOfKnownNameSpaces add:eachNameSpace name
-            ].
-    listOfKnownNameSpaces := listOfKnownNameSpaces asOrderedCollection sort.
-
-    Dialog aboutToOpenBoxNotificationSignal handle:[:ex |
-        |box|
-
-        keepAsDefaultHolder := true asValue.
-        box := ex parameter.
-        box verticalPanel
-            add:((CheckBox 
-                    label:(resources string:'Use this as default in the future')) 
-                    model:keepAsDefaultHolder).
-        ex proceed.
-    ] do:[
-        nsName := Dialog
-                request:'When applying, new classes are created in nameSpace:'
-                initialAnswer:(enforcedNameSpace ? LastEnforcedNameSpace ? Class nameSpaceQuerySignal query name)
-                list:listOfKnownNameSpaces.
-    ].
-    nsName isNil ifTrue:[^ self].
-
-    (nsName isEmpty or:[nsName = 'Smalltalk']) ifTrue:[
-        applyInOriginalNameSpace value:true.
-        LastEnforcedNameSpace := enforcedNameSpace := nil.
-    ] ifFalse:[
-        applyInOriginalNameSpace value:false.
-        LastEnforcedNameSpace := enforcedNameSpace := NameSpace name:nsName.
-        autoCompare value ifTrue:[
-            self doUpdate
-        ].
-    ].
-    KeepEnforcedNameSpace := keepAsDefaultHolder value
-
-    "Modified: / 07-09-2006 / 15:10:25 / cg"
-!
-
-setEnforcedPackage
-    |pkg listOfKnownPackages|
-
-    listOfKnownPackages := Set new.
-    Smalltalk allClassesDo:[:eachClass |
-				|package|
-
-				package := eachClass package.
-				package size > 0 ifTrue:[
-				    listOfKnownPackages add:package
-				]
-			   ].
-    listOfKnownPackages := listOfKnownPackages asOrderedCollection sort.
-
-    pkg := Dialog
-		request:'When applying, changes go into package:'
-		initialAnswer:(enforcedPackage ? Class packageQuerySignal query)
-		list:listOfKnownPackages.
-    pkg size ~~ 0 ifTrue:[
-	enforcedPackage := pkg
-    ]
 ! !
 
 !ChangesBrowser::ChangeFileReader methodsFor:'accessing'!
@@ -6450,13 +6452,13 @@
 !ChangesBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.428 2012/04/05 11:12:53 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.429 2012/05/08 12:07:14 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.428 2012/04/05 11:12:53 stefan Exp §'
+    ^ '§Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.429 2012/05/08 12:07:14 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: ChangesBrowser.st 7978 2012-04-13 13:15:47Z vranyj1 $'
+    ^ '$Id: ChangesBrowser.st 8007 2012-06-05 14:49:00Z vranyj1 $'
 ! !

--- a/ContextInspectorView.st	Wed May 30 21:46:55 2012 +0100
+++ b/ContextInspectorView.st	Tue Jun 05 15:49:00 2012 +0100
@@ -60,19 +60,31 @@
      m argsOnly blockNode 
      numVarsInSource numVarsInContext isDoIt
      numArgs numVars n tempNames realTempNames 
-     oldSelection oldSelectedName hCon listSelection|
+     oldSelection oldSelectedName hCon keepList newList|
 
     oldSelection := selectionIndex.
-    oldSelection notNil ifTrue:[oldSelectedName := listView at:oldSelection].
+    oldSelection notNil ifTrue:[
+        oldSelectedName := (self listEntryAt:oldSelection).
+        oldSelectedName notNil ifTrue:[
+            oldSelectedName := oldSelectedName string
+        ]
+    ].
 
-    ((aContext == inspectedContext)
-        "/ care for contexts which change size
-        "/ (after the locals & stack-setup)
-    and:[    contextSize == inspectedContext size ])
-    ifTrue:[
-        "/ do nothing
+    keepList := ((aContext == inspectedContext)
+                "/ care for contexts which change size
+                "/ (after the locals & stack-setup)
+                and:[ contextSize == inspectedContext size ]).
+
+    keepList ifTrue:[
+        "/ assume that the list remains unchanged;
+        "/ this is no longer true, if some inst-slot has changed (bullet colors)
+        UserPreferences current showTypeIndicatorInInspector ifTrue:[
+            newList := self fieldList.
+            newList ~= listView list ifTrue:[
+                listView list:newList. 
+            ]    
+        ].
     ] ifFalse:[
-
         hasMore := argsOnly := false.
         inspectedObject := object := nil.
         inspectedContext := aContext.
@@ -84,10 +96,7 @@
             ^ self
         ].
 
-"/    realized ifFalse:[^ self].
-
-    methodHomeContext := aContext methodHome.
-
+        methodHomeContext := aContext methodHome.
         methodHomeContext isNil ifTrue:[
             "its a cheap blocks context"
             rec := aContext receiver.
@@ -100,7 +109,6 @@
 
             "/ #doIt needs special handling below
             isDoIt := (sel == #doIt) or:[sel == #doIt:].
-
             method := methodHomeContext method.
 
 "/        implementorClass := methodHomeContext methodClass.
@@ -299,14 +307,14 @@
     oldSelectedName notNil ifTrue:[
         |idx|
 
-        idx := listView list indexOf:oldSelectedName.
+        idx := listView list findFirst:[:entry | (entry ? '') string = oldSelectedName].
         idx ~~ 0 "(names includes:oldSelectedName)" ifTrue:[
             listView selectElement:oldSelectedName.
             self showSelection:idx.
         ]
     ].
 
-    "Modified: / 22-10-2010 / 11:47:48 / cg"
+    "Modified: / 03-06-2012 / 11:56:59 / cg"
 !
 
 namesOfBlockContext:aContext
@@ -465,17 +473,23 @@
 
     |sel|
 
-    sel := listView at:selectionIndex.
+    sel := self listEntryAt:selectionIndex.
     (sel startsWith:'-all local vars') ifTrue:[
         ^ self stringWithAllLocalValues
     ].
 
     ^ super displayStringForValue:someValue
+
+    "Modified: / 16-05-2012 / 17:55:33 / cg"
 !
 
 fieldList
     names size == 0 ifTrue:[^ names].
-    ^ (Array with:('-', 'all local vars' allItalic)) , names
+    ^ (Array with:('-', 'all local vars' allItalic)) 
+        , (names keysAndValuesCollect:[:idx :nm |
+                self listEntryForName:nm value:(self valueAtIndex:idx) ])
+
+    "Modified: / 16-05-2012 / 18:54:59 / cg"
 !
 
 hasSelfEntry
@@ -588,15 +602,17 @@
     inspectedContext isNil ifTrue:[^ nil].
 
     varIdx := lineNr.
-    l := listView at:lineNr.
+    l := self listEntryAt:lineNr.
     l isNil ifTrue:[ ^nil].
 
     (l startsWith:$-) ifTrue:[
         (l ~= '-') ifTrue:[
-            ^ self valueForSpecialLine:(listView at:lineNr)
+            ^ self valueForSpecialLine:(self listEntryAt:lineNr)
         ].
     ].
     ^ self valueAtIndex:(varIdx - 1). "/ for the special var
+
+    "Modified: / 16-05-2012 / 17:55:57 / cg"
 !
 
 valueForSpecialLine:line
@@ -655,13 +671,13 @@
 !ContextInspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ContextInspectorView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.78 2012/06/03 13:32:46 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.75 2011/08/03 13:08:24 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libtool/ContextInspectorView.st,v 1.78 2012/06/03 13:32:46 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: ContextInspectorView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+    ^ '$Id: ContextInspectorView.st 8007 2012-06-05 14:49:00Z vranyj1 $'
 ! !

--- a/DictionaryInspectorView.st	Wed May 30 21:46:55 2012 +0100
+++ b/DictionaryInspectorView.st	Tue Jun 05 15:49:00 2012 +0100
@@ -518,16 +518,23 @@
     "return a list of indexed-variable names to show in the selectionList.
      Set hasMore to true, if a '...' entry should be added."
 
-    |keys|
+    |indexList keyList|
 
-    keys := self indexList.
-    ^ keys 
+    indexList := self indexList.
+    keyList := indexList 
         collect:[:k | 
             k isSymbol 
-                ifTrue:[
-                    k printString] 
-                ifFalse:[
-                    k displayString]].
+                ifTrue:[ k printString] 
+                ifFalse:[ k displayString]
+        ].
+
+    ^ keyList
+        keysAndValuesCollect:[:idx :nm |
+            self listEntryForName:nm value:(object at:(indexList at:idx))
+        ].
+    ^ keyList
+
+    "Modified: / 16-05-2012 / 19:07:57 / cg"
 !
 
 instVarIndexForLine:lineNr
@@ -552,7 +559,7 @@
         ].
         firstRealIndex := 1.
         idx := lineNr.
-        [line := listView at:firstRealIndex. 
+        [line := self listEntryAt:firstRealIndex. 
          (line startsWith:'-') and:[line size < 2 or:[line second isDigit not]]] whileTrue:[
             firstRealIndex := firstRealIndex + 1.
             idx := idx - 1.
@@ -561,6 +568,8 @@
         ^ idx   
     ].
     ^ super keyIndexForLine:lineNr
+
+    "Modified: / 16-05-2012 / 17:56:01 / cg"
 !
 
 namedFieldList 
@@ -648,13 +657,13 @@
 !DictionaryInspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Id: DictionaryInspectorView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libtool/DictionaryInspectorView.st,v 1.76 2012/05/16 17:08:54 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/DictionaryInspectorView.st,v 1.74 2011/05/10 06:15:04 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libtool/DictionaryInspectorView.st,v 1.76 2012/05/16 17:08:54 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: DictionaryInspectorView.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+    ^ '$Id: DictionaryInspectorView.st 8007 2012-06-05 14:49:00Z vranyj1 $'
 ! !

--- a/Diff3TextView.st	Wed May 30 21:46:55 2012 +0100
+++ b/Diff3TextView.st	Tue Jun 05 15:49:00 2012 +0100
@@ -232,6 +232,53 @@
 
     "Created: 9.9.1996 / 19:54:00 / cg"
     "Modified: 9.9.1996 / 20:41:40 / cg"
+!
+
+emphasizeMergedDiff3TextFromPerforce:mergedText origEmphasis:origEmphasize otherEmphasis:otherEmphasize yourEmphasis:yourEmphasize separatorEmphasis:separatorEmphasize
+    "given the merge()/rcsmerge() merged output (as created by 'cvs update'),
+     create & return a text object which contains the conflicts 
+     highlighted.
+     CAVEAT: this is a highly specialized method - probably not the right place
+     for it here ..."
+
+    |list origSeparator otherSeparator yourSeparator endSeparator line currentEmphasis nextEmphasis|
+
+    list := StringCollection new.
+
+    origSeparator := '>>>> ORIGINAL //'.
+    otherSeparator := '==== THEIRS //'.
+    yourSeparator := '==== YOURS //'.
+    endSeparator := '<<<<'.
+    mergedText do:[:aLine|
+        line := aLine withoutTrailingSeparators.
+        (aLine startsWith:origSeparator) ifTrue:[
+            currentEmphasis := separatorEmphasize.
+            nextEmphasis := origEmphasize.
+        ] ifFalse:[
+            (aLine startsWith:otherSeparator) ifTrue:[
+                currentEmphasis := separatorEmphasize.
+                nextEmphasis := otherEmphasize.
+            ] ifFalse:[
+                (aLine startsWith:yourSeparator) ifTrue:[
+                    currentEmphasis := separatorEmphasize.
+                    nextEmphasis := yourEmphasize.
+                ] ifFalse:[
+                    (aLine startsWith:endSeparator) ifTrue:[
+                        currentEmphasis := separatorEmphasize.
+                        nextEmphasis := nil.
+                    ] ifFalse:[
+                        nextEmphasis := currentEmphasis.        
+                    ].
+                ].
+            ].
+        ].
+        list add:(currentEmphasis isNil ifTrue:[aLine] ifFalse:[Text string:aLine emphasis:currentEmphasis]).
+
+        currentEmphasis := nextEmphasis.        
+    ].
+    ^ list
+
+    "Created: / 01-06-2012 / 10:44:31 / cg"
 ! !
 
 !Diff3TextView methodsFor:'initialization'!
@@ -390,9 +437,9 @@
 !Diff3TextView class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Diff3TextView.st 7925 2012-03-16 17:08:17Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.9 2012/06/01 10:44:15 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Diff3TextView.st 7925 2012-03-16 17:08:17Z vranyj1 $'
+    ^ '$Id: Diff3TextView.st 8007 2012-06-05 14:49:00Z vranyj1 $'
 ! !

--- a/InspectorView.st	Wed May 30 21:46:55 2012 +0100
+++ b/InspectorView.st	Tue Jun 05 15:49:00 2012 +0100
@@ -344,6 +344,353 @@
     "Created: / 23-10-2007 / 19:10:02 / cg"
 ! !
 
+!InspectorView class methodsFor:'image specs'!
+
+imageFor_arrays
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_arrays inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_arrays
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_arrays'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@T5EQT4@@@@@@@@@@@@AOTUAPBU@IS0@@@@@@@@AOTP%PBUAQ
+T %O@@@@@@@@T0$IBP$ITUHIO0@@@@@@@EEPBU@ITUIRBSD@@@@@@@AQBP$IBP%RO0$1@@@@@@@@T5HIT %RO3DIO0@@@@@@@D=RT%HILSEJBR<@@@@@@@@@
+S3D1LP%JBR<@@@@@@@@@@@AOO3D1O2<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 227 231 0 132 132 0 151 156 0 142 131 128 255 252 49 175 181 0 255 234 140 218 222 0 251 255 33 74 74 0 94 99 0 107 107 0 143 148 0 189 189 0 87 90 0 251 255 8 247 255 16 167 173 0 206 99 132 156 74 99 206 66 107 115 16 49 255 16 90 189 0 57 132 16 49 206 0 57 198 123 140 255 49 123 255 33 99 222 0 66 99 0 24 239 0 66 255 0 74 255 140 214 148 0 41 140 49 74 198 123 148 255 0 82 90 0 24 132 0 41 206 99 123 156 0 41 198 0 57 74 0 24 255 16 82 214 0 66 90 0 33 189 0 49 107 0 33 206 16 74 214 8 66 218 112 214 255 0 255 208 32 144 199 21 133 186 85 211]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_characters
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_characters inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_characters
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_characters'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@6LD5MLCX@@@@@@@@@@@ADRTDIOC-FQ@@@@@@@@@A@MP$IBP$I
+Q$U@@@@@@@@@L@%SOP%HRP$>M@@@@@@@@D4<BP$IS#MEP4H@@@@@@@AMNUP9BP$IP3)B@@@@@@@@L@$3R0%EP0%GLP@@@@@@@D@>BP$IBP%RQ2<@@@@@@@@@
+K$1LBT]GQ3<@@@@@@@@@@@A@LTIBLR<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 227 231 0 132 132 0 151 156 0 142 131 128 255 252 49 175 181 0 255 234 140 218 222 0 251 255 33 74 74 0 94 99 0 107 107 0 143 148 0 189 189 0 87 90 0 251 255 8 247 255 16 167 173 0 206 99 132 156 74 99 206 66 107 115 16 49 255 16 90 189 0 57 132 16 49 206 0 57 198 123 140 255 49 123 255 33 99 222 0 66 99 0 24 239 0 66 255 0 74 255 140 214 148 0 41 140 49 74 198 123 148 255 0 82 90 0 24 132 0 41 206 99 123 156 0 41 198 0 57 74 0 24 255 16 82 214 0 66 90 0 33 189 0 49 107 0 33 206 16 74 214 8 66 173 0 49 115 0 33 181 0 49 74 0 16 255 8 82 231 0 66]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_classes
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_classes inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_classes
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_classes'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@6LD5MLCX@@@@@@@@@@@ADRTEAOC-FQ@@@@@@@@@A@MT 2M3\;
+Q$U@@@@@@@@@LD!!HRD!!HRTX>M@@@@@@@@D4<RC\8S$%FP4H@@@@@@@AMNS$9MST3P3)B@@@@@@@@LCL3R4,3P4)GLP@@@@@@@D@>O#8>R$)JQ2<@@@@@@@@@
+K$1LP$]GQ3<@@@@@@@@@@@A@LTIBLR<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 0 215 231 0 125 132 0 143 156 128 142 132 49 248 255 0 166 181 140 255 240 0 207 222 33 240 255 0 70 74 0 89 99 0 102 107 0 136 148 0 180 189 0 82 90 8 239 255 16 235 255 0 158 173 127 206 99 95 156 74 100 206 66 44 115 16 78 255 16 48 189 0 43 132 16 47 206 0 136 198 123 113 255 49 88 255 33 55 222 0 19 99 0 54 239 0 61 255 0 208 255 140 34 148 0 69 140 49 144 198 123 69 255 0 19 90 0 34 132 0 118 206 99 33 156 0 47 198 0 20 74 0 70 255 16 55 214 0 28 90 0 40 189 0 28 107 0 64 206 16 56 214 8]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_collections
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_collections inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_collections
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_collections'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@T5EQT4@@@@@@@@@@@@AOBUAPTE@IS0@@@@@@@@AOBUAPTEAQ
+T %O@@@@@@@@T0%PTEAPTUHIO0@@@@@@@EDITEAPTUIRBSD@@@@@@@AQBU@IT%DIO0$1@@@@@@@@T0%RT%IRO3DIO0@@@@@@@D<IT%IRLSEJBR<@@@@@@@@@
+S0$1LSEJBR<@@@@@@@@@@@AOO3D1O2<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 227 231 0 132 132 0 151 156 0 142 131 128 255 252 49 175 181 0 255 234 140 218 222 0 251 255 33 74 74 0 94 99 0 107 107 0 143 148 0 189 189 0 87 90 0 251 255 8 247 255 16 167 173 0 206 99 132 156 74 99 206 66 107 115 16 49 255 16 90 189 0 57 132 16 49 206 0 57 198 123 140 255 49 123 255 33 99 222 0 66 99 0 24 239 0 66 255 0 74 255 140 214 148 0 41 140 49 74 198 123 148 255 0 82 90 0 24 132 0 41 206 99 123 156 0 41 198 0 57 74 0 24 255 16 82 214 0 66 90 0 33 189 0 49 107 0 33 206 16 74 214 8 66 218 112 214 255 0 255 208 32 144 199 21 133 186 85 211]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_dictionaries
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_dictionaries inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_dictionaries
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_dictionaries'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@T5EQT4@@@@@@@@@@@@AOTUAPTEARS0@@@@@@@@AOTU@HTE@I
+BEIO@@@@@@@@T5APBP!!PTUIRO0@@@@@@@EDIBP$I@P$HO3D@@@@@@@AQTUDIBEIRO3D1@@@@@@@@T5IRBEIRBP!!JO0@@@@@@@D=RT%H?LSEJR"<@@@@@@@@@
+S3D1LT(IBB<@@@@@@@@@@@AOO3D1O2<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 227 231 0 132 132 0 151 156 0 142 131 128 255 252 49 175 181 0 255 234 140 218 222 0 251 255 33 74 74 0 94 99 0 107 107 0 143 148 0 189 189 0 87 90 0 251 255 8 247 255 16 167 173 0 206 99 132 156 74 99 206 66 107 115 16 49 255 16 90 189 0 57 132 16 49 206 0 57 198 123 140 255 49 123 255 33 99 222 0 66 99 0 24 239 0 66 255 0 74 255 140 214 148 0 41 140 49 74 198 123 148 255 0 82 90 0 24 132 0 41 206 99 123 156 0 41 198 0 57 74 0 24 255 16 82 214 0 66 90 0 33 189 0 49 107 0 33 206 16 74 214 8 66 218 112 214 255 0 255 208 32 144 199 21 133 186 85 211]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_false
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_false inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_false
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView imageFor_false'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@ LC@ D@@@@@@@@@@@@DAPXFA0 IA@@@@@@@@@@JB0XLC@0L
+CP8J@@@@@@@@@ XOCA@PDA@QD @@@@@@@@LGC00PD1PNEQX@@@@@@@@CE1 LC@0MEQ$V@@@@@@@@@!!PTCA@PDAXZF0@@@@@@@@(QC 0PGA$]F!!8@@@@@@@@@
+G10LDA(ZF"@@@@@@@@@@@@@JF1XVF18@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[0 0 0 200 120 145 208 64 109 208 16 96 208 96 128 208 0 87 248 0 103 248 0 88 240 0 85 200 0 68 200 120 146 208 0 72 250 255 248 184 192 189 160 0 52 248 8 100 135 144 128 144 0 60 128 16 63 208 8 83 184 0 77 128 0 53 88 0 37 216 0 75 224 0 78 96 0 25 64 0 27 120 16 59 120 0 50 64 0 12 160 72 102 208 96 143 136 32 60]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_floats
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_floats inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_floats
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_floats'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@6LD5MLCX@@@@@@@@@@@ADRTEAOC-FQ@@@@@@@@@A@MT 2BS\;
+Q$U@@@@@@@@@LD!!HBP%HRTX>M@@@@@@@@D4<RC\IS#MFP4H@@@@@@@AMNS$9BSUCP3)B@@@@@@@@LCL3R0%EP4)GLP@@@@@@@D@>O $IBS8IQ2<@@@@@@@@@
+K$1LP$]GQ3<@@@@@@@@@@@A@LTIBLR<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 0 231 4 0 132 0 0 156 5 139 142 128 52 255 49 0 181 6 161 255 140 0 222 4 33 255 37 0 74 0 0 99 5 0 107 0 0 148 5 0 189 0 0 90 3 8 255 12 16 255 24 0 173 6 206 173 99 156 131 74 206 165 66 115 82 16 255 181 16 189 132 0 132 99 16 206 149 0 198 181 123 255 181 49 255 189 33 222 156 0 99 75 0 239 173 0 255 181 0 255 181 140 148 107 0 140 115 49 198 173 123 255 173 0 90 66 0 132 91 0 206 182 99 156 115 0 198 141 0 74 50 0 255 189 16 214 148 0 90 57 0 189 140 0 107 74 0 206 148 16 214 156 8]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_fractions
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_fractions inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_fractions
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_fractions'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@6LD5MLCX@@@@@@@@@@@ADRTEABS-FQ@@@@@@@@@A@MSH2BP$7
+LTY@@@@@@@@@LCH2L#HIS#D1M@@@@@@@@D4<OC0<BSL1LTH@@@@@@@AML3L3BP$ILSEB@@@@@@@@LCL3L0$3BT\1LP@@@@@@@D@>L3L3BT]GQ2<@@@@@@@@@
+K$03BP$IQ3<@@@@@@@@@@@A@LTIBLR<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 0 231 4 0 132 0 0 156 5 139 142 128 52 255 49 0 181 6 161 255 140 0 222 4 33 255 37 0 74 0 0 99 5 0 107 0 0 148 5 0 189 0 0 90 3 8 255 12 16 255 24 0 173 6 206 173 99 156 131 74 206 165 66 115 82 16 255 181 16 189 132 0 132 99 16 206 149 0 198 181 123 255 181 49 255 189 33 222 156 0 99 75 0 239 173 0 255 181 0 255 181 140 148 107 0 140 115 49 198 173 123 255 173 0 90 66 0 132 91 0 206 182 99 156 115 0 198 141 0 74 50 0 255 189 16 214 148 0 90 57 0 189 140 0 107 74 0 206 148 16 214 156 8]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_integers
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_integers inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_integers
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_integers'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@6LD5MLCX@@@@@@@@@@@ADRTEAOC-FQ@@@@@@@@@A@MT 2BS\;
+Q$U@@@@@@@@@LD!!HBP%HRTX>M@@@@@@@@D4<RC\IS#MFP4H@@@@@@@AMNS$9BSUCP3)B@@@@@@@@LCL3R0%EP4)GLP@@@@@@@D@>O $IBS9JQ2<@@@@@@@@@
+K$1LP$]GQ3<@@@@@@@@@@@A@LTIBLR<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 0 231 4 0 132 0 0 156 5 139 142 128 52 255 49 0 181 6 161 255 140 0 222 4 33 255 37 0 74 0 0 99 5 0 107 0 0 148 5 0 189 0 0 90 3 8 255 12 16 255 24 0 173 6 206 173 99 156 131 74 206 165 66 115 82 16 255 181 16 189 132 0 132 99 16 206 149 0 198 181 123 255 181 49 255 189 33 222 156 0 99 75 0 239 173 0 255 181 0 255 181 140 148 107 0 140 115 49 198 173 123 255 173 0 90 66 0 132 91 0 206 182 99 156 115 0 198 141 0 74 50 0 255 189 16 214 148 0 90 57 0 189 140 0 107 74 0 206 148 16 214 156 8]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_nil
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_nil inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_nil
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_nil'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@KEP4MEP,@@@@@@@@@@@@GEA$YAP4OA0@@@@@@@@@JEA$WF!!HM
+C1 J@@@@@@@@EQ$R@@ CEAXDDP@@@@@@@@4ED!!(ACQXXC@X@@@@@@@@ME@4TEAXXCALF@@@@@@@@EQXVE HXC@XNF@@@@@@@@@(DF@PLCALNC!!@@@@@@@@@@
+A1LSA 8NC 4@@@@@@@@@@@@JF@XFFA@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_others
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_others inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_others
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_others'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@_G1<_G1<@@@@@@@@@@@@_BP$IBP HF0@@@@@@@@@_BP$HH@ \
+BA8[@@@@@@@@G0$HH  ,BB$(F0@@@@@@@A<IJ0 $BB$HGQ,@@@@@@@@_BP #BBDHJRX[@@@@@@@@G0 )BB4HHQ<%F0@@@@@@@A<HBB4HKQ<''IQ,@@@@@@@@@
+F2\''J"T%IQ,@@@@@@@@@@@@[F1,[F1,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 227 231 0 132 132 0 151 156 0 142 131 128 255 252 49 175 181 0 255 234 140 218 222 0 251 255 33 74 74 0 94 99 0 107 107 0 143 148 0 189 189 0 87 90 0 251 255 8 247 255 16 167 173 0]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_sequenceableCollections
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_sequenceableCollections inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_sequenceableCollections
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_sequenceableCollections'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@T5EQT4@@@@@@@@@@@@AOTUAPTEARS0@@@@@@@@AOTUAPTE@I
+BEIO@@@@@@@@T5APTEAPTUIRO0@@@@@@@EEPTEAPT $HO3D@@@@@@@AQTUERT%IRO3D1@@@@@@@@T5IRT%IRBP!!JO0@@@@@@@D=RT%H?LSEJR"<@@@@@@@@@
+S3D1LT(IBB<@@@@@@@@@@@AOO3D1O2<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 227 231 0 132 132 0 151 156 0 142 131 128 255 252 49 175 181 0 255 234 140 218 222 0 251 255 33 74 74 0 94 99 0 107 107 0 143 148 0 189 189 0 87 90 0 251 255 8 247 255 16 167 173 0 206 99 132 156 74 99 206 66 107 115 16 49 255 16 90 189 0 57 132 16 49 206 0 57 198 123 140 255 49 123 255 33 99 222 0 66 99 0 24 239 0 66 255 0 74 255 140 214 148 0 41 140 49 74 198 123 148 255 0 82 90 0 24 132 0 41 206 99 123 156 0 41 198 0 57 74 0 24 255 16 82 214 0 66 90 0 33 189 0 49 107 0 33 206 16 74 214 8 66 218 112 214 255 0 255 208 32 144 199 21 133 186 85 211]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_strings
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_strings inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_strings
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_strings'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@6LD5MLCX@@@@@@@@@@@ADRTEAOC-FQ@@@@@@@@@A@MTDIM5LI
+BTU@@@@@@@@@LDDIM3]HBP$>M@@@@@@@@D4<BP$8S#LIP4H@@@@@@@AMNP$IMUDIP3)B@@@@@@@@LCL3R4=EP4)GLP@@@@@@@D@>QS9CTC)RQ2<@@@@@@@@@
+K$1LP$]GQ3<@@@@@@@@@@@A@LTIBLR<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 227 231 0 132 132 0 151 156 0 142 131 128 255 252 49 175 181 0 255 234 140 218 222 0 251 255 33 74 74 0 94 99 0 107 107 0 143 148 0 189 189 0 87 90 0 251 255 8 247 255 16 167 173 0 206 99 132 156 74 99 206 66 107 115 16 49 255 16 90 189 0 57 132 16 49 206 0 57 198 123 140 255 49 123 255 33 99 222 0 66 99 0 24 239 0 66 255 0 74 255 140 214 148 0 41 140 49 74 198 123 148 255 0 82 90 0 24 132 0 41 206 99 123 156 0 41 198 0 57 74 0 24 255 16 82 214 0 66 90 0 33 189 0 49 107 0 33 206 16 74 214 8 66 173 0 49 115 0 33 181 0 49 74 0 16 255 8 82]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_symbols
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_symbols inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_symbols
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView class imageFor_symbols'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@6LD5MLCX@@@@@@@@@@@ADRTEAOC-FQ@@@@@@@@@A@MTDIM5LI
+Q$U@@@@@@@@@LDDIBP$IBP$>M@@@@@@@@D4<NP$8S $>P4H@@@@@@@AMNS$IMUDIP3)B@@@@@@@@LCLIBP$IBP%GLP@@@@@@@D@>QP%CT@%RQ2<@@@@@@@@@
+K$1LP$]GQ3<@@@@@@@@@@@A@LTIBLR<@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 0 0 0 227 231 0 132 132 0 151 156 0 142 131 128 255 252 49 175 181 0 255 234 140 218 222 0 251 255 33 74 74 0 94 99 0 107 107 0 143 148 0 189 189 0 87 90 0 251 255 8 247 255 16 167 173 0 206 99 132 156 74 99 206 66 107 115 16 49 255 16 90 189 0 57 132 16 49 206 0 57 198 123 140 255 49 123 255 33 99 222 0 66 99 0 24 239 0 66 255 0 74 255 140 214 148 0 41 140 49 74 198 123 148 255 0 82 90 0 24 132 0 41 206 99 123 156 0 41 198 0 57 74 0 24 255 16 82 214 0 66 90 0 33 189 0 49 107 0 33 206 16 74 214 8 66 173 0 49 115 0 33 181 0 49 74 0 16 255 8 82]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+!
+
+imageFor_true
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self imageFor_true inspect
+     ImageEditor openOnClass:self andSelector:#imageFor_true
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'InspectorView imageFor_true'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@(MB@ MB @@@@@@@@@@@@:K#@0F2(\N @@@@@@@@@-H0$IBP$I
+A18-@@@@@@@@MC@GI@$$IBP9HP@@@@@@@B@[J3DIIB0^K3 @@@@@@@@ MRT5BRP^K1<8@@@@@@@@MB0,I $$K2\"JP@@@@@@@B49G#$IIA<]H#H@@@@@@@@@
+M#L3NBH"H#\@@@@@@@@@@@@-JS 8JSH@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[226 226 226 176 176 176 155 155 155 169 169 169 152 152 152 164 164 164 149 149 149 192 192 192 240 240 240 255 255 255 202 202 202 201 201 201 151 151 151 162 162 162 148 148 148 158 158 158 173 173 173 154 154 154 167 167 167 150 150 150 160 160 160 180 180 180 156 156 156 170 170 170 153 153 153 165 165 165 183 183 183 98 255 0 75 198 0 25 74 0 57 156 0 34 99 0 92 206 16 60 132 16 31 74 0 79 206 0 128 131 142 88 231 0 70 189 0 38 90 0 148 198 123 57 115 16 92 239 0 103 255 8 76 189 0 154 198 123 85 214 0 53 132 0 106 255 0 138 255 49 107 156 74 44 115 0 119 206 66 85 222 0 142 206 99 68 139 33 33 90 0 57 148 0 135 206 99]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@A>@O<A?8G? _>A?8G? _>@?0A>@@@@@@@@@b') ; yourself); yourself]
+! !
+
 !InspectorView class methodsFor:'queries-plugin'!
 
 aspectSelectors
@@ -403,7 +750,7 @@
 inspect:anObject
     "set/update the object to be inspected"
 
-    |aList sameObject sameClass oldSelectedField idx|
+    |keepList fieldNameList sameObject sameClass oldSelectedField idx|
 
     "/ (anObject isNil and:[object isNil]) ifTrue:[^ self].
 
@@ -419,15 +766,19 @@
     ].
     inspectedObject := object := anObject.
 
-    ((sameObject | sameClass) and:[listView list notEmptyOrNil]) ifTrue:[
-"/        listView setContents:aList.
-    ] ifFalse:[
+    keepList := ((sameObject | sameClass) and:[listView list notEmptyOrNil]).
+    "/ assume that the list remains unchanged;
+    "/ this is no longer true, if some inst-slot has changed (bullet colors)
+    UserPreferences current showTypeIndicatorInInspector ifTrue:[
+        keepList := false.
+    ].
+    keepList ifFalse:[
         hasMore := false.
-        aList := self fieldList.                               
+        fieldNameList := self fieldList.                               
         hasMore ifTrue:[
-            aList add:' ... '
+            fieldNameList add:' ... '
         ].
-        listView contents:aList.
+        listView contents:fieldNameList.
         workspace contents:nil.
         self setDoItAction.
     ].
@@ -451,8 +802,8 @@
     ].
     self showSelection:((selectedLine ? 1) min: listView list size)
 
-    "Modified: / 15-07-2011 / 16:20:32 / cg"
     "Modified (comment): / 06-08-2011 / 13:41:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 02-06-2012 / 13:06:59 / cg"
 !
 
 isStandaloneInspector:aBoolean
@@ -490,11 +841,10 @@
     ].
 
     listView contents:aList.
-
-"/    workspace contents:nil.
     self setDoItAction.
-
     selectionIndex := selectedLine := nil
+
+    "Modified (comment): / 02-06-2012 / 13:08:15 / cg"
 !
 
 suppressHeadline:aBoolean
@@ -1602,7 +1952,7 @@
 
     idx := self theSingleSelectionIndex.
     idx notNil ifTrue:[
-        sel := listView at:idx.
+        sel := self listEntryAt:idx.
 
         extraAttributes := object inspectorExtraAttributes.
         (extraAttributes notNil and:[extraAttributes includesKey:sel]) ifTrue:[
@@ -1627,7 +1977,100 @@
     ].
     ^ self basicDisplayStringForValue:someValue
 
-    "Modified: / 17-11-2010 / 19:20:47 / cg"
+    "Modified: / 16-05-2012 / 17:55:05 / cg"
+!
+
+iconForValue: anObject
+    anObject isNil ifTrue:[
+        ^ self class imageFor_nil
+    ].
+    anObject isNumber ifTrue:[
+        anObject isInteger ifTrue:[
+            ^ self class imageFor_integers
+        ].
+        anObject isFloat ifTrue:[
+            ^ self class imageFor_floats
+        ].
+        anObject isFraction ifTrue:[
+            ^ self class imageFor_fractions
+        ].
+    ].
+    anObject isCollection ifTrue:[
+        anObject isString ifTrue:[
+            anObject isSymbol ifTrue:[
+                ^ self class imageFor_symbols
+            ].
+            ^ self class imageFor_strings
+        ].
+        (anObject isKindOf:Dictionary) ifTrue:[
+            ^ self class imageFor_dictionaries
+        ].
+        (anObject isArray) ifTrue:[
+            ^ self class imageFor_arrays
+        ].
+        (anObject isSequenceable) ifTrue:[
+            ^ self class imageFor_sequenceableCollections
+        ].
+        ^ self class imageFor_collections
+    ].
+    anObject == true ifTrue:[
+        ^ self class imageFor_true
+    ].
+    anObject == false ifTrue:[
+        ^ self class imageFor_false
+    ].
+    anObject isCharacter ifTrue:[
+        ^ self class imageFor_characters
+    ].
+    anObject isBehavior ifTrue:[
+        ^ self class imageFor_classes
+    ].
+    ^ self class imageFor_others
+
+    "Created: / 16-05-2012 / 17:58:20 / cg"
+!
+
+listEntryForName:nameString value:value
+    |valString plainString|
+
+    UserPreferences current showTypeIndicatorInInspector ifFalse:[
+        ^ nameString
+    ].
+
+    value isNumber ifTrue:[
+        valString := value printString
+    ] ifFalse:[
+        (value isSymbol or:[value isCharacter]) ifTrue:[
+            valString := value storeString
+        ] ifFalse:[
+            value isString ifTrue:[
+                valString := value contractTo:30.
+            ] ifFalse:[
+                value isColor ifTrue:[
+                    valString := value htmlPrintString
+                ].
+            ].
+        ]
+    ].
+
+    valString notNil ifTrue:[
+        plainString := (nameString allBold,' <',valString,'>').
+    ] ifFalse:[
+        plainString := nameString allBold
+    ].
+
+    value isColor ifTrue:[
+        plainString := plainString
+                     , '  ' , ('   '
+                        colorizeAllWith:((value brightness < 0.5)
+                                ifTrue:[ Color white ]
+                                ifFalse:[ Color black ])
+                        on:value).
+    ].
+
+    ^ LabelAndIcon string:plainString image:(self iconForValue:value)
+
+    "Created: / 16-05-2012 / 18:42:28 / cg"
 !
 
 stringWithAllIndexedVarValues
@@ -1839,7 +2282,7 @@
         firstRealIndex := 2.
     ].
 
-    [line := listView at:firstRealIndex. 
+    [line := self listEntryAt:firstRealIndex. 
      (line startsWith:'-') and:[line size < 2 or:[line second isDigit not]]] whileTrue:[
         firstRealIndex := firstRealIndex + 1.
         idx := idx - 1.
@@ -1868,7 +2311,7 @@
     ^ nil "/ indexed instvar or other selected
 
     "Created: / 03-08-2006 / 13:45:14 / cg"
-    "Modified: / 04-08-2006 / 11:45:29 / cg"
+    "Modified: / 16-05-2012 / 17:54:52 / cg"
 !
 
 fieldList 
@@ -1919,7 +2362,7 @@
     "return a list of indexes usable to access the object's indexed slots.
      Set hasMore to true, if a '...' entry should be added."
 
-    |objSz n cls sz|
+    |objSz n cls list|
 
     cls := object class.
 
@@ -1930,9 +2373,13 @@
         n := nShown.
         hasMore := true.
     ].
-    ^ (1 to:n)
-
-    "Modified: / 24-08-2010 / 17:56:23 / cg"
+    list := (1 to:n).
+    ^ list 
+"/        keysAndValuesCollect:[:idx :nm |
+"/            LabelAndIcon string:nm image:(self iconForValue:(object basicAt:idx))
+"/        ].
+
+    "Modified: / 16-05-2012 / 18:34:35 / cg"
 !
 
 indexOfFirstNamedInstvarInList
@@ -1949,19 +2396,21 @@
     [
         |line|
 
-        line := listView at:firstRealIndex. 
+        line := self listEntryAt:firstRealIndex. 
         (line startsWith:'-') and:[line size < 2 or:[line second isDigit not]]
     ] whileTrue:[
         firstRealIndex := firstRealIndex + 1.
     ].
     ^ firstRealIndex
+
+    "Modified: / 16-05-2012 / 17:54:46 / cg"
 !
 
 indexedFieldList 
     "return a list of indexed-variable names to show in the selectionList.
      Set hasMore to true, if a '...' entry should be added."
 
-    |l maxIndex sz|
+    |l maxIndex sz list|
 
     l := self indexList.
     l isEmptyOrNil ifTrue:[^ nil ].
@@ -1973,18 +2422,26 @@
         ] ifFalse:[
             sz := 0
         ].
-        ^ l collect:[:i | 
-            i isInteger ifTrue:[
-                (i printStringRadix:integerDisplayRadix size:sz fill:$0) 
-            ] ifFalse:[
-                i printString
-            ]
+        list := l collect:
+            [:i | 
+                i isInteger ifTrue:[
+                    (i printStringRadix:integerDisplayRadix size:sz fill:$0) 
+                ] ifFalse:[
+                    i printString
+                ]
             ]
     ] ifFalse:[
-        ^ l collect:[:i | i printString].
+        list := l collect:[:i | i printString].
     ].
 
-    "Modified: / 14-11-2011 / 12:56:12 / cg"
+    ^ list
+        keysAndValuesCollect:[:idx :nm |
+            self listEntryForName:nm value:(object at:idx)
+        ].
+
+    ^ list.
+
+    "Modified: / 16-05-2012 / 18:43:10 / cg"
 !
 
 indexedValueAtIndex:idx
@@ -2021,7 +2478,7 @@
         firstRealIndex := 2.
     ].
 
-    [line := listView at:firstRealIndex. 
+    [line :=self listEntryAt:firstRealIndex. 
      (line startsWith:'-') and:[line size < 2 or:[line second isDigit not]]] whileTrue:[
         firstRealIndex := firstRealIndex + 1.
         idx := idx - 1.
@@ -2042,7 +2499,7 @@
     ].
     ^ nil "/ indexed instvar or other selected
 
-    "Modified: / 31.10.2001 / 09:20:20 / cg"
+    "Modified: / 16-05-2012 / 17:54:41 / cg"
 !
 
 keyIndexForLine:lineNr
@@ -2063,7 +2520,7 @@
         firstRealIndex := firstRealIndex + 1.
     ].
 
-    [line := listView at:firstRealIndex. 
+    [line := self listEntryAt:firstRealIndex. 
      line notNil
      and:[(line startsWith:'-') and:[line size < 2 or:[line second isDigit not]]]
     ] whileTrue:[
@@ -2087,7 +2544,17 @@
     ].
     ^ idx - (nNamedInstvarsShown+nExtraNamedInstvarsShown).
 
-    "Modified: / 04-08-2006 / 11:45:42 / cg"
+    "Modified: / 16-05-2012 / 17:54:34 / cg"
+!
+
+listEntryAt:lineNr
+    |entry|
+
+    entry := listView at:lineNr.
+    entry isNil ifTrue:[^ entry].
+    ^ entry string
+
+    "Created: / 16-05-2012 / 17:53:39 / cg"
 !
 
 namedFieldAt:idx
@@ -2113,10 +2580,14 @@
         "/ hide some stuff
         aList := aList copyFrom:(self baseInspectedObjectClass instSize + 1).
     ].
+    ^ aList 
+        keysAndValuesCollect:[:idx :nm |
+            self listEntryForName:nm value:(object instVarAt:idx)
+        ].
 
     ^ aList
 
-    "Modified: / 18-09-2006 / 21:35:30 / cg"
+    "Modified: / 16-05-2012 / 18:43:23 / cg"
 !
 
 pseudoFieldNames
@@ -2193,7 +2664,7 @@
     ifTrue:[
         acceptAction := nil.
     ] ifFalse:[
-        sel := listView at:idx.
+        sel := self listEntryAt:idx.
 
         (sel startsWith:'-all') ifTrue:[
             acceptAction := nil.
@@ -2213,6 +2684,8 @@
     ].
 
     workspace acceptAction:acceptAction.
+
+    "Modified: / 16-05-2012 / 17:54:16 / cg"
 !
 
 setDoItAction
@@ -2288,9 +2761,9 @@
         ^ object
     ].
 
-    ((l := listView at:lineNr) startsWith:$-) ifTrue:[
+    ((l := self listEntryAt:lineNr) startsWith:$-) ifTrue:[
         (l ~= '-' and:[(l at:2) isDigit not "negative number"]) ifTrue:[
-            ^ self valueForSpecialLine:(listView at:lineNr)
+            ^ self valueForSpecialLine:l
         ].
     ].
 
@@ -2323,7 +2796,7 @@
     "/ nope
     ^ nil
 
-    "Modified: / 03-08-2006 / 14:05:30 / cg"
+    "Modified: / 16-05-2012 / 17:54:06 / cg"
 !
 
 valueAtLine:lineNr put:newValue
@@ -2534,9 +3007,9 @@
 !InspectorView methodsFor:'user interaction'!
 
 doAccept:theText
-    |sel newValue|
-
-    sel := listView at:(self theSingleSelectionIndex).
+    |sel newValue fieldNameList|
+
+    sel := self listEntryAt:(self theSingleSelectionIndex).
     (sel startsWith:'-all') ifTrue:[
         workspace flash.
         ^ self.
@@ -2554,8 +3027,16 @@
             (self valueAtLine:selectionIndex) value:newValue
         ] ifFalse:[
             self valueAtLine:selectionIndex put:newValue.
-        ]
+        ].
+        "/ update the fieldList...
+        fieldNameList := self fieldList.                               
+        hasMore ifTrue:[
+            fieldNameList add:' ... '
+        ].
+        listView contents:fieldNameList.
     ]
+
+    "Modified: / 04-06-2012 / 18:16:29 / cg"
 !
 
 doCopyKey
@@ -2713,13 +3194,13 @@
 !InspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.249 2012/03/13 07:26:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.257 2012/06/04 16:17:33 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.249 2012/03/13 07:26:31 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.257 2012/06/04 16:17:33 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: InspectorView.st 7952 2012-03-21 17:50:14Z vranyj1 $'
+    ^ '$Id: InspectorView.st 8007 2012-06-05 14:49:00Z vranyj1 $'
 ! !