Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 01 Jul 2013 22:15:23 +0100
branchjv
changeset 13178 c9bf900fe729
parent 13177 f8f283ea3f4c (current diff)
parent 13079 131bed1fbee2 (diff)
child 13179 b5d9725e479a
Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD)
AbstractFileBrowser.st
AbstractSettingsApplication.st
BrowserView.st
ChangesBrowser.st
DebugView.st
FileBrowserV2.st
FileBrowserV2SettingsAppl.st
FileDialog.st
ImageInspectorView.st
InspectorView.st
MemoryUsageView.st
NewLauncher.st
ParseTreeIndex.st
SyntaxElement.st
SyntaxHighlighter2.st
SystemBrowser.st
Tools__ChangeSetBrowser2.st
Tools__ChangeSetDiffTool.st
Tools__CodeHighlightingService.st
Tools__CodeNavigationService.st
Tools__CodeView2.st
Tools__CodeViewService.st
Tools__Inspector2.st
Tools__LintRuleDetail.st
Tools__NewSystemBrowser.st
Tools__TagsBrowser.st
Tools__TestRunner2.st
extensions.st
resources/de.rs
--- a/.hgtags	Mon Jul 01 12:31:33 2013 +0100
+++ b/.hgtags	Mon Jul 01 22:15:23 2013 +0100
@@ -5,6 +5,7 @@
 0b715d777c488bf60cadb45e1336e6191b713369 rel2_10_8_6_last2
 0b7d7aedc1cd27c9468db2e11b39e2d211556973 rel3_6_1
 11ee27b3b78ffd84f09d640f937c2caa7b11b06a rel5_2_1
+120e9d705e11b69e89712c39e7643471ffbfbb8e expecco_2_5_1
 136ee82663fb4768cae91bde1a499b9d83bfad4d rel2_10_8_5
 165da720693d3aa09b58c216d9031e316a9c82a3 rel3_4_3_1
 1adbdbbef6efc3f1cae90e02bbd4d3a2216bba11 rel2_10_8_6_last_before_vmData_change
@@ -18,7 +19,6 @@
 3e7f1d7b7a3668a30eb14f320dc532ed0f2049ae expeccoNET_1_4_0rc1
 3e7f1d7b7a3668a30eb14f320dc532ed0f2049ae expecco_1_7_0rc3
 463dd6fa737f1911b40acf7874e7173cf8b3525c rel5_2_1_fixed
-550f2f25a5b41e7e4b151ccc2c0b717eea308313 stable
 596696438e67fee735ba71f62177ccc091b9a0bb expecco_1_7_2rc1
 5aa270837e0ab5e0fa19d2c02d46c864cc41c859 expeccoNET_1_5_1rc1
 62451ecb3d3bbf1f6067c931eda2cdb57aa67ead expeccoNET_1_7_0_0
@@ -30,7 +30,6 @@
 8314abc6ed8f5dfeb3e68dbe88b8e5761c3be95f expecco_1_8_0rc1
 86b5d78f396e640514438498a168d5259ea7dd79 rel4_1_7
 86b5d78f396e640514438498a168d5259ea7dd79 release
-8918f716de1989763f0f38c8aa7e05aeddeb9b73 expecco_2_5_1
 8b31177ded1bd9e0de5e2cec5271a827e08f8778 rel5_1_4
 91902ae3978238320aa4642b129b0bd1ac3983fe expecco_1_7_0rc1
 94c64ad24577fdc86cbc80e55c5ca7ff502c094b expecco_2_4_0
@@ -51,6 +50,7 @@
 b68ba5310493e1bf7956bb5e75309b4b5d33dd68 expecco_1_6_0
 c6afed1e4bfa09e6c3b209679925ad74eb761af9 expecco_1_7_0rc8
 c955fe2bbcb582ea2c89428707d2a181ecde2f92 stx_6_2_2
+ce4ad488c0c6cd3300676175710b49c1d4acfdbb stable
 d42566f1a9ba30ece3b2ddea3ac312dfc6802e45 rel5_2_8
 d985c7c23d8e1558a5180826cb985ee84938162c rel3_4_1_1
 defcf4bd5764439d0a898491271789b0bfdf12cc expeccoNET_1_6_0_0
--- a/AbstractFileBrowser.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/AbstractFileBrowser.st	Mon Jul 01 22:15:23 2013 +0100
@@ -557,7 +557,7 @@
            sortDirectoriesBeforeFiles  true
            openAlwaysInTextEditor      false
            sortCaseless                false
-           useCodeView2InTools         true
+           "/ useCodeView2InTools         true   -- vanishes
       )
 
     "Modified: / 11-05-2012 / 09:22:04 / cg"
@@ -8874,9 +8874,9 @@
 sortCaseless
     " aspect for sort caseless "
 
-    ^ self aspectFor:#sortCaseless ifAbsent:[
-            (Filename isCaseSensitive not) asValue.
-        ]
+    ^ self 
+        aspectFor:#sortCaseless 
+        ifAbsent:[ (Filename isCaseSensitive not) asValue ]
 !
 
 sortDirectoriesBeforeFiles
@@ -9320,11 +9320,11 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.530 2013-06-21 12:25:58 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.532 2013-06-25 14:49:23 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.530 2013-06-21 12:25:58 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.532 2013-06-25 14:49:23 cg Exp $'
 !
 
 version_HG
--- a/AbstractSettingsApplication.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/AbstractSettingsApplication.st	Mon Jul 01 22:15:23 2013 +0100
@@ -561,22 +561,24 @@
      The object is typically the current userPreferences object, or a flag-holder, such
      as ParserFlags.
      Using this, and a list of aspect selectors replaces code like:
-	someone aspect1 ~= (self aspect1 value) ifTrue:[^ true].
-	someone aspect2 ~= (self aspect2 value) ifTrue:[^ true].
-	...
-	someone aspectN ~= (self aspectN value) ifTrue:[^ true].
-	^ false
+        someone aspect1 ~= (self aspect1 value) ifTrue:[^ true].
+        someone aspect2 ~= (self aspect2 value) ifTrue:[^ true].
+        ...
+        someone aspectN ~= (self aspectN value) ifTrue:[^ true].
+        ^ false
      Prerequisite:
-	local aspects must be named like corresponding aspect methods in the flag-provider.
+        local aspects must be named like corresponding aspect methods in the flag-provider.
     "
 
     aListOfAspects do:[:eachAspectSymbol |
-	(self perform:eachAspectSymbol) value ~= (anAspectProvider perform:eachAspectSymbol) ifTrue:[
-"/Transcript showCR:'different: ',eachAspectSymbol.
-"/Transcript showCR:'here: ',(self perform:eachAspectSymbol) value.
-"/Transcript showCR:'there: ',(anAspectProvider perform:eachAspectSymbol) value.
-	    ^ true
-	].
+        (self perform:eachAspectSymbol) value ~= (anAspectProvider perform:eachAspectSymbol) ifTrue:[
+            self debuggingCodeFor:#cg is:[
+                Transcript showCR:'different: ',eachAspectSymbol.
+                Transcript showCR:'here: ',((self perform:eachAspectSymbol) value) printString.
+                Transcript showCR:'there: ',((anAspectProvider perform:eachAspectSymbol) value) printString.
+            ].
+            ^ true
+        ].
     ].
     ^ false
 
@@ -3863,18 +3865,6 @@
                     extent: (Point 600 25)
                   )
                  (CheckBoxSpec
-                    label: 'Tab Stops in Multiples of 4'
-                    name: 'TabStopsMultiples4CheckBox'
-                    activeHelpKey: tabStops4
-                    model: tabsIs4
-                    translateLabel: true
-                    extent: (Point 600 25)
-                  )
-                 (DividerSpec
-                    name: 'Separator1'
-                    extent: (Point 600 4)
-                  )
-                 (CheckBoxSpec
                     label: 'Show Accept/Cancel Bar in Editor'
                     name: 'ShowAcceptCancelBarInBrowser'
                     activeHelpKey: showAcceptCancelBar
@@ -3890,6 +3880,18 @@
                     extent: (Point 600 25)
                   )
                  (DividerSpec
+                    name: 'Separator5'
+                    extent: (Point 600 4)
+                  )
+                 (CheckBoxSpec
+                    label: 'Tab Stops in Multiples of 4'
+                    name: 'TabStopsMultiples4CheckBox'
+                    activeHelpKey: tabStops4
+                    model: tabsIs4
+                    translateLabel: true
+                    extent: (Point 600 25)
+                  )
+                 (DividerSpec
                     name: 'Separator2'
                     extent: (Point 600 4)
                   )
@@ -7018,16 +7020,16 @@
 'Start incremental background GC whenever freespace drops below this'
 
 #igcLimit
-'Start incremental background GC whenever this amount has been allocated'
+'Start incremental background GC whenever this amount has been allocated in oldSpace since last GC'
 
 #maxOldSpace
-'Never allocate more than this amount of memory (oldSpace limit).\Having a limit here prevents runaway programs from allocating virtually unlimited amounts of memory.\That could lead to thrashing the virtual memory system and make the while system useless.\Notice that on 32bit systmes, there is an implementation and OS dependent upper limit on this maximum'
+'Never allocate more than this amount of memory (oldSpace limit).\Having a limit here prevents runaway programs from allocating virtually unlimited amounts of memory.\That could lead to thrashing the virtual memory system and make the whole system useless.\Notice that on 32bit systmes, there is an implementation and OS dependent upper limit on this maximum'
 
 #methodCodeSizeLimit
 'Do not JIT, if an individual method''s code size exceeds this'
 
 #newSpaceSize
-'Size of the space where new objects are created (newSpace).\The size determines the worst-case pause time of a scavenge operation.\For server and other request-processing applications, a bigger newSpace may substantally reduce the GC overhead (to almost 0%).\Useful values are between 400Kb to 16Mb'
+'Size of the space where new objects are created (newSpace).\The size determines the worst-case pause time of a scavenge operation.\For server, other request-processing applications and development, a bigger newSpace may substantally reduce the GC overhead (to almost 0%).\Useful values are between 400Kb to 16Mb'
 
 #oldIncr
 'Increase oldSpace in chunks of this size'
@@ -7095,16 +7097,58 @@
               component: 
              (SpecCollection
                 collection: (
+                 (LabelSpec
+                    label: 'Limits:'
+                    name: 'Label54'
+                    translateLabel: true
+                    adjust: left
+                    extent: (Point 705 22)
+                  )
+                 (ViewSpec
+                    name: 'StackLimitBox'
+                    activeHelpKey: stackLimit
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (LabelSpec
+                          label: 'Stack Limit:'
+                          name: 'Label38'
+                          layout: (LayoutFrame 0 0 3 0 265 0 23 0)
+                          activeHelpKey: stackLimit
+                          translateLabel: true
+                          adjust: right
+                        )
+                       (InputFieldSpec
+                          name: 'EntryField20'
+                          layout: (LayoutFrame 270 0 3 0 360 0 23 0)
+                          activeHelpKey: stackLimit
+                          enableChannel: supportsJustInTimeCompilation
+                          model: stackLimit
+                          type: fileSize
+                          acceptOnReturn: true
+                          acceptOnTab: true
+                          acceptOnLostFocus: true
+                          acceptOnPointerLeave: true
+                        )
+                       (LabelSpec
+                          label: '(Trigger recursionInterrupt if more stack is used by a process)'
+                          name: 'Label39'
+                          layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
+                          activeHelpKey: stackLimit
+                          translateLabel: true
+                          adjust: left
+                        )
+                       )
+                     
+                    )
+                    extent: (Point 705 30)
+                  )
                  (ViewSpec
                     name: 'NewSpaceSizeBox'
                     activeHelpKey: newSpaceSize
                     component: 
                    (SpecCollection
                       collection: (
-                       (DividerSpec
-                          name: 'Separator24'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
                        (LabelSpec
                           label: 'Size of NewSpace:'
                           name: 'Label44'
@@ -7143,10 +7187,6 @@
                     component: 
                    (SpecCollection
                       collection: (
-                       (DividerSpec
-                          name: 'Separator25'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
                        (InputFieldSpec
                           name: 'EntryField24'
                           layout: (LayoutFrame 270 0 3 0 360 0 23 0)
@@ -7185,10 +7225,6 @@
                     component: 
                    (SpecCollection
                       collection: (
-                       (DividerSpec
-                          name: 'Separator15'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
                        (LabelSpec
                           label: 'Quick Allocation Limit:'
                           name: 'Label26'
@@ -7222,141 +7258,11 @@
                     extent: (Point 705 30)
                   )
                  (ViewSpec
-                    name: 'IncrementalGCAllocationTriggerBox'
-                    activeHelpKey: igcLimit
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (DividerSpec
-                          name: 'Separator26'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
-                       (LabelSpec
-                          label: 'Incremental GC Allocation Trigger:'
-                          name: 'Label48'
-                          layout: (LayoutFrame 0 0 3 0 265 0 23 0)
-                          activeHelpKey: igcLimit
-                          translateLabel: true
-                          adjust: right
-                        )
-                       (InputFieldSpec
-                          name: 'EntryField25'
-                          layout: (LayoutFrame 270 0 3 0 360 0 23 0)
-                          activeHelpKey: igcLimit
-                          model: igcLimit
-                          type: fileSize
-                          acceptOnReturn: true
-                          acceptOnTab: true
-                          acceptOnLostFocus: true
-                          acceptOnPointerLeave: true
-                        )
-                       (LabelSpec
-                          label: '(Start IGC whenever this amount has been allocated)'
-                          name: 'Label49'
-                          layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
-                          activeHelpKey: igcLimit
-                          translateLabel: true
-                          adjust: left
-                        )
-                       )
-                     
-                    )
-                    extent: (Point 705 30)
-                  )
-                 (ViewSpec
-                    name: 'IncrementalGCFreespaceTriggerBox'
-                    activeHelpKey: igcFreeLimit
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (DividerSpec
-                          name: 'Separator27'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
-                       (LabelSpec
-                          label: 'Incremental GC Freespace Trigger:'
-                          name: 'Label50'
-                          layout: (LayoutFrame 0 0 3 0 265 0 23 0)
-                          activeHelpKey: igcFreeLimit
-                          translateLabel: true
-                          adjust: right
-                        )
-                       (InputFieldSpec
-                          name: 'EntryField26'
-                          layout: (LayoutFrame 270 0 3 0 360 0 23 0)
-                          activeHelpKey: igcFreeLimit
-                          model: igcFreeLimit
-                          type: fileSize
-                          acceptOnReturn: true
-                          acceptOnTab: true
-                          acceptOnLostFocus: true
-                          acceptOnPointerLeave: true
-                        )
-                       (LabelSpec
-                          label: '(Start IGC whenever freespace drops below this)'
-                          name: 'Label51'
-                          layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
-                          activeHelpKey: igcFreeLimit
-                          translateLabel: true
-                          adjust: left
-                        )
-                       )
-                     
-                    )
-                    extent: (Point 705 30)
-                  )
-                 (ViewSpec
-                    name: 'GCAmountBox'
-                    activeHelpKey: igcFreeAmount
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (DividerSpec
-                          name: 'Separator18'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
-                       (LabelSpec
-                          label: 'Incremental GC Amount:'
-                          name: 'Label32'
-                          layout: (LayoutFrame 0 0 3 0 265 0 23 0)
-                          activeHelpKey: igcFreeAmount
-                          translateLabel: true
-                          adjust: right
-                        )
-                       (InputFieldSpec
-                          name: 'EntryField17'
-                          layout: (LayoutFrame 270 0 3 0 360 0 23 0)
-                          activeHelpKey: igcFreeAmount
-                          model: igcFreeAmount
-                          type: fileSize
-                          acceptOnReturn: true
-                          acceptOnTab: true
-                          acceptOnLostFocus: true
-                          acceptOnPointerLeave: true
-                        )
-                       (LabelSpec
-                          label: '(Try to keep this amount for peak requests)'
-                          name: 'Label33'
-                          layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
-                          activeHelpKey: igcFreeAmount
-                          translateLabel: true
-                          adjust: left
-                        )
-                       )
-                     
-                    )
-                    extent: (Point 705 30)
-                  )
-                 (ViewSpec
                     name: 'OldspaceIncrementBox'
                     activeHelpKey: oldIncr
                     component: 
                    (SpecCollection
                       collection: (
-                       (DividerSpec
-                          name: 'Separator19'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
                        (LabelSpec
                           label: 'Oldspace Increment:'
                           name: 'Label34'
@@ -7394,10 +7300,6 @@
                     component: 
                    (SpecCollection
                       collection: (
-                       (DividerSpec
-                          name: 'Separator20'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
                        (LabelSpec
                           label: 'Oldspace Compress Limit:'
                           name: 'Label36'
@@ -7431,58 +7333,11 @@
                     extent: (Point 705 30)
                   )
                  (ViewSpec
-                    name: 'StackLimitBox'
-                    activeHelpKey: stackLimit
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (DividerSpec
-                          name: 'Separator21'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
-                       (LabelSpec
-                          label: 'Stack Limit:'
-                          name: 'Label38'
-                          layout: (LayoutFrame 0 0 3 0 265 0 23 0)
-                          activeHelpKey: stackLimit
-                          translateLabel: true
-                          adjust: right
-                        )
-                       (InputFieldSpec
-                          name: 'EntryField20'
-                          layout: (LayoutFrame 270 0 3 0 360 0 23 0)
-                          activeHelpKey: stackLimit
-                          enableChannel: supportsJustInTimeCompilation
-                          model: stackLimit
-                          type: fileSize
-                          acceptOnReturn: true
-                          acceptOnTab: true
-                          acceptOnLostFocus: true
-                          acceptOnPointerLeave: true
-                        )
-                       (LabelSpec
-                          label: '(Trigger recursionInterrupt if more stack is used by a process)'
-                          name: 'Label39'
-                          layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
-                          activeHelpKey: stackLimit
-                          translateLabel: true
-                          adjust: left
-                        )
-                       )
-                     
-                    )
-                    extent: (Point 705 30)
-                  )
-                 (ViewSpec
                     name: 'CodeLimitBox'
                     activeHelpKey: codeLimit
                     component: 
                    (SpecCollection
                       collection: (
-                       (DividerSpec
-                          name: 'Separator22'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
                        (LabelSpec
                           label: 'Dynamic code Limit:'
                           name: 'Label40'
@@ -7522,10 +7377,6 @@
                     component: 
                    (SpecCollection
                       collection: (
-                       (DividerSpec
-                          name: 'Separator28'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
                        (LabelSpec
                           label: 'Method Code Size Limit:'
                           name: 'Label52'
@@ -7559,16 +7410,95 @@
                     )
                     extent: (Point 705 30)
                   )
+                 (LabelSpec
+                    label: 'Triggers:'
+                    name: 'Label55'
+                    translateLabel: true
+                    adjust: left
+                    extent: (Point 705 22)
+                  )
+                 (ViewSpec
+                    name: 'IncrementalGCAllocationTriggerBox'
+                    activeHelpKey: igcLimit
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (LabelSpec
+                          label: 'Incremental GC Allocation Trigger:'
+                          name: 'Label48'
+                          layout: (LayoutFrame 0 0 3 0 265 0 23 0)
+                          activeHelpKey: igcLimit
+                          translateLabel: true
+                          adjust: right
+                        )
+                       (InputFieldSpec
+                          name: 'EntryField25'
+                          layout: (LayoutFrame 270 0 3 0 360 0 23 0)
+                          activeHelpKey: igcLimit
+                          model: igcLimit
+                          type: fileSize
+                          acceptOnReturn: true
+                          acceptOnTab: true
+                          acceptOnLostFocus: true
+                          acceptOnPointerLeave: true
+                        )
+                       (LabelSpec
+                          label: '(Start IGC whenever this has been newly allocated)'
+                          name: 'Label49'
+                          layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
+                          activeHelpKey: igcLimit
+                          translateLabel: true
+                          adjust: left
+                        )
+                       )
+                     
+                    )
+                    extent: (Point 705 30)
+                  )
+                 (ViewSpec
+                    name: 'IncrementalGCFreespaceTriggerBox'
+                    activeHelpKey: igcFreeLimit
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (LabelSpec
+                          label: 'Incremental GC Freespace Trigger:'
+                          name: 'Label50'
+                          layout: (LayoutFrame 0 0 3 0 265 0 23 0)
+                          activeHelpKey: igcFreeLimit
+                          translateLabel: true
+                          adjust: right
+                        )
+                       (InputFieldSpec
+                          name: 'EntryField26'
+                          layout: (LayoutFrame 270 0 3 0 360 0 23 0)
+                          activeHelpKey: igcFreeLimit
+                          model: igcFreeLimit
+                          type: fileSize
+                          acceptOnReturn: true
+                          acceptOnTab: true
+                          acceptOnLostFocus: true
+                          acceptOnPointerLeave: true
+                        )
+                       (LabelSpec
+                          label: '(Start IGC whenever freespace drops below this)'
+                          name: 'Label51'
+                          layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
+                          activeHelpKey: igcFreeLimit
+                          translateLabel: true
+                          adjust: left
+                        )
+                       )
+                     
+                    )
+                    extent: (Point 705 30)
+                  )
                  (ViewSpec
                     name: 'CodeTriggerBox'
                     activeHelpKey: codeTrigger
                     component: 
                    (SpecCollection
                       collection: (
-                       (DividerSpec
-                          name: 'Separator23'
-                          layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
-                        )
                        (LabelSpec
                           label: 'Incremental GC Dynamic Code Trigger:'
                           name: 'Label42'
@@ -7601,6 +7531,44 @@
                     )
                     extent: (Point 705 30)
                   )
+                 (ViewSpec
+                    name: 'GCAmountBox'
+                    activeHelpKey: igcFreeAmount
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (LabelSpec
+                          label: 'Incremental GC Amount:'
+                          name: 'Label32'
+                          layout: (LayoutFrame 0 0 3 0 265 0 23 0)
+                          activeHelpKey: igcFreeAmount
+                          translateLabel: true
+                          adjust: right
+                        )
+                       (InputFieldSpec
+                          name: 'EntryField17'
+                          layout: (LayoutFrame 270 0 3 0 360 0 23 0)
+                          activeHelpKey: igcFreeAmount
+                          model: igcFreeAmount
+                          type: fileSize
+                          acceptOnReturn: true
+                          acceptOnTab: true
+                          acceptOnLostFocus: true
+                          acceptOnPointerLeave: true
+                        )
+                       (LabelSpec
+                          label: '(Try to keep this amount for peak requests)'
+                          name: 'Label33'
+                          layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
+                          activeHelpKey: igcFreeAmount
+                          translateLabel: true
+                          adjust: left
+                        )
+                       )
+                     
+                    )
+                    extent: (Point 705 30)
+                  )
                  )
                
               )
@@ -18551,13 +18519,14 @@
 !
 
 basicReadSettings
-    self
-	readAspects: (self aspects)
-	from:currentUserPrefs.
+    self 
+        readAspects: (self aspects)
+        from:currentUserPrefs.
 
     Transcript current isExternalStream ifFalse:[
-	self transcriptBufferSize value:Transcript current lineLimit.
-	self autoRaiseTranscript value:Transcript current autoRaise.
+        self transcriptBufferSize value:Transcript current lineLimit.
+        "/ now already in userprefs
+        "/ self autoRaiseTranscript value:Transcript current autoRaise.
     ].
 
     "Modified (format): / 27-07-2012 / 20:51:39 / cg"
@@ -18570,60 +18539,61 @@
 
     newSystemBrowserClass := Tools::NewSystemBrowser ? NewSystemBrowser.
 
-    self
-	writeAspects:(self aspects)
-	to:currentUserPrefs.
+    self 
+        writeAspects:(self aspects)
+        to:currentUserPrefs.
 
     currentUserPrefs useNewSettingsApplication ~= self useNewSettingsApplication value ifTrue:[
-	currentUserPrefs useNewSettingsApplication:self useNewSettingsApplication value.
+        currentUserPrefs useNewSettingsApplication:self useNewSettingsApplication value.
     ].
 
     currentUserPrefs useNewSystemBrowser ~= self useNewSystemBrowser value ifTrue:[
-	currentUserPrefs useNewSystemBrowser:self useNewSystemBrowser value.
-	    (self useNewSystemBrowser value and:[newSystemBrowserClass isLoaded]) ifTrue:[
-		newSystemBrowserClass installInLauncher.
-	    ] ifFalse:[
-		newSystemBrowserClass removeFromLauncher.
-	    ].
-	    reopenLauncher := true.
+        currentUserPrefs useNewSystemBrowser:self useNewSystemBrowser value.
+            (self useNewSystemBrowser value and:[newSystemBrowserClass isLoaded]) ifTrue:[
+                newSystemBrowserClass installInLauncher.
+            ] ifFalse:[
+                newSystemBrowserClass removeFromLauncher.
+            ].
+            reopenLauncher := true.
     ].
 
     (Smalltalk at:#FileBrowserV2) isBehavior ifTrue:[
-	currentUserPrefs useNewFileBrowser ~= self useNewFileBrowser value ifTrue:[
-	    currentUserPrefs useNewFileBrowser:self useNewFileBrowser value.
-	    (self useNewFileBrowser value and:[FileBrowserV2 isLoaded]) ifTrue:[
-		FileBrowserV2 installInLauncher.
-	    ] ifFalse:[
-		FileBrowserV2 removeFromLauncher.
-	    ].
-	    reopenLauncher := true.
-	]
+        currentUserPrefs useNewFileBrowser ~= self useNewFileBrowser value ifTrue:[
+            currentUserPrefs useNewFileBrowser:self useNewFileBrowser value.
+            (self useNewFileBrowser value and:[FileBrowserV2 isLoaded]) ifTrue:[
+                FileBrowserV2 installInLauncher.
+            ] ifFalse:[
+                FileBrowserV2 removeFromLauncher.
+            ].
+            reopenLauncher := true.
+        ]
     ].
 
     transcript := Transcript current.
     (transcript notNil and:[transcript isExternalStream not]) ifTrue:[
-	transcript lineLimit:self transcriptBufferSize value.
-	transcript autoRaise:self autoRaiseTranscript value.
-	launcher := transcript application.
+        transcript lineLimit:self transcriptBufferSize value.
+        "/ now already done by UserPreferences
+        "/ transcript autoRaise:self autoRaiseTranscript value.
+        launcher := transcript application.
     ].
 
     showClock := self showClockInLauncher value.
     currentUserPrefs showClockInLauncher ~= showClock ifTrue:[
-	currentUserPrefs showClockInLauncher:showClock.
-	launcher notNil ifTrue:[
-	    showClock ifTrue:[
-		launcher startClock
-	    ] ifFalse:[
-		launcher stopClock
-	    ]
-	]
+        currentUserPrefs showClockInLauncher:showClock.
+        launcher notNil ifTrue:[
+            showClock ifTrue:[
+                launcher startClock
+            ] ifFalse:[
+                launcher stopClock
+            ]
+        ]
     ].
     Inspector := currentUserPrefs inspectorClassSetting.
 
     reopenLauncher ifTrue:[
-	launcher notNil ifTrue:[
-	    launcher reopenLauncher.
-	]
+        launcher notNil ifTrue:[
+            launcher reopenLauncher.
+        ]
     ].
 
     "Modified: / 27-07-2012 / 20:51:46 / cg"
@@ -18817,12 +18787,13 @@
 
 hasUnsavedChanges
     (self
-	hasChangedAspectIn:(self aspects)
-	asComparedTo:currentUserPrefs) ifTrue:[^ true].
+        hasChangedAspectIn:(self aspects)
+        asComparedTo:currentUserPrefs) ifTrue:[^ true].
 
     Transcript current isExternalStream ifFalse:[
-	(self transcriptBufferSize value  ~= Transcript current lineLimit) ifTrue:[^ true].
-	(self autoRaiseTranscript value  ~= Transcript current autoRaise) ifTrue:[^ true].
+        (self transcriptBufferSize value  ~= Transcript current lineLimit) ifTrue:[^ true].
+        "/ now already in UserPreferences
+        "/ (self autoRaiseTranscript value  ~= Transcript current autoRaise) ifTrue:[^ true].
     ].
     ^ false.
 
@@ -18832,11 +18803,11 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.471 2013-06-23 22:25:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.478 2013-06-27 11:42:25 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.471 2013-06-23 22:25:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.478 2013-06-27 11:42:25 cg Exp $'
 !
 
 version_HG
--- a/BrowserView.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/BrowserView.st	Mon Jul 01 22:15:23 2013 +0100
@@ -5643,7 +5643,7 @@
 classModifyPackage
     "change the classes package assignment (dangerous)"
 
-    |newPackage p|
+    |newPackage|
 
     currentClass owningClass notNil ifTrue:[
         self warn:'Private classes always belong to the owners package.\\Cannot change the packageID.' withCRs.
@@ -6912,7 +6912,8 @@
         brwsr := SystemBrowser openInClass:actualClass selector:currentSelector.
         brwsr environment:environment
     ] ifFalse:[
-        brwsr := UserPreferences current systemBrowserClass openInClass:actualClass selector:currentSelector.
+        brwsr := UserPreferences systemBrowserClass 
+                    openInClass:actualClass selector:currentSelector.
     ].
 
     "Created: / 13-12-1995 / 15:05:12 / cg"
@@ -12449,16 +12450,17 @@
 enterBoxTitle:title withList:aListOrNil okText:okText
     "convenient method: setup enterBox"
 
-    |box|
-
-    aListOrNil notNil ifTrue:[
-        box := EnterBoxWithList new.
-        box list:aListOrNil.
-    ] ifFalse:[
-        box := EnterBox new.
-    ].
-    box title:(resources string:title) okText:(resources string:okText).
-    ^ box
+    ^ SystemBrowser enterBoxTitle:title withList:aListOrNil okText:okText
+"/    |box|
+"/
+"/    aListOrNil notNil ifTrue:[
+"/        box := EnterBoxWithList new.
+"/        box list:aListOrNil.
+"/    ] ifFalse:[
+"/        box := EnterBox new.
+"/    ].
+"/    box title:(resources string:title) okText:(resources string:okText).
+"/    ^ box
 !
 
 environment
@@ -13995,7 +13997,7 @@
     ] ifTrue:[        
         searchClass := actualClass whichClassDefinesInstVar:name.
 
-        idx := searchClass instVarOffsetOf:name.
+        idx := searchClass instVarIndexFor:name.
         idx isNil ifTrue:[^ self].
 
         classes := IdentitySet new.
@@ -14530,7 +14532,7 @@
 !BrowserView class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.848 2013-06-21 00:25:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.852 2013-06-30 09:10:54 cg Exp $'
 !
 
 version_HG
--- a/ChangesBrowser.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/ChangesBrowser.st	Mon Jul 01 22:15:23 2013 +0100
@@ -1108,32 +1108,32 @@
     <resource: #keyboard (#Delete #BackSpace #Accept #Find #FindPrev #FindNext)>
 
     (key == #Delete) ifTrue:[
-	self sensor shiftDown ifTrue:[
-	    self doDeleteAndSelectPrevious.
-	] ifFalse:[
-	    self doDelete.
-	].
-	^ self
+        self sensor shiftDown ifTrue:[
+            self doDeleteAndSelectPrevious.
+        ] ifFalse:[
+            self doDelete.
+        ].
+        ^ self
     ].
     (key == #BackSpace) ifTrue:[
-	self doDeleteAndSelectPrevious.
-	^ self
+        self doDelete. "/ doDeleteAndSelectPrevious.
+        ^ self
     ].
     (key == #Accept) ifTrue:[
-	self doApply.
-	^ self
+        self doApply.
+        ^ self
     ].
     (key == #Find) ifTrue:[
-	self findClass.
-	^ self
+        self findClass.
+        ^ self
     ].
     (key == #FindPrev) ifTrue:[
-	self findPrevious.
-	^ self
+        self findPrevious.
+        ^ self
     ].
     (key == #FindNext) ifTrue:[
-	self findNext.
-	^ self
+        self findNext.
+        ^ self
     ].
     changeListView keyPress:key x:x y:y
 
@@ -6539,11 +6539,11 @@
 !ChangesBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.444 2013-06-21 13:39:38 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.445 2013-06-30 23:21:12 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.444 2013-06-21 13:39:38 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.445 2013-06-30 23:21:12 cg Exp $'
 !
 
 version_HG
--- a/DebugView.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/DebugView.st	Mon Jul 01 22:15:23 2013 +0100
@@ -6416,12 +6416,13 @@
 isHaltToBeIgnored
     "see if the current halt (if any) is in the ignore-list"
 
-    |c cReceiver sender haltingMethod lineNrInHaltingMethod breakpointParameter|
+    |c cReceiver sender haltingMethod lineNrInHaltingMethod breakpointParameter
+     sReceiver|
 
     "/ should a halt be ignored ?
     IgnoredHalts isNil ifTrue:[^ false].
 
-    "/ look for a breakpoint-wrapper's context
+    "/ look for a method breakpoint-wrapper's context
     c := thisContext findNextContextWithSelector:#doRaise or:nil or:nil.
     c notNil ifTrue:[
         ((cReceiver := c receiver) isKindOf:NoHandlerError) ifTrue:[
@@ -6433,8 +6434,8 @@
         ] ifTrue:[
             [ 
                 sender := c sender.
-                (sender receiver isKindOf:BreakPointInterrupt)
-                or:[ sender receiver == BreakPointInterrupt ]
+                ((sReceiver := sender receiver) isKindOf:BreakPointInterrupt)
+                or:[ sReceiver == BreakPointInterrupt ]
             ] whileTrue:[
                 c := sender
             ].
@@ -8496,10 +8497,11 @@
 isHaltIgnoredInMethod:aMethod line:line context:context
     "/ Transcript show:'?same as ign '; show:(weakMethodHolder at:1); show:' at '; showCR:lineNumber.
 
-Transcript showCR:'-----------------------------'.
-Transcript showCR:aMethod.
-Transcript showCR:line.
-Transcript showCR:context.
+"/    Transcript showCR:'-----------------------------'.
+"/    Transcript showCR:aMethod.
+"/    Transcript showCR:line.
+"/    Transcript showCR:context.
+
     (self isForMethod:aMethod line:line) ifFalse:[^ false].
     "/ Transcript show:'is same; ignored: '; showCR:self isHaltIgnored.
 
@@ -8508,8 +8510,9 @@
             ^ ignoredReceiverClasses includes:(context receiver class)
         ].
     ].
-Transcript showCR:ignoredProcesses.
-Transcript showCR:Processor activeProcess.
+
+"/    Transcript showCR:ignoredProcesses.
+"/    Transcript showCR:Processor activeProcess.
     ignoredProcesses notNil ifTrue:[
         ^ ignoredProcesses includes:(Processor activeProcess)
     ].
@@ -8557,11 +8560,11 @@
 !DebugView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.597 2013-06-23 08:32:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.598 2013-06-27 20:54:21 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.597 2013-06-23 08:32:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.598 2013-06-27 20:54:21 cg Exp $'
 !
 
 version_HG
@@ -8570,7 +8573,7 @@
 !
 
 version_SVN
-    ^ '$Id: DebugView.st,v 1.597 2013-06-23 08:32:07 cg Exp $'
+    ^ '$Id: DebugView.st,v 1.598 2013-06-27 20:54:21 cg Exp $'
 ! !
 
 
--- a/FileBrowserV2.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/FileBrowserV2.st	Mon Jul 01 22:15:23 2013 +0100
@@ -324,7 +324,7 @@
 'The text-cursor''s column number'
 
 #encodingLabel
-'The file''s encoding (Right-Click to change)'
+'The file''s encoding (Right-click to change)'
 
 #encodingLockedLabel
 'Lock the file-encoding (do not try to guess from the file''s contents)'
@@ -333,10 +333,10 @@
 'Only show files matching the pattern.\Separate multiple patterns by ";".\Patterns starting with "~" are excluding.'
 
 #lineLabel
-'The text-cursor''s line number. Double-Click to change'
+'The text-cursor''s line number. Double-click to change'
 
 #modeLabel
-'The editing mode (Insert vs. Overwrite)'
+'The editing mode (Insert vs. overwrite)'
 
 #numberOfFiles
 'Number of files shown (Total number of files in directory)'
@@ -1510,21 +1510,21 @@
 !
 
 fileEntryFieldHolderChanged
-    |fileName fileNameString answer dir|
+    |fileName fileNameString dir|
 
     fileNameString := fileEntryFieldHolder value withoutSeparators.
-    fileName := fileNameString asFilename.
-    fileNameString isEmpty ifTrue:[ 
+    fileNameString isEmpty ifTrue:[
         pathEntryField flash.
         ^ self
     ].
 
-    (fileName exists) ifFalse:[ 
+    fileName := fileNameString asFilename.
+    fileName exists ifFalse:[
         pathEntryField flash.
 
         dir := fileName directory.
         dir exists ifTrue:[
-            self currentFileNameHolder 
+            self currentFileNameHolder
                 value:(OrderedCollection with:dir)
                 withoutNotifying:self.
         ].
@@ -1533,28 +1533,28 @@
             self filterModel value:fileName baseName.
         ].
 
-"/        answer := OptionBox 
+"/        answer := OptionBox
 "/           request:(resources string:'No file or directory named "%1" exists.\\Create ?' with:fileNameString allBold) withCRs
 "/           buttonLabels:#('Create as File' 'Create as Directory' 'Cancel')
 "/           values:#(createFile createDirectory nil)
 "/           default:nil.
 "/
-        answer isNil ifTrue:[
-            ^ self.
-        ].
-
-        [
-            answer == #createFile ifTrue:[
-                fileName directory recursiveMakeDirectory.
-                fileName createAsEmptyFile.
-            ] ifFalse:[
-                answer == #createDirectory ifTrue:[
-                    fileName recursiveMakeDirectory.
-                ]
-            ].
-        ] on:OperatingSystem accessDeniedErrorSignal do:[:ex |
-            Dialog warn:'Error: ' , ex description.
-        ].
+"/        answer isNil ifTrue:[
+"/            ^ self.
+"/        ].
+"/
+"/        [
+"/            answer == #createFile ifTrue:[
+"/                fileName directory recursiveMakeDirectory.
+"/                fileName createAsEmptyFile.
+"/            ] ifFalse:[
+"/                answer == #createDirectory ifTrue:[
+"/                    fileName recursiveMakeDirectory.
+"/                ]
+"/            ].
+"/        ] on:OperatingSystem accessDeniedErrorSignal do:[:ex |
+"/            Dialog warn:'Error: ' , ex description.
+"/        ].
         ^ self
     ].
     self setCurrentFileName:fileName.
@@ -2045,7 +2045,7 @@
 !FileBrowserV2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.209 2013-06-21 00:44:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.211 2013-06-26 08:45:11 stefan Exp $'
 !
 
 version_HG
--- a/FileBrowserV2SettingsAppl.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/FileBrowserV2SettingsAppl.st	Mon Jul 01 22:15:23 2013 +0100
@@ -41,6 +41,28 @@
 "
 ! !
 
+!FileBrowserV2SettingsAppl class methodsFor:'help specs'!
+
+flyByHelpSpec
+    <resource: #help>
+
+    ^ super flyByHelpSpec addPairsFrom:(self helpPairs)
+!
+
+helpPairs
+    ^ #(
+
+#autoOpenDirectoryDescription
+'When changing directories, automatically show the contents of a README or .dirInfo file if present.'
+
+#openMultipleApplications
+'Show new selected files in a new tab, instead of changing the contents of an existing tab'
+
+#textEditorForAllTypes
+'Show all files as text, i.e. do not open specialized viewers as per mime type'
+
+)
+! !
 
 !FileBrowserV2SettingsAppl class methodsFor:'icon'!
 
@@ -50,7 +72,6 @@
     ^ FileBrowserV2 applicationIcon
 ! !
 
-
 !FileBrowserV2SettingsAppl class methodsFor:'interface specs'!
 
 windowSpec
@@ -76,14 +97,14 @@
           label: 'Settings'
           name: 'Settings'
           min: (Point 10 10)
-          bounds: (Rectangle 0 0 469 622)
+          bounds: (Rectangle 0 0 620 559)
         )
         component: 
        (SpecCollection
           collection: (
            (VerticalPanelViewSpec
               name: 'VerticalPanel2'
-              layout: (LayoutFrame 0 0 0 0 0 1 591 0)
+              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
               horizontalLayout: fit
               verticalLayout: top
               horizontalSpace: 3
@@ -144,7 +165,7 @@
                        )
                      
                     )
-                    extent: (Point 469 175)
+                    extent: (Point 620 175)
                   )
                  (FramedBoxSpec
                     label: 'Sort'
@@ -171,7 +192,7 @@
                        )
                      
                     )
-                    extent: (Point 469 87)
+                    extent: (Point 620 87)
                   )
                  (FramedBoxSpec
                     label: 'Columns in Filelist'
@@ -271,7 +292,7 @@
                        )
                      
                     )
-                    extent: (Point 469 174)
+                    extent: (Point 620 174)
                   )
                  (FramedBoxSpec
                     label: 'Application Notebook'
@@ -281,38 +302,48 @@
                     component: 
                    (SpecCollection
                       collection: (
-                       (CheckBoxSpec
-                          label: 'Use the New CodeView (Affects all New Opened Tools)'
-                          name: 'CheckBox8'
-                          layout: (LayoutFrame 0 0.0 7 0 0 1.0 27 0)
-                          model: useCodeView2InTools
-                          translateLabel: true
-                        )
-                       (CheckBoxSpec
-                          label: 'Text Editor for all Types'
-                          name: 'CheckBox25'
-                          layout: (LayoutFrame 0 0.0 29 0 0 1.0 49 0)
-                          model: openAlwaysInTextEditor
-                          translateLabel: true
-                        )
-                       (CheckBoxSpec
-                          label: 'Open Multiple Applications'
-                          name: 'CheckBox9'
-                          layout: (LayoutFrame 0 0.0 51 0 0 1.0 71 0)
-                          model: openMultipleApplicationsForType
-                          translateLabel: true
-                        )
-                       (CheckBoxSpec
-                          label: 'Auto Open Directory Description (README)'
-                          name: 'CheckBox10'
-                          layout: (LayoutFrame 0 0.0 73 0 0 1.0 93 0)
-                          model: viewDirectoryDescription
-                          translateLabel: true
+                       (VerticalPanelViewSpec
+                          name: 'VerticalPanel3'
+                          layout: (LayoutFrame 0 0 5 0 0 1 0 1)
+                          horizontalLayout: left
+                          verticalLayout: top
+                          horizontalSpace: 3
+                          verticalSpace: 3
+                          component: 
+                         (SpecCollection
+                            collection: (
+                             (CheckBoxSpec
+                                label: 'Text Editor for all Types'
+                                name: 'CheckBox25'
+                                activeHelpKey: textEditorForAllTypes
+                                model: openAlwaysInTextEditor
+                                translateLabel: true
+                                extent: (Point 435 20)
+                              )
+                             (CheckBoxSpec
+                                label: 'Open Multiple Applications'
+                                name: 'CheckBox9'
+                                activeHelpKey: openMultipleApplications
+                                model: openMultipleApplicationsForType
+                                translateLabel: true
+                                extent: (Point 435 20)
+                              )
+                             (CheckBoxSpec
+                                label: 'Auto Open Directory Description (README)'
+                                name: 'CheckBox10'
+                                activeHelpKey: autoOpenDirectoryDescription
+                                model: viewDirectoryDescription
+                                translateLabel: true
+                                extent: (Point 435 20)
+                              )
+                             )
+                           
+                          )
                         )
                        )
                      
                     )
-                    extent: (Point 469 134)
+                    extent: (Point 620 108)
                   )
                  )
                
@@ -324,14 +355,12 @@
       )
 ! !
 
-
 !FileBrowserV2SettingsAppl class methodsFor:'resources'!
 
 classResources
     ^ FileBrowserV2 classResources
 ! !
 
-
 !FileBrowserV2SettingsAppl methodsFor:'accessing'!
 
 requestor
@@ -345,7 +374,6 @@
     ^ nil
 ! !
 
-
 !FileBrowserV2SettingsAppl methodsFor:'actions'!
 
 basicSaveSettings
@@ -388,7 +416,6 @@
     "Modified: / 03-04-2007 / 08:45:12 / cg"
 ! !
 
-
 !FileBrowserV2SettingsAppl methodsFor:'aspects'!
 
 filenameEntryFieldVisibleHolder
@@ -460,6 +487,7 @@
 !
 
 useCodeView2InTools
+    "/ obsolete - will vanish
     useCodeView2InTools isNil ifTrue:[
         useCodeView2InTools := true asValue.
         useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
@@ -581,7 +609,6 @@
     ^ viewType
 ! !
 
-
 !FileBrowserV2SettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
@@ -605,15 +632,14 @@
     "Modified (format): / 25-11-2011 / 15:24:25 / cg"
 ! !
 
-
 !FileBrowserV2SettingsAppl class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsAppl.st,v 1.29 2013-02-22 09:15:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsAppl.st,v 1.31 2013-06-25 14:04:25 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsAppl.st,v 1.29 2013-02-22 09:15:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsAppl.st,v 1.31 2013-06-25 14:04:25 cg Exp $'
 !
 
 version_HG
--- a/FileDialog.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/FileDialog.st	Mon Jul 01 22:15:23 2013 +0100
@@ -613,7 +613,7 @@
 
     initialDefaultFileName := initialDefaultFileNameArg.
     initialDefaultFileName notNil ifTrue:[ 
-        initialDefaultFileName := initialDefaultFileName asFilename 
+        initialDefaultFileName := initialDefaultFileName asFilename.
     ].
 
     okText := okTextArg.
@@ -740,7 +740,7 @@
     ^ FileBrowserV2 flyByHelpSpec addPairsFrom:#(
 
 #openFileBrowser
-'Open a FileBrowser on the selected Directory'
+'Open a FileBrowser on the selected directory'
 
 )
 ! !
@@ -1277,8 +1277,6 @@
 !
 
 startFilename
-    "return the value of the instance variable 'startFilename' (automatically generated)"
-
     startFilename isNil ifTrue:[
         startFilename := Filename currentDirectory asAbsoluteFilename.
     ].
@@ -1286,8 +1284,6 @@
 !
 
 startFilename:something
-    "set the value of the instance variable 'startFilename' (automatically generated)"
-
     startFilename := something.
 ! !
 
@@ -1474,7 +1470,7 @@
     holder := builder bindingAt:#filenameHolder.
 
     holder isNil ifTrue:[
-        holder := ValueHolder new.
+        holder := startFilename asValue.
         holder addDependent:self.
         builder aspectAt:#filenameHolder put:holder.
     ].
@@ -1859,7 +1855,9 @@
     "Created: / 03-06-2013 / 17:41:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-postBuildWith:aBuilder    
+postBuildWith:aBuilder 
+    |win hMin|
+
     treeBrowser multipleSelect:multipleSelect.
     appendWasPressed := false.
 
@@ -1867,6 +1865,15 @@
     (aBuilder componentAt:'appendButton') cursor:(Cursor thumbsUp).
     (aBuilder componentAt:'okButton') cursor:(Cursor thumbsUp).
 
+    win := aBuilder window .
+    hMin := (aBuilder window margin * 2)
+            + aBuilder menuBar preferredHeight
+            + (aBuilder componentAt:#FilenameEntryField) height
+            + (aBuilder componentAt:#ToolBar1) preferredHeight
+            + (aBuilder componentAt:#ButtonPanel) preferredHeight.
+
+    win minExtent:( win minExtent x @ hMin ).
+
     super postBuildWith:aBuilder
 !
 
@@ -1884,7 +1891,7 @@
 preOpenWith:aBuilder
     "called right before being opened"
 
-    | sumH oldVPanelHeight newVPanelHeight delta|
+    |delta|
 
     "Increase height of the window so height of the file part
      remain the same. This cares for any components added by a hook"
@@ -2071,11 +2078,11 @@
 !FileDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.122 2013-06-14 09:17:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.127 2013-06-26 08:38:19 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.122 2013-06-14 09:17:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.127 2013-06-26 08:38:19 stefan Exp $'
 !
 
 version_HG
@@ -2084,6 +2091,6 @@
 !
 
 version_SVN
-    ^ '$Id: FileDialog.st,v 1.122 2013-06-14 09:17:39 cg Exp $'
+    ^ '$Id: FileDialog.st,v 1.127 2013-06-26 08:38:19 stefan Exp $'
 ! !
 
--- a/ImageInspectorView.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/ImageInspectorView.st	Mon Jul 01 22:15:23 2013 +0100
@@ -162,9 +162,10 @@
     |imageViewsSuperView|
 
     imageViewsSuperView := imageView superView.
-    LastRatio := 1.0 - 
-                 (imageViewsSuperView relativeCorner y - imageViewsSuperView relativeOrigin y).
-
+    imageViewsSuperView notNil ifTrue:[
+        LastRatio := 1.0 - 
+                     (imageViewsSuperView relativeCorner y - imageViewsSuperView relativeOrigin y).
+    ].
     super destroy
 
     "Created: / 07-09-1998 / 13:13:43 / cg"
@@ -259,11 +260,11 @@
 !ImageInspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ImageInspectorView.st,v 1.26 2012-07-25 10:54:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ImageInspectorView.st,v 1.27 2013-06-30 21:57:20 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/ImageInspectorView.st,v 1.26 2012-07-25 10:54:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ImageInspectorView.st,v 1.27 2013-06-30 21:57:20 cg Exp $'
 !
 
 version_HG
--- a/InspectorView.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/InspectorView.st	Mon Jul 01 22:15:23 2013 +0100
@@ -1753,7 +1753,7 @@
     |cls|
 
     cls := what class.
-    (cls browserClass ? UserPreferences current systemBrowserClass) 
+    (cls browserClass ? UserPreferences systemBrowserClass) 
         openInClass:cls selector:nil
 
     "Created: / 14-12-1995 / 19:15:50 / cg"
@@ -3521,11 +3521,11 @@
 !InspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.316 2013-06-20 22:50:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.317 2013-06-25 17:12:28 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.316 2013-06-20 22:50:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.317 2013-06-25 17:12:28 cg Exp $'
 !
 
 version_HG
--- a/MemoryUsageView.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/MemoryUsageView.st	Mon Jul 01 22:15:23 2013 +0100
@@ -191,7 +191,7 @@
     list selection notNil ifTrue:[
         class := (info at:(list selection)) classNameOrSymbol.
         class isSymbol ifFalse:[
-            UserPreferences current systemBrowserClass openInClass:class.
+            UserPreferences systemBrowserClass openInClass:class.
         ]
     ]
 
@@ -1069,11 +1069,11 @@
 !MemoryUsageView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.63 2013-06-13 14:14:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.64 2013-06-25 19:32:54 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.63 2013-06-13 14:14:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.64 2013-06-25 19:32:54 cg Exp $'
 !
 
 version_HG
--- a/NewLauncher.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/NewLauncher.st	Mon Jul 01 22:15:23 2013 +0100
@@ -183,7 +183,7 @@
 'FileBrowser'
 
 #fileBrowserV2
-'FileBrowser'
+'FileBrowser / Recently visited folders'
 
 #fileSaveImage
 'Save Image'
@@ -201,7 +201,7 @@
 'SystemBrowser'
 
 #newSystemBrowser
-'New SystemBrowser'
+'New SystemBrowser / Recently visited classes'
 
 #systemGarbageCollect
 'GarbageCollect'
@@ -463,6 +463,9 @@
 #demosWalkingMan
 'Opens a walking man animation demo'
 
+#enableGlobalCoverageAnalysis
+'Enable coverage statistic gathering in all processes (global covarage analysis)'
+
 #fileApplicationBuilder
 'Open an Application Builder for building stand alone ST/X-applications'
 
@@ -484,6 +487,12 @@
 #fileSaveImageAs
 'Save the complete state of ST/X into a snapshot file'
 
+#findClassAndBrowse
+'Find and browse a class by name'
+
+#flyByWindowInformation
+'Show flyby info about the window under the pointer. Easy access to View, Application and Model'
+
 #gamesPingPong
 'Play classic PingPong against the computer'
 
@@ -772,14 +781,7 @@
 #windowsViewTreeAllViews
 'Display the widget hierarchies of all ST/X windows (on this display)'
 
-#flyByWindowInformation
-'Show flyby info about the window under the pointer. Easy access to View, Application and Model'
-
-#enableGlobalCoverageAnalysis
-'Enable coverage statistic gathering in all processes (global covarage analysis)'
 )
-
-    "Modified: / 21-09-2012 / 10:59:33 / cg"
 ! !
 
 !NewLauncher class methodsFor:'interface specs'!
@@ -1185,122 +1187,129 @@
 
     <resource: #menu>
 
-    ^
+    ^ 
      #(Menu
-	(
-	 (MenuItem
-	    activeHelpKey: classesSystemBrowser
-	    label: 'System Browser'
-	    itemValue: openApplication:
-	    nameKey: systemBrowser
-	    submenuChannel: menuClassHistory
-	    labelImage: (ResourceRetriever ToolbarIconLibrary startSystemBrowserIcon 'System Browser')
-	    argument: 'Tools::NewSystemBrowser'
-	    showBusyCursorWhilePerforming: true
-	  )
-	 (MenuItem
-	    label: '-'
-	  )
-	 (MenuItem
-	    activeHelpKey: startChangeSetBrowser
-	    label: 'Recent Changes'
-	    itemValue: startChangeSetBrowser
-	    nameKey: startChangeSetBrowser
-	    showBusyCursorWhilePerforming: true
-	  )
-	 (MenuItem
-	    activeHelpKey: classesClassBrowserOnChanges
-	    label: 'Changed Classes'
-	    itemValue: startClassBrowserOnChanges
-	    nameKey: classBrowserOnChanges
-	    showBusyCursorWhilePerforming: true
-	  )
-	 (MenuItem
-	    activeHelpKey: classBrowserOnChangedMethods
-	    label: 'Changed Methods'
-	    itemValue: startClassBrowserOnChangedMethods
-	    nameKey: classBrowserOnChangedMethods
-	    showBusyCursorWhilePerforming: true
-	  )
-	 (MenuItem
-	    activeHelpKey: startSmallTeamChangeSetBrowser
-	    label: 'Recent Changes on SmallTeam Host'
-	    isVisible: smallTeamAvailable
-	    submenuChannel: startBrowserOnSmallTeamChangesMenu
-	    showBusyCursorWhilePerforming: true
-	  )
-	 (MenuItem
-	    label: '-'
-	  )
-	 (MenuItem
-	    label: 'Special Browsers'
-	    submenuChannel: classesSpecialBrowserMenu
-	  )
-	 (MenuItem
-	    activeHelpKey: classesClassTreeBrowser
-	    label: 'Class Tree'
-	    itemValue: openApplication:
-	    argument: 'ClassTreeGraphView'
-	    showBusyCursorWhilePerforming: true
-	  )
-	 (MenuItem
-	    label: '-'
-	  )
-	 (MenuItem
-	    activeHelpKey: classesImplementors
-	    label: 'Implementors Of...'
-	    itemValue: browseImplementors
-	    showBusyCursorWhilePerforming: true
-	  )
-	 (MenuItem
-	    activeHelpKey: classesSenders
-	    label: 'Senders Of...'
-	    itemValue: browseSenders
-	    showBusyCursorWhilePerforming: true
-	  )
-	 (MenuItem
-	    label: 'Method Finder'
-	    itemValue: openMethodFinder
-	    labelImage: (ResourceRetriever ToolbarIconLibrary methodFinder24x24Icon 'Method Finder')
-	  )
-	 (MenuItem
-	    activeHelpKey: classesResourceMethods
-	    label: 'Find Resource Methods...'
-	    itemValue: browseResources
-	  )
-	 (MenuItem
-	    label: '-'
-	  )
-	 (MenuItem
-	    activeHelpKey: classesSpecial
-	    label: 'Special'
-	    nameKey: special
-	    submenu:
-	   (Menu
-	      (
-	       (MenuItem
-		  activeHelpKey: classesSpecialReferencesToUnboundGlobals
-		  label: 'References to Unbound Globals'
-		  itemValue: browseUnboundGlobals
-		)
-	       (MenuItem
-		  activeHelpKey: classesSpecialReferencesToUndeclared
-		  label: 'References to Undeclared'
-		  itemValue: browseUndeclared
-		)
-	       (MenuItem
-		  activeHelpKey: classesSpecialReferencesToUndeclared
-		  label: 'Clear Undeclared Variables'
-		  itemValue: clearUndeclaredVariables
-		)
-	       )
-	      nil
-	      nil
-	    )
-	  )
-	 )
-	nil
-	nil
+        (
+         (MenuItem
+            activeHelpKey: classesSystemBrowser
+            label: 'System Browser'
+            itemValue: openApplication:
+            nameKey: systemBrowser
+            submenuChannel: menuClassHistory
+            labelImage: (ResourceRetriever ToolbarIconLibrary startSystemBrowserIcon 'System Browser')
+            argument: 'Tools::NewSystemBrowser'
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            activeHelpKey: findClassAndBrowse
+            label: 'Find Class...'
+            itemValue: findClassAndBrowse
+            nameKey: startChangeSetBrowser
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            activeHelpKey: startChangeSetBrowser
+            label: 'Recent Changes'
+            itemValue: startChangeSetBrowser
+            nameKey: startChangeSetBrowser
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            activeHelpKey: classesClassBrowserOnChanges
+            label: 'Changed Classes'
+            itemValue: startClassBrowserOnChanges
+            nameKey: classBrowserOnChanges
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            activeHelpKey: classBrowserOnChangedMethods
+            label: 'Changed Methods'
+            itemValue: startClassBrowserOnChangedMethods
+            nameKey: classBrowserOnChangedMethods
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            activeHelpKey: startSmallTeamChangeSetBrowser
+            label: 'Recent Changes on SmallTeam Host'
+            isVisible: smallTeamAvailable
+            submenuChannel: startBrowserOnSmallTeamChangesMenu
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Special Browsers'
+            submenuChannel: classesSpecialBrowserMenu
+          )
+         (MenuItem
+            activeHelpKey: classesClassTreeBrowser
+            label: 'Class Tree'
+            itemValue: openApplication:
+            argument: 'ClassTreeGraphView'
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            activeHelpKey: classesImplementors
+            label: 'Implementors Of...'
+            itemValue: browseImplementors
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            activeHelpKey: classesSenders
+            label: 'Senders Of...'
+            itemValue: browseSenders
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            label: 'Method Finder'
+            itemValue: openMethodFinder
+            labelImage: (ResourceRetriever ToolbarIconLibrary methodFinder24x24Icon 'Method Finder')
+          )
+         (MenuItem
+            activeHelpKey: classesResourceMethods
+            label: 'Find Resource Methods...'
+            itemValue: browseResources
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            activeHelpKey: classesSpecial
+            label: 'Special'
+            nameKey: special
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  activeHelpKey: classesSpecialReferencesToUnboundGlobals
+                  label: 'References to Unbound Globals'
+                  itemValue: browseUnboundGlobals
+                )
+               (MenuItem
+                  activeHelpKey: classesSpecialReferencesToUndeclared
+                  label: 'References to Undeclared'
+                  itemValue: browseUndeclared
+                )
+               (MenuItem
+                  activeHelpKey: classesSpecialReferencesToUndeclared
+                  label: 'Clear Undeclared Variables'
+                  itemValue: clearUndeclaredVariables
+                )
+               )
+              nil
+              nil
+            )
+          )
+         )
+        nil
+        nil
       )
 !
 
@@ -2680,303 +2689,306 @@
 
     <resource: #menu>
 
-    ^
+    ^ 
      #(Menu
-	(
-	 (MenuItem
-	    activeHelpKey: toolsWorkspace
-	    label: 'Workspace'
-	    itemValue: openWorkspace
-	    nameKey: workspace
-	    labelImage: (ResourceRetriever ToolbarIconLibrary startWorkspaceIcon 'Workspace')
-	  )
-	 (MenuItem
-	    label: '-'
-	  )
-	 (MenuItem
-	    enabled: monticelloRepositoryAvailable
-	    label: 'Monticello Repository Browser'
-	    itemValue: startMonticelloRepositoryBrowser
-	    showBusyCursorWhilePerforming: true
-	  )
-	 (MenuItem
-	    label: 'Programming'
-	    nameKey: programming
-	    submenu:
-	   (Menu
-	      (
-	       (MenuItem
-		  activeHelpKey: toolsChangesBrowser
-		  label: 'Change File Browser'
-		  itemValue: startChangesBrowser
-		  nameKey: changesBrowser
-		  labelImage: (ResourceRetriever ToolbarIconLibrary startChangesBrowserIcon 'Change File Browser')
-		)
-	       (MenuItem
-		  activeHelpKey: toolsSUnit
-		  label: 'SUnit Test Runner'
-		  itemValue: startSUnitTestRunner
-		  nameKey: startSUnitTestRunner
-		  labelImage: (ResourceRetriever NewLauncher startSUnitIcon 'SUnit Test Runner')
-		)
-	       (MenuItem
-		  activeHelpKey: toolsToDoList
-		  label: 'Programmer''s ToDo List'
-		  itemValue: startToDoListBrowser
-		  nameKey: startToDoListBrowser
-		)
-	       (MenuItem
-		  activeHelpKey: toolsOOM
-		  enabled: oomPackageLoaded
-		  label: 'Code Metrics Browser'
-		  itemValue: startOOMBrowser
-		  nameKey: startOOMBrowser
-		)
-	       (MenuItem
-		  activeHelpKey: toolsSmaCC
-		  enabled: smaccPackageLoaded
-		  label: 'SmaCC ParserGenerator'
-		  itemValue: startSmaCCParserGenerator
-		  nameKey: startSmaCCParserGenerator
-		)
-	       (MenuItem
-		  activeHelpKey: toolsInternationalLanguageTranslationEditor
-		  label: 'International Language Translation Editor'
-		  itemValue: startInternationalLanguageTranslationEditor
-		  labelImage: (ResourceRetriever ToolbarIconLibrary languagesIcon 'International Language Translation Editor')
-		)
-	       )
-	      nil
-	      nil
-	    )
-	  )
-	 (MenuItem
-	    activeHelpKey: classesDebugging
-	    label: 'Debugging'
-	    nameKey: debugging
-	    submenu:
-	   (Menu
-	      (
-	       (MenuItem
-		  activeHelpKey: breakPointBrowser
-		  label: 'Breakpoint Browser'
-		  itemValue: openApplication:
-		  argument: 'Tools::BreakpointBrowser'
-		)
-	       (MenuItem
-		  label: '-'
-		)
-	       (MenuItem
-		  activeHelpKey: classesShowTracePoints
-		  label: 'Show all Break && Trace Points'
-		  itemValue: browseAllBreakAndTracePoints
-		)
-	       (MenuItem
-		  activeHelpKey: classesRemoveAllTracePoints
-		  label: 'Remove all Break && Trace Points'
-		  itemValue: removeAllBreakAndTracePoints
-		)
-	       (MenuItem
-		  activeHelpKey: classesStopIgnoringHalts
-		  enabled: debuggerHasIgnoredHalts
-		  label: 'Stop Ignoring Halts/Breakpoints'
-		  itemValue: stopIgnoringHalts
-		)
-	       (MenuItem
-		  label: '-'
-		)
-	       (MenuItem
-		  label: 'Halt when Text is Sent to Transcript...'
-		  itemValue: openTranscriptDebugDialog
-		)
-	       (MenuItem
-		  label: 'Trace when Text is Sent to Transcript...'
-		  itemValue: openTranscriptTraceDialog
-		)
-	       (MenuItem
-		  label: '-'
-		)
-	       (MenuItem
-		  activeHelpKey: enableGlobalCoverageAnalysis
-		  label: 'Clear all Coverage Info (Systemwide)'
-		  itemValue: clearAllCoverageInfo
-		)
-	       (MenuItem
-		  activeHelpKey: enableGlobalCoverageAnalysis
-		  label: 'Enable Coverage Analysis in all Processes'
-		  itemValue: enableGlobalCoverageAnalysis
-		)
-	       )
-	      nil
-	      nil
-	    )
-	  )
-	 (MenuItem
-	    label: 'GUI'
-	    submenu:
-	   (Menu
-	      (
-	       (MenuItem
-		  activeHelpKey: toolsGUIPainter
-		  label: 'GUI Painter'
-		  itemValue: openApplication:
-		  nameKey: guiPainter
-		  labelImage: (ResourceRetriever ToolbarIconLibrary startUIPainterIcon 'GUI Painter')
-		  argument: 'UIPainter'
-		)
-	       (MenuItem
-		  activeHelpKey: toolsMenuEditor
-		  label: 'Menu Editor'
-		  itemValue: openApplication:
-		  nameKey: menuEditor
-		  labelImage: (ResourceRetriever ToolbarIconLibrary startMenuEditorIcon 'Menu Editor')
-		  argument: 'MenuEditor'
-		)
-	       (MenuItem
-		  activeHelpKey: toolsImageEditor
-		  label: 'Image Editor'
-		  itemValue: openApplication:
-		  nameKey: imageEditor
-		  labelImage: (ResourceRetriever ToolbarIconLibrary startImageEditorIcon 'Image Editor')
-		  argument: 'ImageEditor'
-		)
-	       )
-	      nil
-	      nil
-	    )
-	  )
-	 (MenuItem
-	    label: '-'
-	  )
-	 (MenuItem
-	    label: 'Bug Reporter'
-	    itemValue: startBugMessages
-	    nameKey: bugMessages
-	    isVisible: bugReporterAvailable
-	    labelImage: (ResourceRetriever NewLauncher bugReporterIcon 'Bug Reporter')
-	  )
-	 (MenuItem
-	    label: 'SQL Workspace'
-	    itemValue: startSQLWorkspace
-	    isVisible: sqlWorkspaceItemVisible
-	  )
-	 (MenuItem
-	    activeHelpKey: fileApplicationBuilder
-	    label: 'Application Packager (exe-Builder)'
-	    itemValue: openApplication:
-	    labelImage: (ResourceRetriever ToolbarIconLibrary projectBuilderIcon 'Application Packager (exe-Builder)')
-	    argument: 'Tools::ProjectBuilderAssistantApplication'
-	  )
-	 (MenuItem
-	    label: '-'
-	  )
-	 (MenuItem
-	    label: 'Recently Opened'
-	    submenuChannel: recentlyOpenedApplicationsMenu
-	  )
-	 (MenuItem
-	    label: '-'
-	  )
-	 (MenuItem
-	    activeHelpKey: toolsMisc
-	    label: 'Misc'
-	    nameKey: misc
-	    submenu:
-	   (Menu
-	      (
-	       (MenuItem
-		  activeHelpKey: toolsMiscProjects
-		  label: 'Projects'
-		  isVisible: false
-		  submenu:
-		 (Menu
-		    (
-		     (MenuItem
-			activeHelpKey: toolsMiscProjectsNewProject
-			label: 'New Project'
-			itemValue: newProject
-		      )
-		     (MenuItem
-			label: '-'
-		      )
-		     (MenuItem
-			activeHelpKey: toolsMiscProjectsSelectProject
-			label: 'Select Project...'
-			itemValue: selectProject
-		      )
-		     )
-		    nil
-		    nil
-		  )
-		)
-	       (MenuItem
-		  label: '-'
-		  isVisible: false
-		)
-	       (MenuItem
-		  activeHelpKey: toolsMiscNewLauncher
-		  label: 'Reopen Launcher'
-		  itemValue: startNewLauncher
-		)
-	       (MenuItem
-		  activeHelpKey: demosRemoteLauncher
-		  enabled: canOpenRemoteLauncher
-		  label: 'Remote Launcher...'
-		  itemValue: startRemoteLauncher
-		)
-	       (MenuItem
-		  activeHelpKey: demosPDALauncher
-		  label: 'PDA Launcher...'
-		  itemValue: startPDALauncher
-		  isVisible: hasPDALauncher
-		)
-	       (MenuItem
-		  label: '-'
-		)
-	       (MenuItem
-		  activeHelpKey: toolsMiscNewChangesBrowser
-		  label: 'New Changes Browser'
-		  itemValue: startNewChangesBrowser
-		)
-	       (MenuItem
-		  activeHelpKey: toolsMiscOldChangesBrowser
-		  label: 'Old Changes Browser'
-		  itemValue: startOldChangesBrowser
-		)
-	       (MenuItem
-		  label: '-'
-		  isVisible: canDoTerminal
-		)
-	       (MenuItem
-		  activeHelpKey: toolsTerminal
-		  label: 'Terminal'
-		  itemValue: openTerminal
-		  isVisible: canDoTerminal
-		)
-	       (MenuItem
-		  label: '-'
-		  isVisible: canDoTerminal
-		)
-	       (MenuItem
-		  label: 'Inspect Global Variables'
-		  itemValue: inspectGlobalVariables
-		)
-	       (MenuItem
-		  label: 'Inspect Workspace Variables'
-		  itemValue: inspectWorkspaceVariables
-		)
-	       (MenuItem
-		  label: 'Remove all Workspace Variables'
-		  itemValue: removeAllWorkspaceVariables
-		)
-	       )
-	      nil
-	      nil
-	    )
-	  )
-	 )
-	nil
-	nil
+        (
+         (MenuItem
+            activeHelpKey: toolsOpenApplication
+            label: 'Open Application...'
+            itemValue: findApplicationAndOpen
+            nameKey: openApplication
+          )
+         (MenuItem
+            label: 'Recently Opened'
+            submenuChannel: recentlyOpenedApplicationsMenu
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            activeHelpKey: toolsWorkspace
+            label: 'Workspace'
+            itemValue: openWorkspace
+            nameKey: workspace
+            labelImage: (ResourceRetriever ToolbarIconLibrary startWorkspaceIcon 'Workspace')
+          )
+         (MenuItem
+            enabled: monticelloRepositoryAvailable
+            label: 'Monticello Repository Browser'
+            itemValue: startMonticelloRepositoryBrowser
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            label: 'Programming'
+            nameKey: programming
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  activeHelpKey: toolsChangesBrowser
+                  label: 'Change File Browser'
+                  itemValue: startChangesBrowser
+                  nameKey: changesBrowser
+                  labelImage: (ResourceRetriever ToolbarIconLibrary startChangesBrowserIcon 'Change File Browser')
+                )
+               (MenuItem
+                  activeHelpKey: toolsSUnit
+                  label: 'SUnit Test Runner'
+                  itemValue: startSUnitTestRunner
+                  nameKey: startSUnitTestRunner
+                  labelImage: (ResourceRetriever NewLauncher startSUnitIcon 'SUnit Test Runner')
+                )
+               (MenuItem
+                  activeHelpKey: toolsToDoList
+                  label: 'Programmer''s ToDo List'
+                  itemValue: startToDoListBrowser
+                  nameKey: startToDoListBrowser
+                )
+               (MenuItem
+                  activeHelpKey: toolsOOM
+                  enabled: oomPackageLoaded
+                  label: 'Code Metrics Browser'
+                  itemValue: startOOMBrowser
+                  nameKey: startOOMBrowser
+                )
+               (MenuItem
+                  activeHelpKey: toolsSmaCC
+                  enabled: smaccPackageLoaded
+                  label: 'SmaCC ParserGenerator'
+                  itemValue: startSmaCCParserGenerator
+                  nameKey: startSmaCCParserGenerator
+                )
+               (MenuItem
+                  activeHelpKey: toolsInternationalLanguageTranslationEditor
+                  label: 'International Language Translation Editor'
+                  itemValue: startInternationalLanguageTranslationEditor
+                  labelImage: (ResourceRetriever ToolbarIconLibrary languagesIcon 'International Language Translation Editor')
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
+            activeHelpKey: classesDebugging
+            label: 'Debugging'
+            nameKey: debugging
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  activeHelpKey: breakPointBrowser
+                  label: 'Breakpoint Browser'
+                  itemValue: openApplication:
+                  argument: 'Tools::BreakpointBrowser'
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  activeHelpKey: classesShowTracePoints
+                  label: 'Show all Break && Trace Points'
+                  itemValue: browseAllBreakAndTracePoints
+                )
+               (MenuItem
+                  activeHelpKey: classesRemoveAllTracePoints
+                  label: 'Remove all Break && Trace Points'
+                  itemValue: removeAllBreakAndTracePoints
+                )
+               (MenuItem
+                  activeHelpKey: classesStopIgnoringHalts
+                  enabled: debuggerHasIgnoredHalts
+                  label: 'Stop Ignoring Halts/Breakpoints'
+                  itemValue: stopIgnoringHalts
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Halt when Text is Sent to Transcript...'
+                  itemValue: openTranscriptDebugDialog
+                )
+               (MenuItem
+                  label: 'Trace when Text is Sent to Transcript...'
+                  itemValue: openTranscriptTraceDialog
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  activeHelpKey: enableGlobalCoverageAnalysis
+                  label: 'Clear all Coverage Info (Systemwide)'
+                  itemValue: clearAllCoverageInfo
+                )
+               (MenuItem
+                  activeHelpKey: enableGlobalCoverageAnalysis
+                  label: 'Enable Coverage Analysis in all Processes'
+                  itemValue: enableGlobalCoverageAnalysis
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
+            label: 'GUI'
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  activeHelpKey: toolsGUIPainter
+                  label: 'GUI Painter'
+                  itemValue: openApplication:
+                  nameKey: guiPainter
+                  labelImage: (ResourceRetriever ToolbarIconLibrary startUIPainterIcon 'GUI Painter')
+                  argument: 'UIPainter'
+                )
+               (MenuItem
+                  activeHelpKey: toolsMenuEditor
+                  label: 'Menu Editor'
+                  itemValue: openApplication:
+                  nameKey: menuEditor
+                  labelImage: (ResourceRetriever ToolbarIconLibrary startMenuEditorIcon 'Menu Editor')
+                  argument: 'MenuEditor'
+                )
+               (MenuItem
+                  activeHelpKey: toolsImageEditor
+                  label: 'Image Editor'
+                  itemValue: openApplication:
+                  nameKey: imageEditor
+                  labelImage: (ResourceRetriever ToolbarIconLibrary startImageEditorIcon 'Image Editor')
+                  argument: 'ImageEditor'
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Bug Reporter'
+            itemValue: startBugMessages
+            nameKey: bugMessages
+            isVisible: bugReporterAvailable
+            labelImage: (ResourceRetriever NewLauncher bugReporterIcon 'Bug Reporter')
+          )
+         (MenuItem
+            label: 'SQL Workspace'
+            itemValue: startSQLWorkspace
+            isVisible: sqlWorkspaceItemVisible
+          )
+         (MenuItem
+            activeHelpKey: fileApplicationBuilder
+            label: 'Application Packager (exe-Builder)'
+            itemValue: openApplication:
+            labelImage: (ResourceRetriever ToolbarIconLibrary projectBuilderIcon 'Application Packager (exe-Builder)')
+            argument: 'Tools::ProjectBuilderAssistantApplication'
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            activeHelpKey: toolsMisc
+            label: 'Misc'
+            nameKey: misc
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  activeHelpKey: toolsMiscProjects
+                  label: 'Projects'
+                  isVisible: false
+                  submenu: 
+                 (Menu
+                    (
+                     (MenuItem
+                        activeHelpKey: toolsMiscProjectsNewProject
+                        label: 'New Project'
+                        itemValue: newProject
+                      )
+                     (MenuItem
+                        label: '-'
+                      )
+                     (MenuItem
+                        activeHelpKey: toolsMiscProjectsSelectProject
+                        label: 'Select Project...'
+                        itemValue: selectProject
+                      )
+                     )
+                    nil
+                    nil
+                  )
+                )
+               (MenuItem
+                  label: '-'
+                  isVisible: false
+                )
+               (MenuItem
+                  activeHelpKey: toolsMiscNewLauncher
+                  label: 'Reopen Launcher'
+                  itemValue: startNewLauncher
+                )
+               (MenuItem
+                  activeHelpKey: demosRemoteLauncher
+                  enabled: canOpenRemoteLauncher
+                  label: 'Remote Launcher...'
+                  itemValue: startRemoteLauncher
+                )
+               (MenuItem
+                  activeHelpKey: demosPDALauncher
+                  label: 'PDA Launcher...'
+                  itemValue: startPDALauncher
+                  isVisible: hasPDALauncher
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  activeHelpKey: toolsMiscNewChangesBrowser
+                  label: 'New Changes Browser'
+                  itemValue: startNewChangesBrowser
+                )
+               (MenuItem
+                  activeHelpKey: toolsMiscOldChangesBrowser
+                  label: 'Old Changes Browser'
+                  itemValue: startOldChangesBrowser
+                )
+               (MenuItem
+                  label: '-'
+                  isVisible: canDoTerminal
+                )
+               (MenuItem
+                  activeHelpKey: toolsTerminal
+                  label: 'Terminal'
+                  itemValue: openTerminal
+                  isVisible: canDoTerminal
+                )
+               (MenuItem
+                  label: '-'
+                  isVisible: canDoTerminal
+                )
+               (MenuItem
+                  label: 'Inspect Global Variables'
+                  itemValue: inspectGlobalVariables
+                )
+               (MenuItem
+                  label: 'Inspect Workspace Variables'
+                  itemValue: inspectWorkspaceVariables
+                )
+               (MenuItem
+                  label: 'Remove all Workspace Variables'
+                  itemValue: removeAllWorkspaceVariables
+                )
+               )
+              nil
+              nil
+            )
+          )
+         )
+        nil
+        nil
       )
 !
 
@@ -4189,19 +4201,19 @@
         ].
 
         submenu addItem:(MenuItem new
-                            label: ('Close All like This%1' bindWith:info);
+                            label: (resources string:'Close All like This%1' with:info);
                             itemValue: [likeThis do:[:eachView | eachView destroy]];
                             translateLabel: true;
                             enabled:(likeThis size > 1)).
 
         submenu addItem:(MenuItem new
-                            label: ('Iconify All like This%1' bindWith:info);
+                            label: (resources string:'Iconify All like This%1' with:info);
                             itemValue: [likeThis do:[:eachView | eachView collapse]];
                             translateLabel: true;
                             enabled:(likeThis size > 1)).
 
         submenu addItem:(MenuItem new
-                            label: ('Deiconify All like This%1' bindWith:info);
+                            label: (resources string:'Deiconify All like This%1' with:info);
                             itemValue: [likeThis do:[:eachView | eachView raiseDeiconified]];
                             translateLabel: true;
                             enabled:(likeThis size > 1)).
@@ -4288,7 +4300,7 @@
 menuClassHistory
     "returns a sub menu on the history of the classes"
 
-    ^ self menuClassHistoryFor:(UserPreferences current systemBrowserClass)
+    ^ self menuClassHistoryFor:(UserPreferences systemBrowserClass)
 !
 
 menuClassHistoryFor:whichBrowserClass
@@ -4659,6 +4671,26 @@
     "Created: / 28-10-2011 / 20:31:28 / cg"
 !
 
+findApplicationAndOpen
+    |cls|
+
+    cls := UserPreferences current systemBrowserClass 
+                askForClassWithFilter:[:cls | cls isVisualStartable].
+    cls notNil ifTrue:[
+        cls open
+    ]
+!
+
+findClassAndBrowse
+    |cls|
+
+    cls := UserPreferences current systemBrowserClass askForClass.
+    cls notNil ifTrue:[
+        UserPreferences current systemBrowserClass 
+            openInClass:cls selector:nil
+    ]
+!
+
 openMethodFinder
     "open the methodFinder (ported from squeak)"
     
@@ -4967,11 +4999,11 @@
 !NewLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.461 2013-06-05 10:03:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.467 2013-06-27 15:01:31 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.461 2013-06-05 10:03:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.467 2013-06-27 15:01:31 cg Exp $'
 !
 
 version_HG
@@ -4980,6 +5012,6 @@
 !
 
 version_SVN
-    ^ '$Id: NewLauncher.st,v 1.461 2013-06-05 10:03:42 cg Exp $'
+    ^ '$Id: NewLauncher.st,v 1.467 2013-06-27 15:01:31 cg Exp $'
 ! !
 
--- a/ParseTreeIndex.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/ParseTreeIndex.st	Mon Jul 01 22:15:23 2013 +0100
@@ -112,6 +112,12 @@
 
 !ParseTreeIndex::Element methodsFor:'accessing'!
 
+assigned
+    ^false
+
+    "Created: / 01-07-2013 / 21:53:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 firstElementInChain
     |first prev|
 
@@ -124,6 +130,12 @@
     "Created: / 21-08-2011 / 09:51:35 / cg"
 !
 
+name
+    ^node isVariable ifTrue:[node name] ifFalse:[nil]
+
+    "Created: / 01-07-2013 / 21:56:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 next
     ^ next
 !
@@ -242,7 +254,13 @@
     "Modified: / 16-02-2012 / 19:23:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!ParseTreeIndex::Element methodsFor:'queries'!
+!ParseTreeIndex::Element methodsFor:'testing'!
+
+isInstanceVariable
+    ^node isVariable and:[node isInstance]
+
+    "Created: / 01-07-2013 / 21:54:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
 
 isSelector
     ^ node class == SelectorNode
--- a/SyntaxElement.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/SyntaxElement.st	Mon Jul 01 22:15:23 2013 +0100
@@ -269,6 +269,10 @@
 
 !SyntaxElement methodsFor:'queries'!
 
+assigned
+    ^ false.
+!
+
 isSelector
     ^ type == #selector
 
@@ -298,7 +302,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxElement.st,v 1.6 2013-06-14 14:30:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxElement.st,v 1.7 2013-06-24 13:43:05 cg Exp $'
 !
 
 version_HG
@@ -307,6 +311,6 @@
 !
 
 version_SVN
-    ^ '$Id: SyntaxElement.st,v 1.6 2013-06-14 14:30:48 cg Exp $'
+    ^ '$Id: SyntaxElement.st,v 1.7 2013-06-24 13:43:05 cg Exp $'
 ! !
 
--- a/SyntaxElementVariable.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/SyntaxElementVariable.st	Mon Jul 01 22:15:23 2013 +0100
@@ -61,6 +61,10 @@
     ^ (type == #GlobalVariable) or:[ type == #class]
 !
 
+isInstanceVariable
+    ^ (type == #InstanceVariable) 
+!
+
 isVariable
     ^ true
 ! !
@@ -68,10 +72,10 @@
 !SyntaxElementVariable class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxElementVariable.st,v 1.2 2013-06-23 10:44:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxElementVariable.st,v 1.4 2013-06-24 17:09:21 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxElementVariable.st,v 1.2 2013-06-23 10:44:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxElementVariable.st,v 1.4 2013-06-24 17:09:21 cg Exp $'
 ! !
 
--- a/SyntaxHighlighter2.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/SyntaxHighlighter2.st	Mon Jul 01 22:15:23 2013 +0100
@@ -1,6 +1,6 @@
 "
  COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
-              All Rights Reserved
+	      All Rights Reserved
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -38,7 +38,7 @@
 copyright
 "
  COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
-              All Rights Reserved
+	      All Rights Reserved
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -96,23 +96,23 @@
     text emphasisCollection:(text emphasis asRunArray).
 
     tree == #Error ifTrue:[
-        "/ mhmh - which is better ...
-        "/ alternative1: color rest after error in red
-"/        text 
-"/            emphasizeFrom:(parser sourceStream position) 
-"/            to:text size 
+	"/ mhmh - which is better ...
+	"/ alternative1: color rest after error in red
+"/        text
+"/            emphasizeFrom:(parser sourceStream position)
+"/            to:text size
 "/            with:(#color->Color red).
 
 
-        "/ alternative2: take original emphasis for rest
+	"/ alternative2: take original emphasis for rest
 
-        endPos := parser sourceStream position1Based.
-        endPos >= text size ifTrue:[
-            ^ text
-        ].
-        ^ ((text copyTo:endPos) , (aString copyFrom:(endPos+1))).
+	endPos := parser sourceStream position1Based.
+	endPos >= text size ifTrue:[
+	    ^ text
+	].
+	^ ((text copyTo:endPos) , (aString copyFrom:(endPos+1))).
 
-        "/ alternative3: no emphasis for rest.
+	"/ alternative3: no emphasis for rest.
 
 "/        ^ text "/ aString
     ].
@@ -120,8 +120,8 @@
 
     "
      self
-        formatExpression:'(1 + 2) max:5' 
-        in:UndefinedObject
+	formatExpression:'(1 + 2) max:5'
+	in:UndefinedObject
     "
 
     "Created: / 25-07-2010 / 08:56:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -134,10 +134,10 @@
 
     "/ obsolete interface
     ^ self
-        formatMethod:nil
-        source:aString
-        in:aClass
-        using:preferencesOrNil elementsInto:elements
+	formatMethod:nil
+	source:aString
+	in:aClass
+	using:preferencesOrNil elementsInto:elements
 
     "Created: / 25-07-2010 / 08:56:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (comment): / 05-07-2011 / 11:07:50 / cg"
@@ -152,59 +152,59 @@
     aString isNil ifTrue:[^ nil].
 
     Error handle:[:ex |
-        ex creator isHandled ifTrue:[
-            ex reject.    
-        ].
-        (self parseErrorSignal handles:ex) ifFalse:[
-            "Parse error may happen when re-formatting incomplete code while editing"
-            ('SyntaxHighlighter [info]: error during highlight: ' , ex description) infoPrintCR.
-            "/ ex suspendedContext fullPrintAll.
-        ].
-        ^ aString
+	ex creator isHandled ifTrue:[
+	    ex reject.
+	].
+	(self parseErrorSignal handles:ex) ifFalse:[
+	    "Parse error may happen when re-formatting incomplete code while editing"
+	    ('SyntaxHighlighter [info]: error during highlight: ' , ex description) infoPrintCR.
+	    "/ ex suspendedContext fullPrintAll.
+	].
+	^ aString
     ] do:[
-        highlighter := self for:(ReadStream on:aString string) in:aClass.
-        highlighter elements: elements.
-        preferencesOrNil notNil ifTrue:[highlighter preferences:preferencesOrNil].
-        "/ highlighter ignoreErrors:true.
-        highlighter ignoreWarnings:true.
-        highlighter sourceText:(text := aString string asText).
-        "/ use an array here - this can be changed much faster using #at:put:
-        text emphasisCollection:(Array new:aString size).
+	highlighter := self for:(ReadStream on:aString string) in:aClass.
+	highlighter elements: elements.
+	preferencesOrNil notNil ifTrue:[highlighter preferences:preferencesOrNil].
+	"/ highlighter ignoreErrors:true.
+	highlighter ignoreWarnings:true.
+	highlighter sourceText:(text := aString string asText).
+	"/ use an array here - this can be changed much faster using #at:put:
+	text emphasisCollection:(Array new:aString size).
 
-        tree := highlighter parseMethod.
-        "/ now, convert the emphasis-array to a runArray
-        text emphasisCollection:(text emphasis asRunArray).
+	tree := highlighter parseMethod.
+	"/ now, convert the emphasis-array to a runArray
+	text emphasisCollection:(text emphasis asRunArray).
 
-        tree == #Error ifTrue:[
-            eColor := UserPreferences current errorColor.
-            eColor notNil ifTrue:[
-                "/ mhmh - which is better ...
-                "/ alternative1: color rest after error in red
-                text 
-                    emphasizeFrom:(highlighter sourceStream position1Based) 
-                    to:text size 
-                    with:(#color->eColor).
-            ] ifFalse:[
-                "/ alternative2: take original emphasis for rest
+	tree == #Error ifTrue:[
+	    eColor := UserPreferences current errorColor.
+	    eColor notNil ifTrue:[
+		"/ mhmh - which is better ...
+		"/ alternative1: color rest after error in red
+		text
+		    emphasizeFrom:(highlighter sourceStream position1Based)
+		    to:text size
+		    with:(#color->eColor).
+	    ] ifFalse:[
+		"/ alternative2: take original emphasis for rest
 
-                endPos := highlighter sourceStream position1Based.
-                endPos >= text size ifTrue:[
-                    ^ Array with: text with: highlighter elements
-                ].
-                ^ ((text copyTo:endPos) , (aString copyFrom:(endPos+1)))
-            ].
-            "/ alternative3: no emphasis for rest.
-        ].
-        ^text 
+		endPos := highlighter sourceStream position1Based.
+		endPos >= text size ifTrue:[
+		    ^ Array with: text with: highlighter elements
+		].
+		^ ((text copyTo:endPos) , (aString copyFrom:(endPos+1)))
+	    ].
+	    "/ alternative3: no emphasis for rest.
+	].
+	^text
     ]
     "
      self
-        formatMethod:'foo 
+	formatMethod:'foo
     ^ self bar:''hello''.
 
     ' , (Character doubleQuote asString) , 'some comment' , (Character doubleQuote asString) , '
 '
-        in:UndefinedObject
+	in:UndefinedObject
     "
 
     "Modified: / 22-08-2006 / 13:32:04 / cg"
@@ -259,66 +259,66 @@
     "special kludge: since Scanner cannot know if -digit is a binary
      expression or a negative constant, handle cases here"
 
-    [(tokenType == #BinaryOperator) 
+    [(tokenType == #BinaryOperator)
      or:[(tokenType == $|)
      or:[(tokenType == $^ and:[parserFlags allowCaretAsBinop])
-         or:[((tokenType == #Integer) or:[tokenType == #Float])
-             and:[tokenValue < 0]]]]
+	 or:[((tokenType == #Integer) or:[tokenType == #Float])
+	     and:[tokenValue < 0]]]]
     ] whileTrue:[
-        "/ kludge alarm: in a function-call argList, #, is not a binarySelector
-        inFunctionCallArgument == true ifTrue:[
-            ((tokenType == #BinaryOperator) and:[tokenName = ',']) ifTrue:[
-                ^ receiver
-            ].
-        ].
+	"/ kludge alarm: in a function-call argList, #, is not a binarySelector
+	inFunctionCallArgument == true ifTrue:[
+	    ((tokenType == #BinaryOperator) and:[tokenName = ',']) ifTrue:[
+		^ receiver
+	    ].
+	].
 
-        pos1 := tokenPosition.
-        lno := tokenLineNr.
+	pos1 := tokenPosition.
+	lno := tokenLineNr.
 
-        "/ kludge alarm: bar, caret and minus are not scanned as binop
-        (tokenType == $|) ifTrue:[
-            sel := '|'.
-            sel := self selectorCheck:sel for:receiver position:tokenPosition to:tokenPosition.
-            self nextToken.
-        ] ifFalse:[
-            (tokenType == $^) ifTrue:[
-                sel := '^'.
-                sel := self selectorCheck:sel for:receiver position:tokenPosition to:tokenPosition.
-                self nextToken.
-            ] ifFalse:[
-                (tokenType == #BinaryOperator) ifTrue:[
-                    sel := tokenName.
-                    sel := self selectorCheck:sel for:receiver position:tokenPosition to:(tokenPosition + tokenName size - 1).
-                    self nextToken
-                ] ifFalse:[
-                    sel := '-'.
-                    token := tokenValue := tokenValue negated.
-                    tokenPosition := tokenPosition + 1. "/ to skip the sign
-                ]
-            ].
-        ].
+	"/ kludge alarm: bar, caret and minus are not scanned as binop
+	(tokenType == $|) ifTrue:[
+	    sel := '|'.
+	    sel := self selectorCheck:sel for:receiver position:tokenPosition to:tokenPosition.
+	    self nextToken.
+	] ifFalse:[
+	    (tokenType == $^) ifTrue:[
+		sel := '^'.
+		sel := self selectorCheck:sel for:receiver position:tokenPosition to:tokenPosition.
+		self nextToken.
+	    ] ifFalse:[
+		(tokenType == #BinaryOperator) ifTrue:[
+		    sel := tokenName.
+		    sel := self selectorCheck:sel for:receiver position:tokenPosition to:(tokenPosition + tokenName size - 1).
+		    self nextToken
+		] ifFalse:[
+		    sel := '-'.
+		    token := tokenValue := tokenValue negated.
+		    tokenPosition := tokenPosition + 1. "/ to skip the sign
+		]
+	    ].
+	].
 
-        pos2 := pos1 + sel size - 1.
-        self markSelector:sel from:pos1 to:pos2 receiverNode:receiver.
-        lastSelectorElement := nil.
+	pos2 := pos1 + sel size - 1.
+	self markSelector:sel from:pos1 to:pos2 receiverNode:receiver.
+	lastSelectorElement := nil.
 
-        arg := self unaryExpression.
-        (arg == #Error) ifTrue:[^ #Error].
+	arg := self unaryExpression.
+	(arg == #Error) ifTrue:[^ #Error].
 
-        expr := BinaryNode receiver:receiver selector:sel arg:arg fold:foldConstants.
-        expr isErrorNode ifTrue:[
-            self parseError:(expr errorString) position:pos1 to:tokenPosition.
-            errorFlag := false. "ok, user wants it - so he'll get it"
-            expr := BinaryNode receiver:receiver selector:sel arg:arg fold:nil.
-        ].
-        expr lineNumber:lno.
-        expr selectorPosition:pos1.
+	expr := BinaryNode receiver:receiver selector:sel arg:arg fold:foldConstants.
+	expr isErrorNode ifTrue:[
+	    self parseError:(expr errorString) position:pos1 to:tokenPosition.
+	    errorFlag := false. "ok, user wants it - so he'll get it"
+	    expr := BinaryNode receiver:receiver selector:sel arg:arg fold:nil.
+	].
+	expr lineNumber:lno.
+	expr selectorPosition:pos1.
 
-        self checkPlausibilityOf:expr from:pos1 to:pos2.
-        parseForCode ifFalse:[
-            self rememberSelectorUsed:sel receiver:receiver
-        ].
-        receiver := expr.   "/ for next message
+	self checkPlausibilityOf:expr from:pos1 to:pos2.
+	parseForCode ifFalse:[
+	    self rememberSelectorUsed:sel receiver:receiver
+	].
+	receiver := expr.   "/ for next message
     ].
     ^ receiver
 
@@ -332,7 +332,7 @@
     "parse a keyword-expression; return a node-tree, nil or #Error.
 
      keywordExpression ::= binaryexpression
-                           | { KEYWORD-PART binaryExpression }
+			   | { KEYWORD-PART binaryExpression }
     "
 
     |expr receiver sel arg args posR1 posR2 pos1 pos2 lno positions constVal|
@@ -351,40 +351,40 @@
     (arg == #Error) ifTrue:[^ #Error].
     args := Array with:arg.
     [tokenType == #Keyword] whileTrue:[
-        sel := sel , tokenName.
-        pos2 := tokenPosition + tokenName size - 1.
-        positions add:(tokenPosition to:pos2).
-        self nextToken.
-        arg := self binaryExpression.
-        (arg == #Error) ifTrue:[^ #Error].
-        args := args copyWith:arg.
+	sel := sel , tokenName.
+	pos2 := tokenPosition + tokenName size - 1.
+	positions add:(tokenPosition to:pos2).
+	self nextToken.
+	arg := self binaryExpression.
+	(arg == #Error) ifTrue:[^ #Error].
+	args := args copyWith:arg.
     ].
 
     positions do:[:p |
-        self markSelector:sel from:p start to:p stop receiverNode:receiver.
+	self markSelector:sel from:p start to:p stop receiverNode:receiver.
     ].
     lastSelectorElement := nil.
     sel := self selectorCheck:sel for:receiver positions:positions.
 
     ignoreWarnings ifFalse:[
-        (Class definitionSelectors includes:sel) ifTrue:[
-            (receiver isVariable and:[receiver isUndeclared]) ifTrue:[
-                "this is not an error - the undefined class may be loaded after this code!!"
-                self warning:('as yet undefined superclass: ' , receiver name) position:pos1 to:pos2.
-            ].
-        ].
+	(Class definitionSelectors includes:sel) ifTrue:[
+	    (receiver isVariable and:[receiver isUndeclared]) ifTrue:[
+		"this is not an error - the undefined class may be loaded after this code!!"
+		self warning:('as yet undefined superclass: ' , receiver name) position:pos1 to:pos2.
+	    ].
+	].
     ].
 
     expr := MessageNode receiver:receiver selector:sel args:args fold:foldConstants.
     expr isErrorNode ifTrue:[
-        self parseError:(expr errorString) position:pos1 to:pos2.
-        errorFlag := false. "ok, user wants it - so he'll get it"
-        expr := MessageNode receiver:receiver selector:sel args:args fold:nil.
+	self parseError:(expr errorString) position:pos1 to:pos2.
+	errorFlag := false. "ok, user wants it - so he'll get it"
+	expr := MessageNode receiver:receiver selector:sel args:args fold:nil.
     ].
     expr lineNumber:lno.
     self checkPlausibilityOf:expr from:pos1 to:pos2.
     parseForCode ifFalse:[
-        self rememberSelectorUsed:sel receiver:receiver
+	self rememberSelectorUsed:sel receiver:receiver
     ].
 
 "/        (contextToEvaluateIn isNil and:[selfValue isNil]) ifTrue:[    "/ do not check this for doits
@@ -398,72 +398,72 @@
 "/
 
     (sel = #ifTrue: or:[sel = #ifFalse: or:[sel = #ifTrue:ifFalse: or:[sel = #ifFalse:ifTrue:]]]) ifTrue:[
-        (expr receiver withConstantValueDo:[:val | constVal := val]) ifTrue:[
-            |indexOfArgNotExecuted|
+	(expr receiver withConstantValueDo:[:val | constVal := val]) ifTrue:[
+	    |indexOfArgNotExecuted|
 
-            "/ receiver evaluates to a constant
-            constVal == true ifTrue:[
-                (sel startsWith: #ifFalse:) ifTrue:[
-                    indexOfArgNotExecuted := 1.
-                ] ifFalse:[
-                    indexOfArgNotExecuted := 2.
-                ]
-            ].
-            constVal == false ifTrue:[
-                (sel startsWith: #ifTrue:) ifTrue:[
-                    indexOfArgNotExecuted := 1.
-                ] ifFalse:[
-                    indexOfArgNotExecuted := 2.
-                ]
-            ].
-            indexOfArgNotExecuted == 2 ifTrue:[
-                args size == 1 ifTrue:[ indexOfArgNotExecuted := nil]
-            ].
+	    "/ receiver evaluates to a constant
+	    constVal == true ifTrue:[
+		(sel startsWith: #ifFalse:) ifTrue:[
+		    indexOfArgNotExecuted := 1.
+		] ifFalse:[
+		    indexOfArgNotExecuted := 2.
+		]
+	    ].
+	    constVal == false ifTrue:[
+		(sel startsWith: #ifTrue:) ifTrue:[
+		    indexOfArgNotExecuted := 1.
+		] ifFalse:[
+		    indexOfArgNotExecuted := 2.
+		]
+	    ].
+	    indexOfArgNotExecuted == 2 ifTrue:[
+		args size == 1 ifTrue:[ indexOfArgNotExecuted := nil]
+	    ].
 
-            indexOfArgNotExecuted notNil ifTrue:[
-                |argIsNotExecuted|
+	    indexOfArgNotExecuted notNil ifTrue:[
+		|argIsNotExecuted|
 
-                "/ self warning:'receiver is constant; arg',indexOfArgNotExecuted printString,' is never executed' position:pos1 to:tokenPosition.
-                argIsNotExecuted := expr args at:indexOfArgNotExecuted.
-                argIsNotExecuted isBlockNode ifTrue:[
-                    self markCommentFrom:argIsNotExecuted startPosition to:argIsNotExecuted endPosition.
-                ].
-            ].
-        ].
+		"/ self warning:'receiver is constant; arg',indexOfArgNotExecuted printString,' is never executed' position:pos1 to:tokenPosition.
+		argIsNotExecuted := expr args at:indexOfArgNotExecuted.
+		argIsNotExecuted isBlockNode ifTrue:[
+		    self markCommentFrom:argIsNotExecuted startPosition to:argIsNotExecuted endPosition.
+		].
+	    ].
+	].
     ].
 
     (ignoreErrors or:[ignoreWarnings]) ifFalse:[
-        (sel = #and: or:[sel = #or:]) ifTrue:[
-            expr arg1 isBlock ifFalse:[
-                (expr arg1 isVariable
-                and:[ (expr arg1 name asLowercase includesString:'block')]) ifFalse:[
-                    self warnCommonMistake:'(possible common mistake) missing block brackets ?'
-                              position:pos2+1 to:tokenPosition-1
-                ]
-            ].
-            ^ expr.
-        ].
+	(sel = #and: or:[sel = #or:]) ifTrue:[
+	    expr arg1 isBlock ifFalse:[
+		(expr arg1 isVariable
+		and:[ (expr arg1 name asLowercase includesString:'block')]) ifFalse:[
+		    self warnCommonMistake:'(possible common mistake) missing block brackets ?'
+			      position:pos2+1 to:tokenPosition-1
+		]
+	    ].
+	    ^ expr.
+	].
 
-        (sel = #whileTrue: or:[sel = #whileFalse:]) ifTrue:[
-            expr receiver isBlock ifFalse:[
-                (expr receiver isVariable
-                and:[ (expr receiver name asLowercase includesString:'block')]) ifFalse:[
-                    self warnCommonMistake:'(possible common mistake) missing block brackets ?'
-                              position:pos1 to:pos2
-                ]
-            ].
-            ^ expr.
-        ].
+	(sel = #whileTrue: or:[sel = #whileFalse:]) ifTrue:[
+	    expr receiver isBlock ifFalse:[
+		(expr receiver isVariable
+		and:[ (expr receiver name asLowercase includesString:'block')]) ifFalse:[
+		    self warnCommonMistake:'(possible common mistake) missing block brackets ?'
+			      position:pos1 to:pos2
+		]
+	    ].
+	    ^ expr.
+	].
 
-        (sel = #ifTrue: or:[sel = #ifFalse:]) ifTrue:[
-            expr receiver isMessage ifTrue:[
-                (expr receiver selector = #whileTrue or:[expr receiver selector = #whileFalse]) ifTrue:[
-                    self warnCommonMistake:'strange receiver expression'
-                              position:pos1 to:pos2
-                ].
-            ].
-            ^ expr
-        ].
+	(sel = #ifTrue: or:[sel = #ifFalse:]) ifTrue:[
+	    expr receiver isMessage ifTrue:[
+		(expr receiver selector = #whileTrue or:[expr receiver selector = #whileFalse]) ifTrue:[
+		    self warnCommonMistake:'strange receiver expression'
+			      position:pos1 to:pos2
+		].
+	    ].
+	    ^ expr
+	].
     ].
 
     ^ expr.
@@ -482,55 +482,55 @@
     (receiver == #Error) ifTrue:[^ #Error].
 
     [ self isValidUnarySelector:tokenType ] whileTrue:[
-        pos := tokenPosition.
-        pos2 := pos + tokenName size - 1.
-        lNr := tokenLineNr.
-        sel := tokenName.
+	pos := tokenPosition.
+	pos2 := pos + tokenName size - 1.
+	lNr := tokenLineNr.
+	sel := tokenName.
 
-        self markSelector:sel from:pos to:pos2 receiverNode:receiver.
-        lastSelectorElement := nil.
+	self markSelector:sel from:pos to:pos2 receiverNode:receiver.
+	lastSelectorElement := nil.
 
-        self nextToken.
-        tokenType == $( ifTrue:[
-            parserFlags allowSqueakExtensions == true ifTrue:[
-                "/ croquet/squeak extension - c/java-style arguments
-                arguments := self functionCallArgList.
-                "/ synthetic selector: foo[:[with:[with:[...]]]]
-                arguments notEmpty ifTrue:[
-                    sel := sel , ':'.
-                    arguments size - 1 timesRepeat:[ sel := sel , 'with:' ].
-                ].
-                sel := self selectorCheck:sel for:receiver position:pos to:pos2.
-                expr := MessageNode receiver:receiver selector:sel args:arguments fold:foldConstants.
-                expr isErrorNode ifTrue:[
-                    self parseError:(expr errorString) position:pos to:pos2.
-                    errorFlag := false. "ok, user wants it - so he'll get it"
-                    expr := MessageNode receiver:receiver selector:sel args:arguments fold:nil.
-                ].
-                expr lineNumber:lNr.
-                self checkPlausibilityOf:expr from:pos to:pos2.
-                parseForCode ifFalse:[
-                    self rememberSelectorUsed:sel receiver:receiver
-                ].
-                ^ expr.
-            ].
-        ].
+	self nextToken.
+	tokenType == $( ifTrue:[
+	    parserFlags allowSqueakExtensions == true ifTrue:[
+		"/ croquet/squeak extension - c/java-style arguments
+		arguments := self functionCallArgList.
+		"/ synthetic selector: foo[:[with:[with:[...]]]]
+		arguments notEmpty ifTrue:[
+		    sel := sel , ':'.
+		    arguments size - 1 timesRepeat:[ sel := sel , 'with:' ].
+		].
+		sel := self selectorCheck:sel for:receiver position:pos to:pos2.
+		expr := MessageNode receiver:receiver selector:sel args:arguments fold:foldConstants.
+		expr isErrorNode ifTrue:[
+		    self parseError:(expr errorString) position:pos to:pos2.
+		    errorFlag := false. "ok, user wants it - so he'll get it"
+		    expr := MessageNode receiver:receiver selector:sel args:arguments fold:nil.
+		].
+		expr lineNumber:lNr.
+		self checkPlausibilityOf:expr from:pos to:pos2.
+		parseForCode ifFalse:[
+		    self rememberSelectorUsed:sel receiver:receiver
+		].
+		^ expr.
+	    ].
+	].
 
-        sel := self selectorCheck:sel for:receiver position:pos to:pos2.
-        expr := UnaryNode receiver:receiver selector:sel fold:foldConstants.
-        expr isErrorNode ifTrue:[
-            self warning:(expr errorString , '.\\If you proceed, that error will happen at runtime.') withCRs position:pos to:pos2.
-            errorFlag := false. "ok, user wants it - so he'll get it"
-            expr := UnaryNode receiver:receiver selector:sel fold:nil.
-        ].
-        expr lineNumber:lNr.
+	sel := self selectorCheck:sel for:receiver position:pos to:pos2.
+	expr := UnaryNode receiver:receiver selector:sel fold:foldConstants.
+	expr isErrorNode ifTrue:[
+	    self warning:(expr errorString , '.\\If you proceed, that error will happen at runtime.') withCRs position:pos to:pos2.
+	    errorFlag := false. "ok, user wants it - so he'll get it"
+	    expr := UnaryNode receiver:receiver selector:sel fold:nil.
+	].
+	expr lineNumber:lNr.
 
-        self checkPlausibilityOf:expr from:pos to:pos2.
-        parseForCode ifFalse:[
-            self rememberSelectorUsed:sel receiver:receiver
-        ].
+	self checkPlausibilityOf:expr from:pos to:pos2.
+	parseForCode ifFalse:[
+	    self rememberSelectorUsed:sel receiver:receiver
+	].
 
-        receiver := expr.   "/ for next message
+	receiver := expr.   "/ for next message
     ].
     ^ receiver
 
@@ -546,7 +546,7 @@
     lastSelectorElement := nil.
     node := super binaryExpression.
     (lastSelectorElement notNil and:[node ~~ #Error and:[node isMessage]]) ifTrue:[
-        lastSelectorElement node parent: node.
+	lastSelectorElement node parent: node.
     ].
     lastSelectorElement := savedLastSelectorElement.
     ^node
@@ -562,10 +562,10 @@
     lastSelectorElement := nil.
     node := super expression.
     ((node ~~ #Error) and:[node isMessage]) ifTrue:[
-        [ lastSelectorElement notNil ] whileTrue:[
-            lastSelectorElement node parent: node.
-            lastSelectorElement := lastSelectorElement prev.            
-        ].
+	[ lastSelectorElement notNil ] whileTrue:[
+	    lastSelectorElement node parent: node.
+	    lastSelectorElement := lastSelectorElement prev.
+	].
     ].
     lastSelectorElement := savedLastSelectorElement.
     ^node
@@ -584,57 +584,57 @@
     (receiver == #Error) ifTrue:[^ #Error].
 
     [ self isValidUnarySelector:tokenType ] whileTrue:[
-        pos := tokenPosition.
-        pos2 := pos + tokenName size - 1.
-        lNr := tokenLineNr.
-        sel := tokenName.
+	pos := tokenPosition.
+	pos2 := pos + tokenName size - 1.
+	lNr := tokenLineNr.
+	sel := tokenName.
 
-        lastSelectorElement := nil.
-        self markSelector:sel from:pos to:pos2 receiverNode:receiver.
+	lastSelectorElement := nil.
+	self markSelector:sel from:pos to:pos2 receiverNode:receiver.
 
-        self nextToken.
-        tokenType == $( ifTrue:[
-            parserFlags allowSqueakExtensions == true ifTrue:[
-                "/ croquet/squeak extension - c/java-style arguments
-                arguments := self functionCallArgList.
-                "/ synthetic selector: foo[:[with:[with:[...]]]]
-                arguments notEmpty ifTrue:[
-                    sel := sel , ':'.
-                    arguments size - 1 timesRepeat:[ sel := sel , 'with:' ].
-                ].
-                sel := self selectorCheck:sel for:receiver position:pos to:pos2.
-                expr := MessageNode receiver:receiver selector:sel args:arguments fold:foldConstants.
-                expr isErrorNode ifTrue:[
-                    self parseError:(expr errorString) position:pos to:pos2.
-                    errorFlag := false. "ok, user wants it - so he'll get it"
-                    expr := MessageNode receiver:receiver selector:sel args:arguments fold:nil.
-                ].
-                lastSelectorElement node parent: expr.
-                expr lineNumber:lNr.
-                self checkPlausibilityOf:expr from:pos to:pos2.
-                parseForCode ifFalse:[
-                    self rememberSelectorUsed:sel receiver:receiver
-                ].
-                ^ expr.
-            ].
-        ].
+	self nextToken.
+	tokenType == $( ifTrue:[
+	    parserFlags allowSqueakExtensions == true ifTrue:[
+		"/ croquet/squeak extension - c/java-style arguments
+		arguments := self functionCallArgList.
+		"/ synthetic selector: foo[:[with:[with:[...]]]]
+		arguments notEmpty ifTrue:[
+		    sel := sel , ':'.
+		    arguments size - 1 timesRepeat:[ sel := sel , 'with:' ].
+		].
+		sel := self selectorCheck:sel for:receiver position:pos to:pos2.
+		expr := MessageNode receiver:receiver selector:sel args:arguments fold:foldConstants.
+		expr isErrorNode ifTrue:[
+		    self parseError:(expr errorString) position:pos to:pos2.
+		    errorFlag := false. "ok, user wants it - so he'll get it"
+		    expr := MessageNode receiver:receiver selector:sel args:arguments fold:nil.
+		].
+		lastSelectorElement node parent: expr.
+		expr lineNumber:lNr.
+		self checkPlausibilityOf:expr from:pos to:pos2.
+		parseForCode ifFalse:[
+		    self rememberSelectorUsed:sel receiver:receiver
+		].
+		^ expr.
+	    ].
+	].
 
-        sel := self selectorCheck:sel for:receiver position:pos to:pos2.
-        expr := UnaryNode receiver:receiver selector:sel fold:foldConstants.
-        expr isErrorNode ifTrue:[
-            self warning:(expr errorString , '.\\If you proceed, that error will happen at runtime.') withCRs position:pos to:pos2.
-            errorFlag := false. "ok, user wants it - so he'll get it"
-            expr := UnaryNode receiver:receiver selector:sel fold:nil.
-        ].
-        expr lineNumber:lNr.
-        lastSelectorElement node parent: expr.
+	sel := self selectorCheck:sel for:receiver position:pos to:pos2.
+	expr := UnaryNode receiver:receiver selector:sel fold:foldConstants.
+	expr isErrorNode ifTrue:[
+	    self warning:(expr errorString , '.\\If you proceed, that error will happen at runtime.') withCRs position:pos to:pos2.
+	    errorFlag := false. "ok, user wants it - so he'll get it"
+	    expr := UnaryNode receiver:receiver selector:sel fold:nil.
+	].
+	expr lineNumber:lNr.
+	lastSelectorElement node parent: expr.
 
-        self checkPlausibilityOf:expr from:pos to:pos2.
-        parseForCode ifFalse:[
-            self rememberSelectorUsed:sel receiver:receiver
-        ].
+	self checkPlausibilityOf:expr from:pos to:pos2.
+	parseForCode ifFalse:[
+	    self rememberSelectorUsed:sel receiver:receiver
+	].
 
-        receiver := expr.   "/ for next message
+	receiver := expr.   "/ for next message
     ].
     lastSelectorElement := savedLastSelectorElement.
     ^ receiver
@@ -650,13 +650,13 @@
     node := super variable.
     ignoreBadIdentifier := false.
     node isVariable ifTrue:[
-        | el prevEl |
+	| el prevEl |
 
-        el := elements newElementFor: node.
-        prevEl := lastVariableElements at:node name ifAbsent:[nil].
-        prevEl notNil ifTrue:[prevEl next:el].
-        lastVariableElements at:node name put:el.
-        elements add: el.
+	el := elements newElementFor: node.
+	prevEl := lastVariableElements at:node name ifAbsent:[nil].
+	prevEl notNil ifTrue:[prevEl next:el].
+	lastVariableElements at:node name put:el.
+	elements add: el.
     ].
     ^node
 
@@ -714,26 +714,26 @@
      marked specially (and not as an error when the class is not yet loaded -
      the code is correct as JavaClassAccessor loads it lazily"
     (aReceiverNode isJavaPackageReference) ifTrue:[
-        self
-            markFrom:pos1 to:pos2 
-            withEmphasis:preferences globalClassIdentifierEmphasis 
-            color: preferences globalClassIdentifierColor
+	self
+	    markFrom:pos1 to:pos2
+	    withEmphasis:preferences globalClassIdentifierEmphasis
+	    color: preferences globalClassIdentifierColor
     ] ifFalse:[
-        super markSelector:selectorString from:pos1 to:pos2 receiverNode:aReceiverNode.
+	super markSelector:selectorString from:pos1 to:pos2 receiverNode:aReceiverNode.
     ].
-    
+
     "don't create symbols for partial typed selectors"
     selectorSymbol := selectorString asSymbolIfInterned.
 
     element := elements newElementFor: (SelectorNode value: selectorString from: pos1 to: pos2).
 
     (lastSelectorElement notNil "and:[lastSelectorElement value = selectorString]") ifTrue:[
-        lastSelectorElement next: element.
+	lastSelectorElement next: element.
     ].
     elements add: element.
     lastSelectorElement := "(self isValidUnarySelector:tokenType)"false
-                                ifTrue:[nil] 
-                                ifFalse:[element].
+				ifTrue:[nil]
+				ifFalse:[element].
 
     "Created: / 14-02-2010 / 17:40:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 14-02-2010 / 19:24:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -765,4 +765,3 @@
 version_SVN
     ^ '$Id: SyntaxHighlighter2.st,v 1.15 2013-06-23 10:44:44 cg Exp $'
 ! !
-
--- a/SystemBrowser.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/SystemBrowser.st	Mon Jul 01 22:15:23 2013 +0100
@@ -17,7 +17,7 @@
 		EmphasisForDifferentPackage EmphasisForModifiedBuffer
 		EmphasisForObsoleteCode EmphasisForReadVariable
 		EmphasisForWrittenVariable EmphasisForChangedCode
-		LastSearchPatterns'
+		LastSearchPatterns LastClassSearchBoxShowedFullName'
 	poolDictionaries:''
 	category:'Interface-Browsers'
 !
@@ -342,6 +342,10 @@
     ^ self classHistory
         collect:[:e | e className]
         thenSelect:[:nm | nm notEmptyOrNil]
+
+    "
+     Tools::NewSystemBrowser visitedClassNamesHistory
+    "
 ! !
 
 !SystemBrowser class methodsFor:'defaults'!
@@ -4573,9 +4577,7 @@
                             |method src inLiterals|
 
                             inLiterals := false.
-                            (method := methodArg) isWrapped ifTrue:[
-                                method := method originalMethod.
-                            ].
+                            method := methodArg originalMethodIfWrapped.
                             method isLazyMethod ifTrue:[
                                 src := method source.
                                 (src notNil and:[src includesString:quickMatch]) ifTrue:[
@@ -4602,9 +4604,7 @@
             searchBlock := [:class :methodArg :s |
                             |method src inLiterals|
 
-                            (method := methodArg) isWrapped ifTrue:[
-                                method := method originalMethod.
-                            ].
+                            method := methodArg originalMethodIfWrapped.
                             "/ expensive search
                             inLiterals := false.
                             method isLazyMethod ifTrue:[
@@ -4647,9 +4647,7 @@
             searchBlock := [:class :methodArg :s |
                                 |method src|
 
-                                (method := methodArg) isWrapped ifTrue:[
-                                    method := method originalMethod.
-                                ].
+                                method := methodArg originalMethodIfWrapped.
                                 method isLazyMethod ifTrue:[
                                     src := method source.
                                     (src notNil and:[src includesString:quickMatch]) ifTrue:[
@@ -4948,10 +4946,7 @@
                     ]
                 ]
             ] ifFalse:[
-                (m := mthd) isWrapped ifTrue:[
-                    m := m originalMethod.
-                ].
-
+                m := mthd originalMethodIfWrapped.
                 ((m refersToLiteral:sym1) or:[ sym1 ~= sym2 and:[m refersToLiteral:sym2] ]) ifTrue:[
                     usedGlobals := m usedGlobals.
                     ok := (usedGlobals includes:sym1) or:[ sym1 ~= sym2 and:[usedGlobals includes:sym2] ]
@@ -4971,9 +4966,7 @@
                 usedGlobals := mthd usedGlobals
             ]
         ] ifFalse:[
-            (m := mthd) isWrapped ifTrue:[
-                m := m originalMethod.
-            ].
+            m := mthd originalMethodIfWrapped.
             (m literals contains:[:lit | (aGlobalName match:lit) or:[globalsPlainName match:lit]]) ifTrue:[
                 usedGlobals := m usedGlobals
             ].
@@ -5644,6 +5637,7 @@
 
     "
      SystemBrowser askThenBrowseClass
+     Tools::NewSystemBrowser askThenBrowseClass
     "
 !
 
@@ -5652,6 +5646,7 @@
 
     "
      SystemBrowser askThenBrowseClassHierarchy
+     Tools::NewSystemBrowser askThenBrowseClassHierarchy
     "
 !
 
@@ -5660,38 +5655,261 @@
 
     "
      SystemBrowser askThenBrowseFullClassProtocol
-    "
-!
-
-getClassThenPerform:aSelector
-    |enterBox resources|
-
-    resources := self classResources.
-
-    enterBox := EnterBox title:(self classResources stringWithCRs:'Browse which class:').
-    enterBox okText:(resources string:'Browse').
-    enterBox entryCompletionBlock:(DoWhatIMeanSupport classNameEntryCompletionBlock).
-    enterBox action:[:className |
-        |cls|
-
-        cls := Smalltalk classNamed:className.
-        cls isNil ifTrue:[
-            self warn:(resources string:'No such class').
-        ] ifFalse:[
-            self perform:aSelector with:cls  
-        ]
-    ].
-    enterBox showAtPointer
-
-    "
-     SystemBrowser getClassThenPerform:#browseClass:
-    "
-
-    "Modified: / 10-08-2006 / 12:54:20 / cg"
+     Tools::NewSystemBrowser askThenBrowseFullClassProtocol
+    "
 ! !
 
 !SystemBrowser class methodsFor:'utilities'!
 
+askForClass
+    ^ self askForClassWithFilter:nil
+
+    "
+     Tools::NewSystemBrowser askForClass   
+    "
+!
+
+askForClassName
+    ^ self askForClassNameWithFilter:nil
+
+    "
+     Tools::NewSystemBrowser askForClassName   
+    "
+!
+
+askForClassNameWithFilter:filterOrNil
+    self
+        askForClassToSearch:nil
+        single:true
+        msgTail:''
+        resources:(self classResources)
+        filter:filterOrNil
+        forBrowser:nil
+        thenDo:[:className :single :doWhat |
+            ^ className
+        ].
+    ^ nil
+
+    "
+     Tools::NewSystemBrowser askForClassName   
+    "
+!
+
+askForClassToSearch:doWhatByDefault single:singleClass msgTail:msgTail resources:resourcesOrNil filter:filterOrNil forBrowser:aBrowserOrNil thenDo:aBlock
+    "utility common code for both opening a new browser on a class and
+     to search for a class in an existing browser.
+     If singleClass is true, a single class will be asked for and browsed,
+     otherwise, a match pattern is allowed and a multi-class browser is opened.
+     Moved from instance protocol for better reusability."
+
+    |box boxLabel title okText className canFind doWhat classNameHolder updateList
+     allClasses classNamesInChangeSet
+     allNames allFullNames initialShortNames initialFullNames
+     colorizedFullNames colorizedShortNames
+     resources check showingWhatLabel showFullNameHolder genShortNameListEntry|
+
+    resources := resourcesOrNil ? self classResources.
+    showFullNameHolder := (LastClassSearchBoxShowedFullName ? false) asValue.
+
+    doWhat := doWhatByDefault.
+    canFind := false.
+
+    title := ''.
+    boxLabel := (resources string:'Select a class').
+    okText := 'OK'.
+
+    genShortNameListEntry :=
+        [:cls |
+            |ns|
+
+            cls isNil ifTrue:[
+                nil
+            ] ifFalse:[
+                (filterOrNil notNil and:[ (filterOrNil value:cls) not]) ifTrue:[
+                    nil
+                ] ifFalse:[
+                    ns := cls topNameSpace name.
+                    ns = 'Smalltalk'
+                        ifTrue:[ ns := '' ]
+                        ifFalse:[ns := ' (in ',ns,')'].
+                    cls nameWithoutNameSpacePrefix,ns
+                ]
+            ].
+        ].
+
+    classNamesInChangeSet := ChangeSet current changedClasses
+                                select: (filterOrNil ? [:cls | true])
+                                thenCollect:[:each | each theNonMetaclass name].
+
+    initialFullNames := self visitedClassNamesHistory.
+    (filterOrNil notNil) ifTrue:[
+        initialFullNames := initialFullNames select:[:nm | filterOrNil value:(Smalltalk at:nm)].
+    ].
+    initialShortNames := initialFullNames collect:[:nm | genShortNameListEntry value:(Smalltalk at:nm)] thenSelect:[:nm | nm notNil].
+
+    colorizedFullNames := initialFullNames collect:[:clsName | 
+                                (classNamesInChangeSet includes:clsName) ifTrue:[
+                                    clsName asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+                                ] ifFalse:[
+                                    clsName
+                                ].
+                            ].
+
+    colorizedShortNames := initialShortNames with:initialFullNames collect:[:shortName :clsName | 
+                                (classNamesInChangeSet includes:clsName) ifTrue:[
+                                    shortName asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+                                ] ifFalse:[
+                                    shortName
+                                ].
+                            ].
+
+    title := (resources string:title) , msgTail , '.\' , (resources string:'(TAB to complete; matchPattern allowed - "*" for all):').
+
+    box := self
+                enterBoxForClassWithCodeSelectionTitle:title withCRs
+                withList:(showFullNameHolder value ifTrue:[colorizedFullNames] ifFalse:[colorizedShortNames])
+                okText:okText
+                forBrowser:nil.
+
+    box label:boxLabel.
+
+    allClasses := Smalltalk allClasses copyAsOrderedCollection.
+    filterOrNil notNil ifTrue:[
+        allClasses := allClasses select: filterOrNil
+    ].
+
+    allNames := (allClasses
+                    collect:[:cls |
+                        |ns nm|
+
+                        ns := cls topNameSpace name.
+                        ns = 'Smalltalk'
+                            ifTrue:[ ns := '' ]
+                            ifFalse:[ns := ' (in ',ns,')'].
+                        cls isNameSpace ifTrue:[
+                            nm := cls nameWithoutNameSpacePrefix,ns,' (Namespace)'
+                        ] ifFalse:[
+                            nm := cls nameWithoutNameSpacePrefix,ns
+                        ].
+                        (classNamesInChangeSet includes:cls name) ifTrue:[
+                            nm asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+                        ] ifFalse:[
+                            nm
+                        ].
+                    ]) sortWith:allClasses; yourself.
+
+    allFullNames := (allClasses 
+                    collect:[:cls | 
+                        |nm|
+
+                        nm := cls name.
+                        (classNamesInChangeSet includes:cls name) ifTrue:[
+                            nm asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+                        ] ifFalse:[
+                            nm
+                        ].
+                    ]) sortWith:allClasses; yourself.
+
+    updateList := [
+            |nameToSearch list namesStarting namesIncluding lcName nameList|
+
+            (nameToSearch := classNameHolder value withoutSeparators) isEmpty ifTrue:[
+                showingWhatLabel label:(resources string:'Recently visited:').
+                list := (showFullNameHolder value ifTrue:[colorizedFullNames] ifFalse:[colorizedShortNames]).
+            ] ifFalse:[
+                showingWhatLabel label:(resources string:'Matching classes:').
+                nameList := showFullNameHolder value
+                                ifTrue:[ allFullNames ]
+                                ifFalse:[ allNames ].
+
+                lcName := nameToSearch asLowercase.
+                (lcName includesString:'::') ifTrue:[
+                    list := OrderedCollection new.
+                    allClasses doWithIndex:[:cls :idx |
+                        |isIncluded|
+
+                        (nameToSearch includesMatchCharacters) ifTrue:[
+                            isIncluded := (lcName match:cls name asLowercase)
+                        ] ifFalse:[
+                            isIncluded := (cls name includesString:lcName caseSensitive:false)
+                        ].
+                        isIncluded ifTrue:[
+                            list add:(nameList at:idx)
+                        ].
+                    ].
+                ] ifFalse:[
+                    (nameToSearch includesMatchCharacters) ifTrue:[
+                        list := nameList select:[:nm | lcName match:nm asLowercase]
+                    ] ifFalse:[
+                        namesIncluding := nameList
+                                            select:[:nm |
+                                                "/ nm asLowercase startsWith:lcName
+                                                nm asLowercase includesString:lcName caseSensitive:false
+                                            ].
+                        namesStarting := namesIncluding select:[:nm | nm asLowercase startsWith:lcName].
+                        list := namesStarting , {nil} , (namesIncluding \ namesStarting).
+                    ]
+                ]
+            ].
+            box listView
+                list:list;
+                scrollToLine:((list findFirst:[:line | (line ? '') startsWith:lcName]) max:1)
+        ].
+
+    classNameHolder := '' asValue.
+    box enterField
+        model:classNameHolder;
+        immediateAccept:true.
+    classNameHolder onChangeEvaluate:updateList.
+
+    box entryCompletionBlock:(DoWhatIMeanSupport classNameEntryCompletionBlock).
+    box action:[:aString | className := aString].
+
+    box panelView
+        addSubView:(showingWhatLabel := (Label label:(resources string:'Recently visited:')) adjust:#left) before:nil;
+        addSubView:(check := CheckBox label:(resources string:'Show Full Name (do not strip off Namespace)') model:showFullNameHolder) before:nil.
+    showFullNameHolder onChangeEvaluate:updateList.
+    box enterField origin:(0 @ check corner y).
+    box listView origin:(0 @ check corner y).
+
+    box extent:(400 @ 350).
+    box open.
+
+    className isEmptyOrNil ifTrue:[^ nil "cancel"].
+
+    LastClassSearchBoxShowedFullName := showFullNameHolder value.
+
+    (className endsWith:$) ) ifTrue:[
+        (className indexOfSubCollection:'(in ') == 0 ifTrue:[
+            "/ a namespace
+            className := (className copyTo:(className indexOfSubCollection:'(Name')-1) withoutSeparators
+        ] ifFalse:[
+            className := ((className copyFrom:(className indexOfSubCollection:'(in ')+4)
+                            copyButLast:1)
+                         , '::' , className asCollectionOfWords first
+        ].
+    ].
+
+    aBlock notNil ifTrue:[aBlock value:className optionalArgument:singleClass and:doWhat].
+    ^ className
+
+    "Modified: / 23-07-2012 / 11:00:22 / cg"
+!
+
+askForClassWithFilter:filterOrNil
+    |className|
+
+    className := self askForClassNameWithFilter:filterOrNil.
+    className notEmptyOrNil ifTrue:[
+        ^ Smalltalk classNamed:className
+    ].
+    ^ nil
+
+    "
+     Tools::NewSystemBrowser askForClass   
+    "
+!
+
 classWithNameSimilarTo:className
     "helper for class-name entry; finds a class by name tolerant w.r.t. case"
 
@@ -5800,6 +6018,134 @@
     "Modified: / 22-08-2006 / 14:53:38 / cg"
 !
 
+enterBoxForClassWithCodeSelectionTitle:title withList:listOrNil okText:okText forBrowser:aBrowserOrNil
+    "convenient method: setup an enterBox with initial text taken
+     from the codeviews selection."
+
+    |sel box initialText superclass currentClass
+     methods someMethod offeredClass anyClose closeName s usedGlobals list|
+
+    list := listOrNil.
+
+    aBrowserOrNil notNil ifTrue:[    
+        currentClass := aBrowserOrNil theSingleSelectedClass.
+
+        sel := aBrowserOrNil selectionInCodeView.
+        sel notNil ifTrue:[
+            aBrowserOrNil selectedNamespacesValue doWithExit:[:eachNs :exit |
+                s := eachNs , '::' , sel asSymbol.
+                (s knownAsSymbol
+                and:[(Smalltalk at:s asSymbol) isBehavior]) ifTrue:[
+                    "/ a private class of current ...
+                    sel := eachNs , '::' , sel asSymbol.
+                    exit value:nil.
+                ].
+            ].
+            (sel knownAsSymbol and:[currentClass notNil
+            and:[(currentClass theNonMetaclass privateClassesAt:sel asSymbol) notNil]]) ifTrue:[
+                "/ a private class of current ...
+                sel := (currentClass theNonMetaclass privateClassesAt:sel asSymbol) name
+            ] ifFalse:[
+                (sel knownAsSymbol and:[(Smalltalk at:sel asSymbol) isBehavior]) ifFalse:[
+                    "/ ignore it, if there is no class-name which comes close.
+                    anyClose := false.
+                    Smalltalk keysAndValuesDo:[:aGlobalName :aGlobal|
+                        aGlobal isBehavior ifTrue:[
+                            aGlobal isMeta ifFalse:[
+                                aGlobal name == aGlobalName ifTrue:[
+                                    ((aGlobalName startsWith:sel)
+                                    or:[(sel startsWith:aGlobalName)]) ifTrue:[
+                                        closeName isNil ifTrue:[closeName := aGlobalName].
+                                        anyClose := true.
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ].
+                    anyClose ifFalse:[
+                        sel := nil
+                    ] ifTrue:[
+                        sel := closeName
+                    ]
+                ]
+            ]
+        ].
+
+        sel notNil ifTrue:[
+            initialText := sel asString withoutSeparators
+        ] ifFalse:[
+            aBrowserOrNil codeAspect == SyntaxHighlighter codeAspectMethod ifTrue:[
+                methods := aBrowserOrNil selectedMethodsValue.
+                methods size > 0 ifTrue:[
+                    someMethod := methods first.
+                    usedGlobals := someMethod usedGlobals collect:[:eachVar | eachVar asSymbol].
+                    usedGlobals := usedGlobals select:[:eachVar | (Smalltalk at:eachVar) isBehavior].
+                    usedGlobals size > 0 ifTrue:[
+                        list := list reject:[:each | usedGlobals includes:each ].
+                        list := usedGlobals asOrderedCollection sort , list.
+                        offeredClass := Smalltalk at:usedGlobals first
+                    ] ifFalse:[
+                        offeredClass := someMethod mclass
+                    ]
+                ]
+            ] ifFalse:[
+                (aBrowserOrNil navigationState isVersionDiffBrowser
+                or:[aBrowserOrNil navigationState isClassDocumentationBrowser]) ifTrue:[
+                    offeredClass := currentClass.
+                    (offeredClass notNil and:[offeredClass isPrivate]) ifTrue:[
+                        offeredClass := offeredClass owningClass
+                    ]
+                ] ifFalse:[
+                    (currentClass notNil
+                    and:[(superclass := currentClass superclass) notNil]) ifTrue:[
+                        offeredClass := superclass
+                    ]
+                ]
+            ].
+            offeredClass notNil ifTrue:[
+                initialText := offeredClass theNonMetaclass name
+            ]
+        ].
+    ].
+
+    box := self
+                enterBoxTitle:(self classResources string:title)
+                withList:list
+                okText:(self classResources string:okText).
+
+    initialText notNil ifTrue:[
+        box initialText:initialText
+    ].
+    ^ box
+
+    "Created: / 13-02-2000 / 20:56:18 / cg"
+    "Modified: / 27-07-2012 / 22:18:34 / cg"
+!
+
+enterBoxTitle:title withList:aListOrNil okText:okText
+    "convenient method: setup enterBox"
+
+    |box rsrcs|
+
+    aListOrNil notNil ifTrue:[
+        box := ListSelectionBox new.
+        "/ box := EnterBoxWithList new.
+        box list:aListOrNil.
+    ] ifFalse:[
+        box := EnterBox new.
+    ].
+    rsrcs := self classResources.
+    box title:(rsrcs string:title) okText:(rsrcs string:okText).
+    ^ box
+
+    "
+     self enterBoxTitle:'bla' withList:#('a' 'b' 'c') okText:'gaga'
+    "
+
+    "Created: / 13.2.2000 / 20:53:53 / cg"
+    "Modified: / 1.3.2000 / 11:15:09 / cg"
+!
+
 extractClassAndSelectorFrom:aString into:aBlock
     "given a string which can be either 'class>>sel' or
      'class sel', extract className and selector, and call aBlock with
@@ -5898,6 +6244,37 @@
     "Modified: / 6.2.2000 / 00:57:08 / cg"
 !
 
+getClassThenPerform:aSelector
+    |classNameEntered classEntered enterBox resources|
+
+    "/ new Code:
+    classNameEntered := self askForClassName.
+
+    "/ old Code:
+"/    resources := self classResources.
+"/
+"/    enterBox := EnterBox title:(self classResources stringWithCRs:'Browse which class:').
+"/    enterBox okText:(resources string:'Browse').
+"/    enterBox entryCompletionBlock:(DoWhatIMeanSupport classNameEntryCompletionBlock).
+"/    enterBox action:[:className | classNameEntered := className].
+"/    enterBox showAtPointer.
+"/
+    classNameEntered notEmptyOrNil ifTrue:[   
+        classEntered := Smalltalk classNamed:classNameEntered.
+        classEntered isNil ifTrue:[
+            self warn:(resources string:'No such class').
+        ] ifFalse:[
+            self perform:aSelector with:classEntered  
+        ]
+    ].
+
+    "
+     SystemBrowser getClassThenPerform:#browseClass:
+    "
+
+    "Modified: / 10-08-2006 / 12:54:20 / cg"
+!
+
 resourceEditorClassFor:aResource 
     "resources are from a methods resource-info;
      return an appropriate editor class."
@@ -6025,11 +6402,11 @@
 !SystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.324 2013-06-21 00:22:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.330 2013-06-30 07:11:07 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.324 2013-06-21 00:22:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SystemBrowser.st,v 1.330 2013-06-30 07:11:07 cg Exp $'
 !
 
 version_HG
@@ -6038,7 +6415,7 @@
 !
 
 version_SVN
-    ^ '$Id: SystemBrowser.st,v 1.324 2013-06-21 00:22:31 cg Exp $'
+    ^ '$Id: SystemBrowser.st,v 1.330 2013-06-30 07:11:07 cg Exp $'
 ! !
 
 
--- a/Tools_MethodList.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools_MethodList.st	Mon Jul 01 22:15:23 2013 +0100
@@ -1488,16 +1488,7 @@
      (used when a single methods package, code or whatever changes, and a full udpate
       would be too slow)"
 
-    |s idx|
-
-    s := self 
-            listEntryForMethod:aMethod 
-            selector:aMethod selector 
-            class:aMethod mclass 
-            showClass:lastShowClass 
-            showCategory:lastShowCategory
-            classFirst:lastShowClassFirst
-            suppressInheritanceInfo:false.
+    |mthd s idx|
 
     idx := methodList identityIndexOf:aMethod.
     idx == 0 ifTrue:[
@@ -1509,6 +1500,16 @@
             ].
         ]
     ].
+
+    s := self 
+            listEntryForMethod:aMethod 
+            selector:aMethod selector 
+            class:aMethod mclass 
+            showClass:lastShowClass 
+            showCategory:lastShowCategory
+            classFirst:lastShowClassFirst
+            suppressInheritanceInfo:false.
+
     idx == 0 ifTrue:[
         "/ method was not previously shown; try to avoid a full update
         (self isMethodToBeShown:aMethod) ifTrue:[
@@ -1816,10 +1817,10 @@
 !MethodList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.89 2013-06-23 08:25:47 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.90 2013-06-27 20:53:36 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.89 2013-06-23 08:25:47 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.90 2013-06-27 20:53:36 cg Exp $'
 ! !
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Tools_NavigatorCanvas.st	Mon Jul 01 22:15:23 2013 +0100
@@ -0,0 +1,6839 @@
+"
+ COPYRIGHT (c) 2000 by eXept Software AG
+	      All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
+"{ Package: 'stx:libtool' }"
+
+"{ NameSpace: Tools }"
+
+NavigatorModel subclass:#NavigatorCanvas
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Interface-Browsers-New'
+!
+
+!NavigatorCanvas class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 2000 by eXept Software AG
+	      All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
+! !
+
+!NavigatorCanvas class methodsFor:'interface specs'!
+
+categoryAndClassOnlySpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#categoryAndClassOnlySpec
+     NavigatorCanvas new openInterface:#categoryAndClassOnlySpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #fullClassSourceBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'Full Class Browser'
+          #name: 'Full Class Browser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 18 51 480 351)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#SubCanvasSpec
+              #name: 'Organizer'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #majorKey: #'OrganizerCanvas'
+              #minorKey: #windowSpecWithoutMetaToggles
+              #subAspectHolders: 
+             #(#Array
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #classCategoryListMenuHolder
+                  #aspect: #categoryPopUpMenu
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #classCategoryDoubleClickChannel
+                  #callBack: #classCategoryDoubleClicked
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #classDoubleClickChannel
+                  #callBack: #classDoubleClicked
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #nameSpaceDoubleClickChannel
+                  #callBack: #nameSpaceDoubleClicked
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #projectDoubleClickChannel
+                  #callBack: #projectDoubleClicked
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #variableDoubleClickChannel
+                  #callBack: #variableDoubleClicked
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #classHierarchyListMenuHolder
+                  #aspect: #hierarchyPopUpMenu
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #classHierarchyTopClass
+                  #aspect: #classHierarchyTopClass
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #classListMenuHolder
+                  #aspect: #classPopUpMenu
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #hidePrivateClasses
+                  #aspect: #hidePrivateClasses
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #hideUnloadedClasses
+                  #aspect: #hideUnloadedClasses
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #showClassPackages
+                  #aspect: #showClassPackages
+                )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+"/                     #(#SubChannelInfoSpec
+"/                        #subAspect: #showMethodComplexity
+"/                        #aspect: #showMethodComplexity
+"/                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #immediateUpdate
+                  #aspect: #immediateUpdate
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #meta
+                  #aspect: #meta
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #metaToggleLabelHolder
+                  #aspect: #metaToggleLabelHolder
+                )
+
+               #(#SubChannelInfoSpec
+                  #subAspect: #nameSpaceListMenuHolder
+                  #aspect: #nameSpacePopUpMenu
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #organizerMode
+                  #aspect: #organizerMode
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #outGeneratorHolder
+                  #aspect: #protocolListGenerator
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #packageFilter
+                  #aspect: #packageFilter
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #projectListMenuHolder
+                  #aspect: #projectPopUpMenu
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectedCategories
+                  #aspect: #selectedCategories
+                  #callBack: #categorySelectionChanged
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectedClasses
+                  #aspect: #selectedClasses
+                  #callBack: #classSelectionChanged
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectedNamespaces
+                  #aspect: #selectedNamespaces
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectedProjects
+                  #aspect: #selectedProjects
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectionChangeCondition
+                  #aspect: #selectionChangeConditionHolder
+                )
+              )
+              #createNewApplication: true
+              #createNewBuilder: true
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 20-07-2011 / 14:19:31 / cg"
+!
+
+categoryAndSingleClassOnlySpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#categoryAndSingleClassOnlySpec
+     NavigatorCanvas new openInterface:#categoryAndSingleClassOnlySpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #categoryAndSingleClassOnlySpec
+        #window: 
+       #(#WindowSpec
+          #label: 'Full Class Browser'
+          #name: 'Full Class Browser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 12 22 474 322)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#SubCanvasSpec
+              #name: 'Organizer'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #majorKey: #'OrganizerCanvas'
+              #minorKey: #windowSpecWithoutMetaToggles
+              #subAspectHolders: 
+             #(#Array
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #classCategoryListMenuHolder
+                  #aspect: #categoryPopUpMenu
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #classCategoryDoubleClickChannel
+                  #callBack: #classCategoryDoubleClicked
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #classDoubleClickChannel
+                  #callBack: #classDoubleClicked
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #nameSpaceDoubleClickChannel
+                  #callBack: #nameSpaceDoubleClicked
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #projectDoubleClickChannel
+                  #callBack: #projectDoubleClicked
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #variableDoubleClickChannel
+                  #callBack: #variableDoubleClicked
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #classHierarchyListMenuHolder
+                  #aspect: #hierarchyPopUpMenu
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #classHierarchyTopClass
+                  #aspect: #classHierarchyTopClass
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #classListMenuHolder
+                  #aspect: #classPopUpMenu
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #hidePrivateClasses
+                  #aspect: #hidePrivateClasses
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #hideUnloadedClasses
+                  #aspect: #hideUnloadedClasses
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #showClassPackages
+                  #aspect: #showClassPackages
+                )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+"/                     #(#SubChannelInfoSpec
+"/                        #subAspect: #showMethodComplexity
+"/                        #aspect: #showMethodComplexity
+"/                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #immediateUpdate
+                  #aspect: #immediateUpdate
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #meta
+                  #aspect: #meta
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #nameSpaceListMenuHolder
+                  #aspect: #nameSpacePopUpMenu
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #organizerMode
+                  #aspect: #organizerMode
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #outGeneratorHolder
+                  #aspect: #protocolListGenerator
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #packageFilter
+                  #aspect: #packageFilter
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #projectListMenuHolder
+                  #aspect: #projectPopUpMenu
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectedCategories
+                  #aspect: #selectedCategories
+                  #callBack: #categorySelectionChanged
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectedClasses
+                  #aspect: #selectedClasses
+                  #callBack: #classSelectionChanged
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectedNamespaces
+                  #aspect: #selectedNamespaces
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectedProjects
+                  #aspect: #selectedProjects
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectionChangeCondition
+                  #aspect: #selectionChangeConditionHolder
+                )
+              )
+              #createNewApplication: true
+              #createNewBuilder: true
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 20-07-2011 / 14:19:38 / cg"
+!
+
+fullBrowserSpec
+
+    ^UserPreferences current showEmbeddedTestRunnerInBrowser
+        ifTrue: [self fullBrowserSpecWithEmbeddedTestRunner]
+        ifFalse:[self fullBrowserSpecPlain]
+
+    "Modified: / 11-03-2010 / 10:15:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+fullBrowserSpecPlain
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#fullBrowserSpec
+     NavigatorCanvas new openInterface:#fullBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #fullBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'SystemBrowser'
+          #name: 'SystemBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 18 51 480 351)
+          #icon: #defaultIcon
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#SubCanvasSpec
+                    #name: 'Organizer'
+                    #majorKey: #'OrganizerCanvas'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #classCategoryListMenuHolder
+                        #aspect: #categoryPopUpMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #classCategoryDoubleClickChannel
+                        #callBack: #classCategoryDoubleClicked
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #classDoubleClickChannel
+                        #callBack: #classDoubleClicked
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #nameSpaceDoubleClickChannel
+                        #callBack: #nameSpaceDoubleClicked
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #projectDoubleClickChannel
+                        #callBack: #projectDoubleClicked
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableDoubleClickChannel
+                        #callBack: #variableDoubleClicked
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #classHierarchyListMenuHolder
+                        #aspect: #hierarchyPopUpMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #classHierarchyTopClass
+                        #aspect: #classHierarchyTopClass
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #classListMenuHolder
+                        #aspect: #classPopUpMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #hideUnloadedClasses
+                        #aspect: #hideUnloadedClasses
+                      )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showClassPackages
+                        #aspect: #showClassPackages
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #meta
+                        #aspect: #meta
+                      ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #metaToggleLabelHolder
+                  #aspect: #metaToggleLabelHolder
+                )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #nameSpaceListMenuHolder
+                        #aspect: #nameSpacePopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #organizerMode
+                        #aspect: #organizerMode
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #projectListMenuHolder
+                        #aspect: #projectPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedCategories
+                        #aspect: #selectedCategories
+                        #callBack: #categorySelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedClasses
+                        #aspect: #selectedClasses
+                        #callBack: #classSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedNamespaces
+                        #aspect: #selectedNamespaces
+                        #callBack: #nameSpaceSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProjects
+                        #aspect: #selectedProjects
+                        #callBack: #projectSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #nameSpaceFilter
+                        #aspect: #nameSpaceFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                        #callBack: #variableSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variablesMenuHolder
+                        #aspect: #variablesPopUpMenu
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #sortVariablesByName
+                        #aspect: #sortVariablesByName
+                      )
+
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                        #callBack: #variableSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                        #callBack: #variableSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.5 0.75 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Created: / 11-03-2010 / 08:41:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-07-2011 / 14:20:41 / cg"
+!
+
+fullBrowserSpecWithEmbeddedTestRunner
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#fullBrowserSpec_new
+     Tools::NavigatorCanvas new openInterface:#fullBrowserSpec_new
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(FullSpec
+        name: #'fullBrowserSpec_new'
+        window: 
+       (WindowSpec
+          label: 'SystemBrowser'
+          name: 'SystemBrowser'
+          min: (Point 0 0)
+          bounds: (Rectangle 0 0 462 300)
+          icon: defaultIcon
+        )
+        component: 
+       (SpecCollection
+          collection: (
+           (VariableHorizontalPanelSpec
+              name: 'VariableHorizontalPanel1'
+              layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              barWidth: 2
+              showHandle: false
+              component: 
+             (SpecCollection
+                collection: (
+                 (SubCanvasSpec
+                    name: 'Organizer'
+                    majorKey: OrganizerCanvas
+                    subAspectHolders: 
+                   (Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: classCategoryListMenuHolder
+                        aspect: categoryPopUpMenu
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: classCategoryDoubleClickChannel
+                        callBack: classCategoryDoubleClicked
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: classDoubleClickChannel
+                        callBack: classDoubleClicked
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: nameSpaceDoubleClickChannel
+                        callBack: nameSpaceDoubleClicked
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: projectDoubleClickChannel
+                        callBack: projectDoubleClicked
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: variableDoubleClickChannel
+                        callBack: variableDoubleClicked
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: classHierarchyListMenuHolder
+                        aspect: hierarchyPopUpMenu
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: classHierarchyTopClass
+                        aspect: classHierarchyTopClass
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: classListMenuHolder
+                        aspect: classPopUpMenu
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: hideUnloadedClasses
+                        aspect: hideUnloadedClasses
+                      )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: markApplicationsHolder
+                        aspect: markApplicationsHolder
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: showClassPackages
+                        aspect: showClassPackages
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: immediateUpdate
+                        aspect: immediateUpdate
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: meta
+                        aspect: meta
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: metaToggleLabelHolder
+                        aspect: metaToggleLabelHolder
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: nameSpaceListMenuHolder
+                        aspect: nameSpacePopUpMenu
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: organizerMode
+                        aspect: organizerMode
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: outGeneratorHolder
+                        aspect: protocolListGenerator
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: packageFilter
+                        aspect: packageFilter
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: projectListMenuHolder
+                        aspect: projectPopUpMenu
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: selectedCategories
+                        aspect: selectedCategories
+                        callBack: categorySelectionChanged
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: selectedClasses
+                        aspect: selectedClasses
+                        callBack: classSelectionChanged
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: selectedNamespaces
+                        aspect: selectedNamespaces
+                        callBack: nameSpaceSelectionChanged
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: selectedProjects
+                        aspect: selectedProjects
+                        callBack: projectSelectionChanged
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: selectionChangeCondition
+                        aspect: selectionChangeConditionHolder
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: nameSpaceFilter
+                        aspect: nameSpaceFilter
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: variableFilter
+                        aspect: variableFilter
+                        callBack: variableSelectionChanged
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: filterClassVars
+                        aspect: filterClassVars
+                      )
+                      
+                     (SubChannelInfoSpec
+                        subAspect: variablesMenuHolder
+                        aspect: variablesPopUpMenu
+                      ) 
+                     (SubChannelInfoSpec
+                        subAspect: sortVariablesByName
+                        aspect: sortVariablesByName
+                      )
+                    )
+                    createNewApplication: true
+                    createNewBuilder: true
+                  )
+                 (SubCanvasSpec
+                    name: 'CategoryAndMethodList'
+                    hasHorizontalScrollBar: false
+                    hasVerticalScrollBar: false
+                    majorKey: #'Tools::NavigatorCanvas'
+                    minorKey: protocolAndMethodListSpec
+                    createNewBuilder: false
+                  )
+                 )
+               
+              )
+              handles: (Any 0.5 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Created: / 11-03-2010 / 08:41:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-07-2011 / 14:43:02 / cg"
+!
+
+multipleCategoryBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleCategoryBrowserSpec
+     NavigatorCanvas new openInterface:#multipleCategoryBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #multipleCategoryBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'CategoryBrowser'
+          #name: 'CategoryBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 18 51 480 351)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableVerticalPanelSpec
+              #name: 'VariableVerticalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#VariableHorizontalPanelSpec
+                    #name: 'VariableHorizontalPanel1'
+                    #barWidth: 2
+                    #showHandle: false
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#SubCanvasSpec
+                          #name: 'CategoryList'
+                          #majorKey: #'ClassCategoryList'
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #showClassPackages
+                              #aspect: #showClassPackages
+                            )
+                          #(#SubChannelInfoSpec
+                             #subAspect: #doubleClickChannel
+                             #callBack: #classCategoryDoubleClicked
+                           )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #categoryListGenerator
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #categoryPopUpMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #classListGenerator
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedCategories
+                              #aspect: #selectedCategories
+                              #callBack: #categorySelectionChanged
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectionChangeCondition
+                              #aspect: #selectionChangeConditionHolder
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       #(#ViewSpec
+                          #name: 'Box1'
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#VariableVerticalPanelSpec
+                                #name: 'VariableVerticalPanel2'
+                                #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
+                                #showHandle: false
+                                #handlePosition: #left
+                                #snapMode: #both
+                                #component: 
+                               #(#SpecCollection
+                                  #collection: #(
+                                   #(#SubCanvasSpec
+                                      #name: 'ClassList'
+                                      #majorKey: #'ClassList'
+                                      #subAspectHolders: 
+                                     #(#Array
+                                        
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #doubleClickChannel
+                                          #callBack: #classDoubleClicked
+                                        ) 
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #hideUnloadedClasses
+                                          #aspect: #hideUnloadedClasses
+                                        )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                        
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #immediateUpdate
+                                          #aspect: #immediateUpdate
+                                        ) 
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #inGeneratorHolder
+                                          #aspect: #classListGenerator
+                                        )
+                                        
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #menuHolder
+                                          #aspect: #classPopUpMenu
+                                        ) 
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #meta
+                                          #aspect: #meta
+                                        )
+                                        
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #organizerMode
+                                          #aspect: #organizerMode
+                                        ) 
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #outGeneratorHolder
+                                          #aspect: #protocolListGenerator
+                                        )
+                                        
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #packageFilter
+                                          #aspect: #packageFilter
+                                        ) 
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #selectedClasses
+                                          #aspect: #selectedClasses
+                                          #callBack: #classSelectionChanged
+                                        )
+                                        
+                                       #(#SubChannelInfoSpec
+                                          #subAspect: #selectionChangeCondition
+                                          #aspect: #selectionChangeConditionHolder
+                                        )
+                                      )
+                                      #createNewApplication: true
+                                      #createNewBuilder: true
+                                    )
+                                   #(#SubCanvasSpec
+                                      #name: 'VariableList'
+                                      #majorKey: #'VariableList'
+                                      #subAspectHolders: 
+                                       #(#Array
+
+                                         #(#SubChannelInfoSpec
+                                            #subAspect: #classHolder
+                                            #aspect: #selectedClasses
+                                          ) 
+                                         #(#SubChannelInfoSpec
+                                            #subAspect: #doubleClickChannel
+                                            #callBack: #variableDoubleClicked
+                                          )
+                                         #(#SubChannelInfoSpec
+                                            #subAspect: #menuHolder
+                                            #aspect: #variablesPopUpMenu
+                                          )
+
+                                         #(#SubChannelInfoSpec
+                                            #subAspect: #selectedVariables
+                                            #aspect: #variableFilter
+                                          )
+                                         #(#SubChannelInfoSpec
+                                            #subAspect: #showClassVarsInVariableList
+                                            #aspect: #filterClassVars
+                                          )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                        )
+                                      #createNewApplication: true
+                                      #createNewBuilder: true
+                                    )
+                                   )
+                                 
+                                )
+                                #handles: #(#Any 0.5 1.0)
+                              )
+                             #(#UISubSpecification
+                                #name: 'MetaToggles'
+                                #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                                #majorKey: #'NavigatorModel'
+                                #minorKey: #metaSpec
+                              )
+                             )
+                           
+                          )
+                        )
+                       #(#SubCanvasSpec
+                          #name: 'MethodCategoryList'
+                          #majorKey: #'MethodCategoryList'
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #protocolListGenerator
+                            )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #doubleClickChannel
+                              #callBack: #protocolDoubleClicked
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #protocolMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #selectorListGenerator
+                            )
+                            
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #packageFilter
+                              #aspect: #packageFilter
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedProtocols
+                              #aspect: #selectedProtocols
+                              #callBack: #protocolSelectionChanged
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectionChangeCondition
+                              #aspect: #selectionChangeConditionHolder
+                            )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #variableFilter
+                              #aspect: #variableFilter
+                            )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #filterClassVars
+                              #aspect: #filterClassVars
+                            )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       #(#SubCanvasSpec
+                          #name: 'MethodList'
+                          #majorKey: #'MethodList'
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #doubleClickChannel
+                              #callBack: #methodDoubleClicked
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #selectorListGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #selectorPopUpMenu
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #packageFilter
+                              #aspect: #packageFilter
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #variableFilter
+                              #aspect: #variableFilter
+                            )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #filterClassVars
+                              #aspect: #filterClassVars
+                            )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedMethods
+                              #aspect: #selectedMethods
+                              #callBack: #methodsSelectionChanged
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectionChangeCondition
+                              #aspect: #selectionChangeConditionHolder
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       )
+                     
+                    )
+                    #handles: #(#Any 0.25 0.5 0.75 1.0)
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:35:49 / cg"
+!
+
+multipleClassBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleClassBrowserSpec
+     NavigatorCanvas new openInterface:#multipleClassBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #multipleClassBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ClassBrowser'
+          #name: 'ClassBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 18 51 480 351)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel1'
+                          #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'ClassList'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassPackages
+                                    #aspect: #showClassPackages
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #classPopUpMenu
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortBy
+                                    #aspect: #sortBy
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #aspect: #packageFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #showHandle: false
+                          #handlePosition: #left
+                          #snapMode: #both
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.333333 0.666667 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:36:29 / cg"
+!
+
+multipleClassDiffBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleClassDiffBrowserSpec
+     NavigatorCanvas new openInterface:#multipleClassDiffBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #multipleClassDiffBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ClassBrowser'
+          #name: 'ClassBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 12 22 474 322)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#SubCanvasSpec
+              #name: 'ClassList'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -30 1.0)
+              #majorKey: #'ClassList'
+              #subAspectHolders: 
+             #(#Array
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #doubleClickChannel
+                  #callBack: #classDoubleClicked
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #hideUnloadedClasses
+                  #aspect: #hideUnloadedClasses
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #showClassPackages
+                  #aspect: #showClassPackages
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #immediateUpdate
+                  #aspect: #immediateUpdate
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #inGeneratorHolder
+                  #aspect: #classListGenerator
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #menuHolder
+                  #aspect: #classPopUpMenu
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortBy
+                  #aspect: #sortBy
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #meta
+                  #aspect: #meta
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #organizerMode
+                  #aspect: #organizerMode
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #outGeneratorHolder
+                  #aspect: #protocolListGenerator
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #packageFilter
+                  #aspect: #packageFilter
+                ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectedClasses
+                  #aspect: #selectedClasses
+                  #callBack: #classSelectionChanged
+                )
+                
+               #(#SubChannelInfoSpec
+                  #subAspect: #selectionChangeCondition
+                  #aspect: #selectionChangeConditionHolder
+                )
+              )
+              #createNewApplication: true
+              #createNewBuilder: true
+            )
+           #(#LabelSpec
+              #label: 'projectInfo'
+              #name: 'Label1'
+              #layout: #(#LayoutFrame 0 0 -30 1 0 1 0 1)
+              #level: -1
+              #labelChannel: #classesProjectInfoHolder
+              #adjust: #left
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:36:38 / cg"
+!
+
+multipleClassExtensionBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleClassExtensionBrowserSpec
+     NavigatorCanvas new openInterface:#multipleClassExtensionBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #multipleClassExtensionBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ClassBrowser'
+          #name: 'ClassBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 16 46 478 346)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel1'
+                          #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'ClassList'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassPackages
+                                    #aspect: #showClassPackages
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #classPopUpMenu
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortBy
+                                    #aspect: #sortBy
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'ProjectList'
+                                #majorKey: #'ProjectList'
+                                #subAspectHolders: 
+                               #(#Array
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #projectListGenerator
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedProjects
+                                    #aspect: #selectedProjects
+                                    #callBack: #projectSelectionChangedForFilter
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #projectPopUpMenu
+                                  ) 
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars 
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          "/ #handles: #(#Any 0.333333 0.666667 1.0)
+                          #handles: #(#Any 0.7 1.0 1.0)
+                        )
+                       #(#UISubSpecification                 
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                        #callBack: #variableSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilterOnInput
+                        #aspect: #packageFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                        #callBack: #variableSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.333333 0.666667 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:36:44 / cg"
+!
+
+multipleFullProtocolBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleFullProtocolBrowserSpec
+     NavigatorCanvas new openInterface:#multipleFullProtocolBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #multipleFullProtocolBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ProtocolBrowser'
+          #name: 'ProtocolBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 12 22 474 322)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #noAllItem
+                        #aspect: #noAllItem
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #sortBy
+                        #aspect: #sortBy
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.5 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 20-07-2011 / 14:39:15 / cg"
+!
+
+multipleNameSpaceBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleNameSpaceBrowserSpec
+     NavigatorCanvas new openInterface:#multipleNameSpaceBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #multipleNameSpaceBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'NameSpaceBrowser'
+          #name: 'NameSpaceBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 18 51 480 351)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#SubCanvasSpec
+                    #name: 'NameSpaceList'
+                    #majorKey: #'NameSpaceList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #nameSpacePopUpMenu
+                            ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #hideUnloadedClasses
+                        #aspect: #hideUnloadedClasses
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showClassPackages
+                        #aspect: #showClassPackages
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #nameSpaceDoubleClicked
+                      ) 
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #nameSpaceListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #classListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedNamespaces
+                        #aspect: #selectedNamespaces
+                        #callBack: #nameSpaceSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel1'
+                          #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
+                          #showHandle: false
+                          #handlePosition: #left
+                          #snapMode: #both
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'ClassList'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #aspect: #packageFilter
+                                  )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #nameSpaceFilter
+                              #aspect: #selectedNamespaces
+                            ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  )
+
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.25 0.5 0.75 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:36:54 / cg"
+!
+
+multipleNameSpaceFullBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleNameSpaceFullBrowserSpec
+     NavigatorCanvas new openInterface:#multipleNameSpaceFullBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #multipleNameSpaceFullBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'NameSpaceBrowser'
+          #name: 'NameSpaceBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 127 62 589 362)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#VariableVerticalPanelSpec
+                    #name: 'VariableVerticalPanel2'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#SubCanvasSpec
+                          #name: 'NameSpaceList'
+                          #majorKey: #'NamespaceList'
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #nameSpacePopUpMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #showClassPackages
+                              #aspect: #showClassPackages
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #doubleClickChannel
+                              #callBack: #nameSpaceDoubleClicked
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #nameSpaceListGenerator
+                            ) 
+"/                           #(#SubChannelInfoSpec
+"/                              #subAspect: #outGeneratorHolder
+"/                              #aspect: #classListGenerator
+"/                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedNamespaces
+                              #aspect: #selectedNamespaces
+                              #callBack: #nameSpaceSelectionChanged
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectionChangeCondition
+                              #aspect: #selectionChangeConditionHolder
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       #(#SubCanvasSpec
+                          #name: 'ClassCategoryList'
+                          #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+                          #majorKey: #'ClassCategoryList'
+                          #subAspectHolders: 
+                         #(#Array
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #nameSpaceFilter
+                              #aspect: #selectedNamespaces
+                            ) 
+                          #(#SubChannelInfoSpec
+                             #subAspect: #doubleClickChannel
+                             #callBack: #classCategoryDoubleClicked
+                           )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #forceGeneratorTrigger
+                              #aspect: #forceClassCategoryGeneratorTrigger
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #categoryPopUpMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #organizerMode
+                              #aspect: #organizerMode
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #classListGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedCategories
+                              #aspect: #selectedCategories
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectionChangeCondition
+                              #aspect: #selectionChangeCondition
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #slaveMode
+                              #aspect: #categoryListSlaveMode
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #updateTrigger
+                              #aspect: #classCategoryListUpdateTrigger
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       )
+                     
+                    )
+                    #handles: #(#Any 0.5 1.0)
+                  )
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel1'
+                          #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
+                          #showHandle: false
+                          #handlePosition: #left
+                          #snapMode: #both
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'ClassList'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #classPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #nameSpaceFilter
+                                    #aspect: #selectedNamespaces
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #aspect: #packageFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.25 0.5 0.75 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:37:01 / cg"
+!
+
+multipleProjectBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleProjectBrowserSpec
+     NavigatorCanvas new openInterface:#multipleProjectBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #multipleProjectBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ProjectBrowser'
+          #name: 'ProjectBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 18 51 480 351)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#SubCanvasSpec
+                    #name: 'ProjectList'
+                    #majorKey: #'ProjectList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #projectPopUpMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #hideUnloadedClasses
+                        #aspect: #hideUnloadedClasses
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #projectDoubleClicked
+                      ) 
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showClassPackages
+                        #aspect: #showClassPackages
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #projectListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #classListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProjects
+                        #aspect: #selectedProjects
+                        #callBack: #projectSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel1'
+                          #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
+                          #showHandle: false
+                          #handlePosition: #left
+                          #snapMode: #both
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'ClassList'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #aspect: #packageFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  )
+
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                        #callBack: #variableSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                        #callBack: #variableSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.25 0.5 0.75 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:37:12 / cg"
+!
+
+multipleProjectFullBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleProjectFullBrowserSpec
+     NavigatorCanvas new openInterface:#multipleProjectFullBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #multipleProjectFullBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ProjectBrowser'
+          #name: 'ProjectBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 23 111 485 411)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#VariableVerticalPanelSpec
+                    #name: 'VariableVerticalPanel2'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#SubCanvasSpec
+                          #name: 'ProjectList'
+                          #majorKey: #'ProjectList'
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #projectPopUpMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #doubleClickChannel
+                              #callBack: #projectDoubleClicked
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #showClassPackages
+                              #aspect: #showClassPackages
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #projectListGenerator
+                            )
+                            
+"/                           #(#SubChannelInfoSpec
+"/                              #subAspect: #outGeneratorHolder
+"/                              #aspect: #classListGenerator
+"/                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedProjects
+                              #aspect: #selectedProjects
+                              #callBack: #projectSelectionChanged
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectionChangeCondition
+                              #aspect: #selectionChangeConditionHolder
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                        #(#SubCanvasSpec
+                          #name: 'ClassCategoryList'
+                          #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+                          #majorKey: #'ClassCategoryList'
+                          #subAspectHolders: 
+                         #(#Array
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #packageFilter
+                              #aspect: #selectedProjects
+                            ) 
+                          #(#SubChannelInfoSpec
+                             #subAspect: #doubleClickChannel
+                             #callBack: #classCategoryDoubleClicked
+                           )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #forceGeneratorTrigger
+                              #aspect: #forceClassCategoryGeneratorTrigger
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #categoryPopUpMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #organizerMode
+                              #aspect: #organizerMode
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #classListGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedCategories
+                              #aspect: #selectedCategories
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectionChangeCondition
+                              #aspect: #selectionChangeCondition
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #slaveMode
+                              #aspect: #categoryListSlaveMode
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #updateTrigger
+                              #aspect: #classCategoryListUpdateTrigger
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       )
+                     
+                    )
+                    #handles: #(#Any 0.5 1.0)
+                  )
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel1'
+                          #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
+                          #showHandle: false
+                          #handlePosition: #left
+                          #snapMode: #both
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'ClassList'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #classPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #aspect: #selectedProjects
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                        #callBack: #variableSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                        #callBack: #variableSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.25 0.5 0.75 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:37:24 / cg"
+!
+
+multipleProtocolBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleProtocolBrowserSpec
+     NavigatorCanvas new openInterface:#multipleProtocolBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #multipleProtocolBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ProtocolBrowser'
+          #name: 'ProtocolBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 12 22 474 322)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #noAllItem
+                        #aspect: #noAllItem
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #sortBy
+                        #aspect: #sortBy
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.5 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 27-04-2010 / 16:43:01 / cg"
+!
+
+protocolAndMethodListSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#protocolAndMethodListSpec
+     Tools::NavigatorCanvas new openInterface:#protocolAndMethodListSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(FullSpec
+        name: protocolAndMethodListSpec
+        window: 
+       (WindowSpec
+          label: 'Protocol and Method List'
+          name: 'Protocol and Method List'
+          min: (Point 0 0)
+          bounds: (Rectangle 0 0 498 456)
+          icon: defaultIcon
+        )
+        component: 
+       (SpecCollection
+          collection: (
+           (SubCanvasSpec
+              name: 'ProtocolAndMethodListCanvas'
+              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+              hasHorizontalScrollBar: false
+              hasVerticalScrollBar: false
+              majorKey: #'Tools::NavigatorCanvas'
+              minorKey: #'protocolAndMethodListSpec_Both'
+              specHolder: organizerProtocolAndMethodListSpecHolder
+              createNewBuilder: false
+            )
+           (SubCanvasSpec
+              name: 'TestRunnerEmbedded'
+              layout: (LayoutFrame 0 0 -50 1 0 1 0 1)
+              initiallyInvisible: true
+              hasHorizontalScrollBar: false
+              hasVerticalScrollBar: false
+              majorKey: #'Tools::TestRunnerEmbedded'
+              subAspectHolders: 
+             (Array
+                
+               (SubChannelInfoSpec
+                  subAspect: methodGeneratorHolder
+                  aspect: selectorListGenerator
+                ) 
+               (SubChannelInfoSpec
+                  subAspect: selectedClassesHolder
+                  aspect: selectedClasses
+                )
+                
+               (SubChannelInfoSpec
+                  subAspect: selectedMethodsHolder
+                  aspect: selectedMethods
+                ) 
+               (SubChannelInfoSpec
+                  subAspect: selectedProtocolsHolder
+                  aspect: selectedProtocols
+                )
+                
+               (SubChannelInfoSpec
+                  subAspect: infoHolder
+                  aspect: infoLabelHolder
+                )
+              )
+              createNewApplication: true
+              createNewBuilder: true
+            )
+           )
+         
+        )
+      )
+!
+
+selectorBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#selectorBrowserSpec
+     NavigatorCanvas new openInterface:#selectorBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #selectorBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'SelectorBrowser'
+          #name: 'SelectorBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 12 22 474 322)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#SubCanvasSpec
+                    #name: 'AllMethodCategoryList'
+                    #majorKey: #'FullMethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'ImplementedMethodList'
+                    #majorKey: #'ImplementingMethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #xxxDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #implementingClassListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'ImplementingClassList'
+                    #majorKey: #'ImplementingClassList'
+                    #minorKey: #windowSpec
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #implementingClassListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.333333 0.666667 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 27-04-2010 / 16:43:16 / cg"
+!
+
+singleCategoryBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleCategoryBrowserSpec
+     NavigatorCanvas new openInterface:#singleCategoryBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #singleCategoryBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'CategoryBrowser'
+          #name: 'CategoryBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 18 51 480 351)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#SubCanvasSpec
+                          #name: 'PseudoCategoryList'
+                          #layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 25 0)
+                          #majorKey: #'ClassCategoryList'
+                          #minorKey: #singleCategoryWindowSpec
+                          #subAspectHolders: 
+                         #(#Array
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #categoryPopUpMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #showClassPackages
+                              #aspect: #showClassPackages
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #categoryListGenerator
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #classListGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedCategories
+                              #aspect: #selectedCategories
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel1'
+                          #layout: #(#LayoutFrame 0 0.0 25 0.0 0 1.0 -25 1.0)
+                          #showHandle: false
+                          #handlePosition: #left
+                          #snapMode: #both
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'ClassList'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #classPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #aspect: #packageFilter
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesMenuHolder
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders:                          
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.333333 0.666667 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:37:34 / cg"
+!
+
+singleClassBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleClassBrowserSpec
+     NavigatorCanvas new openInterface:#singleClassBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #singleClassBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ClassBrowser'
+          #name: 'ClassBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 16 46 478 346)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#SubCanvasSpec
+                          #name: 'PseudoClassList'
+                          #layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 25 0)
+                          #majorKey: #'ClassList'
+                          #minorKey: #singleClassWindowSpec
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            ) 
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #showClassPackages
+                              #aspect: #showClassPackages
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #classListGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #meta
+                              #aspect: #meta
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #protocolListGenerator
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedClasses
+                              #aspect: #selectedClasses
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #classPopUpMenu
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel1'
+                          #layout: #(#LayoutFrame 0 0.0 25 0.0 0 1.0 -25 1.0)
+                          #showHandle: false
+                          #snapMode: #both
+                          #handlePosition: #left
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'MethodCategoryList'
+                                #majorKey: #'MethodCategoryList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #protocolDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #protocolMenu
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #selectorListGenerator
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #variableFilter
+                                    #aspect: #variableFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #filterClassVars
+                                    #aspect: #filterClassVars
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #aspect: #packageFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedProtocols
+                                    #aspect: #selectedProtocols
+                                    #callBack: #protocolSelectionChanged
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.5 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:37:41 / cg"
+!
+
+singleFullProtocolBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleFullProtocolBrowserSpec
+     NavigatorCanvas new openInterface:#singleFullProtocolBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #singleFullProtocolBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ProtocolBrowser'
+          #name: 'ProtocolBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 12 22 474 322)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#ViewSpec
+              #name: 'Box1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#SubCanvasSpec
+                    #name: 'PseudoProtocolList'
+                    #layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 25 0)
+                    #majorKey: #'MethodCategoryList'
+                    #minorKey: #singleProtocolWindowSpec
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                      #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                    #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #layout: #(#LayoutFrame 0 0.0 25 0.0 0 1.0 0 1.0)
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #sortBy
+                        #aspect: #sortBy
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 20-07-2011 / 14:40:48 / cg"
+!
+
+singleNameSpaceBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleNameSpaceBrowserSpec
+     NavigatorCanvas new openInterface:#singleNameSpaceBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #singleNameSpaceBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'NameSpaceBrowser'
+          #name: 'NameSpaceBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 18 51 480 351)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#SubCanvasSpec
+                          #name: 'PseudoNameSpaceList'
+                          #layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 25 0)
+                          #majorKey: #'NamespaceList'
+                          #minorKey: #singleNameSpaceWindowSpec
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #showClassPackages
+                              #aspect: #showClassPackages
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #nameSpaceListGenerator
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #classListGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedNamespaces
+                              #aspect: #selectedNamespaces
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel1'
+                          #layout: #(#LayoutFrame 0 0.0 25 0.0 0 1.0 -25 1.0)
+                          #showHandle: false
+                          #handlePosition: #left
+                          #snapMode: #both
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'ClassList'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #classPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #callBack: #packageFilter
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  )
+
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.333333 0.666667 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:37:52 / cg"
+!
+
+singleNameSpaceFullBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleNameSpaceFullBrowserSpec
+     NavigatorCanvas new openInterface:#singleNameSpaceFullBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #singleNameSpaceFullBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'NameSpaceBrowser'
+          #name: 'NameSpaceBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 102 220 564 520)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#SubCanvasSpec
+                          #name: 'PseudoNameSpaceList'
+                          #layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 25 0)
+                          #majorKey: #'NamespaceList'
+                          #minorKey: #singleNameSpaceWindowSpec
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #showClassPackages
+                              #aspect: #showClassPackages
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #nameSpaceListGenerator
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #classListPerNameSpaceGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedNamespaces
+                              #aspect: #selectedNamespaces
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       #(#SubCanvasSpec
+                          #name: 'ClassCategoryList'
+                          #layout: #(#LayoutFrame 0 0.0 25 0.0 0 1.0 0 1.0)
+                          #majorKey: #'ClassCategoryList'
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                          #(#SubChannelInfoSpec
+                             #subAspect: #doubleClickChannel
+                             #callBack: #classCategoryDoubleClicked
+                           )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #forceGeneratorTrigger
+                              #aspect: #forceClassCategoryGeneratorTrigger
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #nameSpaceFilter
+                              #aspect: #selectedNamespaces
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #categoryPopUpMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #organizerMode
+                              #aspect: #organizerMode
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #classListGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedCategories
+                              #aspect: #selectedCategories
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectionChangeCondition
+                              #aspect: #selectionChangeCondition
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #slaveMode
+                              #aspect: #categoryListSlaveMode
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #updateTrigger
+                              #aspect: #classCategoryListUpdateTrigger
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#ViewSpec
+                    #name: 'Box2'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel2'
+                          #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
+                          #showHandle: false
+                          #handlePosition: #left
+                          #snapMode: #both
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'ClassList'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                               #(#SubChannelInfoSpec
+                                  #subAspect: #nameSpaceFilter
+                                  #aspect: #selectedNamespaces
+                                ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #classPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #callBack: #packageFilter
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.25 0.5 0.75 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:37:57 / cg"
+!
+
+singleProjectBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleProjectBrowserSpec
+     NavigatorCanvas new openInterface:#singleProjectBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #singleProjectBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ProjectBrowser'
+          #name: 'ProjectBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 18 51 480 351)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#SubCanvasSpec
+                          #name: 'PseudoProjectList'
+                          #layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 25 0)
+                          #majorKey: #'ProjectList'
+                          #minorKey: #singleProjectWindowSpec
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #projectPopUpMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #showClassPackages
+                              #aspect: #showClassPackages
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #projectListGenerator
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #classListGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedProjects
+                              #aspect: #selectedProjects
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel1'
+                          #layout: #(#LayoutFrame 0 0.0 25 0.0 0 1.0 -25 1.0)
+                          #showHandle: false
+                          #handlePosition: #left
+                          #snapMode: #both
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'ClassList'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #classPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #aspect: #packageFilter
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'VariableList'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  )
+
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'MetaToggles'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.333333 0.666667 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:38:02 / cg"
+!
+
+singleProjectFullBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleProjectFullBrowserSpec
+     NavigatorCanvas new openInterface:#singleProjectFullBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #singleProjectFullBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ProjectBrowser'
+          #name: 'ProjectBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 30 74 492 374)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#VariableHorizontalPanelSpec
+              #name: 'VariableHorizontalPanel1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #barWidth: 2
+              #showHandle: false
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#ViewSpec
+                    #name: 'Box1'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#SubCanvasSpec
+                          #name: 'PseudoProjectList'
+                          #layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 25 0)
+                          #majorKey: #'ProjectList'
+                          #minorKey: #singleProjectWindowSpec
+                          #subAspectHolders: 
+                         #(#Array
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #projectPopUpMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #showClassPackages
+                              #aspect: #showClassPackages
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #inGeneratorHolder
+                              #aspect: #projectListGenerator
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #classListGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedProjects
+                              #aspect: #selectedProjects
+                            )
+                            
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                        #(#SubCanvasSpec
+                          #name: 'ClassCategoryList'
+                          #layout: #(#LayoutFrame 0 0.0 25 0.0 0 1.0 0 1.0)
+                          #majorKey: #'ClassCategoryList'
+                          #subAspectHolders: 
+                         #(#Array
+
+                          #(#SubChannelInfoSpec
+                             #subAspect: #doubleClickChannel
+                             #callBack: #classCategoryDoubleClicked
+                           )
+                           #(#SubChannelInfoSpec
+                              #subAspect: #forceGeneratorTrigger
+                              #aspect: #forceClassCategoryGeneratorTrigger
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #packageFilter
+                              #aspect: #selectedProjects
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #hideUnloadedClasses
+                              #aspect: #hideUnloadedClasses
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #immediateUpdate
+                              #aspect: #immediateUpdate
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #menuHolder
+                              #aspect: #categoryPopUpMenu
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #organizerMode
+                              #aspect: #organizerMode
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #outGeneratorHolder
+                              #aspect: #classListGenerator
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectedCategories
+                              #aspect: #selectedCategories
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #selectionChangeCondition
+                              #aspect: #selectionChangeCondition
+                            ) 
+                           #(#SubChannelInfoSpec
+                              #subAspect: #slaveMode
+                              #aspect: #categoryListSlaveMode
+                            )
+
+                           #(#SubChannelInfoSpec
+                              #subAspect: #updateTrigger
+                              #aspect: #classCategoryListUpdateTrigger
+                            )
+                          )
+                          #createNewApplication: true
+                          #createNewBuilder: true
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#ViewSpec
+                    #name: 'Box2'
+                    #component: 
+                   #(#SpecCollection
+                      #collection: #(
+                       #(#VariableVerticalPanelSpec
+                          #name: 'VariableVerticalPanel2'
+                          #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
+                          #showHandle: false
+                          #handlePosition: #left
+                          #snapMode: #both
+                          #component: 
+                         #(#SpecCollection
+                            #collection: #(
+                             #(#SubCanvasSpec
+                                #name: 'SubCanvas2'
+                                #majorKey: #'ClassList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #classDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #hideUnloadedClasses
+                                    #aspect: #hideUnloadedClasses
+                                  )
+               #(#SubChannelInfoSpec
+                  #subAspect: #sortByNameAndInheritance
+                  #aspect: #sortByNameAndInheritance
+                )
+               #(#SubChannelInfoSpec
+                  #subAspect: #markApplicationsHolder
+                  #aspect: #markApplicationsHolder
+                ) 
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #immediateUpdate
+                                    #aspect: #immediateUpdate
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #inGeneratorHolder
+                                    #aspect: #classListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #classPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #meta
+                                    #aspect: #meta
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #organizerMode
+                                    #aspect: #organizerMode
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #outGeneratorHolder
+                                    #aspect: #protocolListGenerator
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #packageFilter
+                                    #aspect: #selectedProjects
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedClasses
+                                    #aspect: #selectedClasses
+                                    #callBack: #classSelectionChanged
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectionChangeCondition
+                                    #aspect: #selectionChangeConditionHolder
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             #(#SubCanvasSpec
+                                #name: 'SubCanvas3'
+                                #majorKey: #'VariableList'
+                                #subAspectHolders: 
+                               #(#Array
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #doubleClickChannel
+                                    #callBack: #variableDoubleClicked
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #classHolder
+                                    #aspect: #selectedClasses
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #menuHolder
+                                    #aspect: #variablesPopUpMenu
+                                  ) 
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #selectedVariables
+                                    #aspect: #variableFilter
+                                  )
+                                  
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #showClassVarsInVariableList
+                                    #aspect: #filterClassVars
+                                  )
+                                 #(#SubChannelInfoSpec
+                                    #subAspect: #sortVariablesByName
+                                    #aspect: #sortVariablesByName
+                                  )
+                                )
+                                #createNewApplication: true
+                                #createNewBuilder: true
+                              )
+                             )
+                           
+                          )
+                          #handles: #(#Any 0.5 1.0)
+                        )
+                       #(#UISubSpecification
+                          #name: 'SubSpecification1'
+                          #layout: #(#LayoutFrame 0 0 -25 1 0 1 0 1)
+                          #majorKey: #'NavigatorModel'
+                          #minorKey: #metaSpec
+                        )
+                       )
+                     
+                    )
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodCategoryList'
+                    #majorKey: #'MethodCategoryList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showPseudoProtocols
+                        #aspect: #showPseudoProtocols
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #protocolDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #methodVisibilityHolder
+                        #aspect: #methodVisibilityHolder
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                        #callBack: #protocolSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #variableFilter
+                        #aspect: #variableFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #filterClassVars
+                        #aspect: #filterClassVars
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodInheritance
+                        #aspect: #showMethodInheritance
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodComplexity
+                        #aspect: #showMethodComplexity
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showMethodTypeIcon
+                        #aspect: #showMethodTypeIcon
+                      )
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+              #handles: #(#Any 0.25 0.5 0.75 1.0)
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 04-07-2011 / 18:38:13 / cg"
+!
+
+singleProtocolBrowserSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleProtocolBrowserSpec
+     NavigatorCanvas new openInterface:#singleProtocolBrowserSpec
+    "
+
+    <resource: #canvas>
+
+    ^ 
+     #(#FullSpec
+        #name: #singleProtocolBrowserSpec
+        #window: 
+       #(#WindowSpec
+          #label: 'ProtocolBrowser'
+          #name: 'ProtocolBrowser'
+          #min: #(#Point 0 0)
+          #bounds: #(#Rectangle 12 22 474 322)
+        )
+        #component: 
+       #(#SpecCollection
+          #collection: #(
+           #(#ViewSpec
+              #name: 'Box1'
+              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              #component: 
+             #(#SpecCollection
+                #collection: #(
+                 #(#SubCanvasSpec
+                    #name: 'PseudoProtocolList'
+                    #layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 25 0)
+                    #majorKey: #'MethodCategoryList'
+                    #minorKey: #singleProtocolWindowSpec
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #protocolListGenerator
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #outGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedProtocols
+                        #aspect: #selectedProtocols
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #protocolMenu
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 #(#SubCanvasSpec
+                    #name: 'MethodList'
+                    #layout: #(#LayoutFrame 0 0.0 25 0.0 0 1.0 0 1.0)
+                    #majorKey: #'MethodList'
+                    #subAspectHolders: 
+                   #(#Array
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #showCoverageInformation
+                        #aspect: #showCoverageInformation
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #doubleClickChannel
+                        #callBack: #methodDoubleClicked
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #immediateUpdate
+                        #aspect: #immediateUpdate
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #inGeneratorHolder
+                        #aspect: #selectorListGenerator
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #menuHolder
+                        #aspect: #selectorPopUpMenu
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #packageFilter
+                        #aspect: #packageFilter
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #sortBy
+                        #aspect: #sortBy
+                      )
+                      
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectedMethods
+                        #aspect: #selectedMethods
+                        #callBack: #methodsSelectionChanged
+                      ) 
+                     #(#SubChannelInfoSpec
+                        #subAspect: #selectionChangeCondition
+                        #aspect: #selectionChangeConditionHolder
+                      )
+                    )
+                    #createNewApplication: true
+                    #createNewBuilder: true
+                  )
+                 )
+               
+              )
+            )
+           )
+         
+        )
+      )
+
+    "Modified: / 27-04-2010 / 16:44:12 / cg"
+!
+
+windowSpec
+    ^ self fullBrowserSpec
+! !
+
+!NavigatorCanvas class methodsFor:'misc'!
+
+classResources
+    ^ NewSystemBrowser classResources
+! !
+
+!NavigatorCanvas methodsFor:'accessing'!
+
+initialOrganizerMode
+    ^ nil  "/ dummy
+! !
+
+!NavigatorCanvas methodsFor:'actions'!
+
+classDoubleClicked
+    self subclassResponsibility
+! !
+
+!NavigatorCanvas methodsFor:'queries'!
+
+showAllClassesInNameSpaceOrganisation
+    ^ true
+! !
+
+!NavigatorCanvas class methodsFor:'documentation'!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigatorCanvas.st,v 1.18 2013-06-28 08:34:42 cg Exp $'
+! !
+
--- a/Tools__ChangeSetBrowser2.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__ChangeSetBrowser2.st	Mon Jul 01 22:15:23 2013 +0100
@@ -2431,7 +2431,9 @@
 
     "Created: / 07-09-2011 / 15:54:03 / cg"
     "Created: / 11-02-2012 / 22:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
+!
+
+ !
 
 !ChangeSetBrowser2 methodsFor:'aspects-queries'!
 
@@ -3032,27 +3034,27 @@
     "/ changes := changeList listHolder value collect:[:c | c change].
 
     (changes conform:[:c | c isClassDefinitionChange]) ifTrue:[
-	classes := (changes collect:[:c | c changeClass]).
-	UserPreferences current systemBrowserClass
-	    browseClasses:classes title:'selected monticello classes'.
+        classes := (changes collect:[:c | c changeClass]).
+        UserPreferences systemBrowserClass 
+            browseClasses:classes title:'selected monticello classes'.
     ] ifFalse:[
-	methods := OrderedCollection new.
-	changes do:[:each |
-	    each isCompositeChange ifTrue:[
-		each changes do:[:each2 | each2 isMethodChange ifTrue:[ methods add:each2 changeMethod ]]
-	    ] ifFalse:[
-		each isMethodChange ifTrue:[
-		    methods add:(each changeMethod).
-		]
-	    ]
-	].
-	(methods includes:nil) ifTrue:[
-	    Dialog warn:('%1 methods are not present in the image' bindWith:(methods occurrencesOf:nil)).
-	    methods := methods reject:[:m | m isNil].
-	    methods isEmpty ifTrue:[^ self].
-	].
-	UserPreferences current systemBrowserClass
-	    browseMethods:methods title:'selected monticello methods' sort:false.
+        methods := OrderedCollection new.
+        changes do:[:each |
+            each isCompositeChange ifTrue:[
+                each changes do:[:each2 | each2 isMethodChange ifTrue:[ methods add:each2 changeMethod ]]
+            ] ifFalse:[
+                each isMethodChange ifTrue:[
+                    methods add:(each changeMethod).
+                ]
+            ]
+        ].
+        (methods includes:nil) ifTrue:[
+            Dialog warn:('%1 methods are not present in the image' bindWith:(methods occurrencesOf:nil)).
+            methods := methods reject:[:m | m isNil].
+            methods isEmpty ifTrue:[^ self].
+        ].
+        UserPreferences systemBrowserClass 
+            browseMethods:methods title:'selected monticello methods' sort:false.
     ].
 
     "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3065,27 +3067,27 @@
     changes := self selectedChangesIn: changeList.
 
     classes := Set new.
-    addThemChanges :=
-	[:c |
-	    c isClassDefinitionChange ifTrue:[
-		classes add:c changeClass theNonMetaclass
-	    ] ifFalse:[
-		c isMethodChange ifTrue:[
-		    cls := c changeMethod isNil
-				ifTrue:[ c changeClass ]
-				ifFalse:[ c changeMethod mclass theNonMetaclass ].
-		    classes add:cls
-		] ifFalse:[
-		    c isCompositeChange ifTrue:[
-			c changes do:addThemChanges
-		    ]
-		]
-	    ]
-	].
+    addThemChanges := 
+        [:c |
+            c isClassDefinitionChange ifTrue:[
+                classes add:c changeClass theNonMetaclass
+            ] ifFalse:[
+                c isMethodChange ifTrue:[
+                    cls := c changeMethod isNil
+                                ifTrue:[ c changeClass ]
+                                ifFalse:[ c changeMethod mclass theNonMetaclass ].
+                    classes add:cls
+                ] ifFalse:[
+                    c isCompositeChange ifTrue:[
+                        c changes do:addThemChanges
+                    ]
+                ]
+            ]
+        ].
     changes do:addThemChanges.
 
-    UserPreferences current systemBrowserClass
-	browseClasses:classes title:'selected monticello classes'.
+    UserPreferences systemBrowserClass 
+        browseClasses:classes title:'selected monticello classes'.
 
     "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 05-09-2011 / 16:08:35 / cg"
@@ -3931,11 +3933,11 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.52 2013-05-15 17:03:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.53 2013-06-25 17:12:44 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.52 2013-05-15 17:03:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.53 2013-06-25 17:12:44 cg Exp $'
 !
 
 version_HG
@@ -3944,6 +3946,6 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.52 2013-05-15 17:03:46 cg Exp $'
+    ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.53 2013-06-25 17:12:44 cg Exp $'
 ! !
 
--- a/Tools__ChangeSetDiffTool.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__ChangeSetDiffTool.st	Mon Jul 01 22:15:23 2013 +0100
@@ -90,7 +90,7 @@
     Tool for viewing/merging differences between two change sets
 
     [author:]
-        Jan Vrany <jan.vrany@fit.cvut.cz>
+	Jan Vrany <jan.vrany@fit.cvut.cz>
 
     [instance variables:]
 
@@ -104,29 +104,29 @@
 examples
 "
   Starting the application:
-                                                                [exBegin]
+								[exBegin]
     Tools::ChangeSetDiffTool open
 
-                                                                [exEnd]
-
-  Show differences between CVS HEAD and SVN jv-branch 
+								[exEnd]
+
+  Show differences between CVS HEAD and SVN jv-branch
   NewSystemBrowser:
-                                                                [exBegin]
+								[exBegin]
     | cvsCs svnCs |
 
     cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'.
     svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'.
 
     Tools::ChangeSetDiffTool new
-        open;
-        fileMenuOpenOnDiffBetween: cvsCs and: svnCs.
-
-                                                                [exEnd]
+	open;
+	fileMenuOpenOnDiffBetween: cvsCs and: svnCs.
+
+								[exEnd]
 
   Show differences between CVS HEAD and SVN jv-branch and
   base version of NewSystemBrowser:
 
-                                                                [exBegin]
+								[exBegin]
     | cvsBaseCs cvsCs svnCs |
 
     cvsBaseCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@2012-01-01/stx/libtool/Tools__NewSystemBrowser.st'.
@@ -134,10 +134,10 @@
     svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'.
 
     Tools::ChangeSetDiffTool new
-        open;
-        fileMenuOpenOnDiffBetween: cvsCs and: svnCs base: cvsBaseCs
-
-                                                                [exEnd]
+	open;
+	fileMenuOpenOnDiffBetween: cvsCs and: svnCs base: cvsBaseCs
+
+								[exEnd]
 
 
 
@@ -271,32 +271,32 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: labelDiff2Spec
-        window: 
+	name: labelDiff2Spec
+	window:
        (WindowSpec
-          label: 'Label'
-          name: 'Label'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 600 60)
-        )
-        component: 
+	  label: 'Label'
+	  name: 'Label'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 600 60)
+	)
+	component:
        (SpecCollection
-          collection: (
-           (UISubSpecification
-              name: 'LabelA'
-              layout: (LayoutFrame 0 0 0 0 0 1 0 0.5)
-              minorKey: versionALabelSpec
-            )
-           (UISubSpecification
-              name: 'LabelB'
-              layout: (LayoutFrame 0 0 0 0.5 0 1 0 1)
-              minorKey: versionBLabelSpec
-            )
-           )
-         
-        )
+	  collection: (
+	   (UISubSpecification
+	      name: 'LabelA'
+	      layout: (LayoutFrame 0 0 0 0 0 1 0 0.5)
+	      minorKey: versionALabelSpec
+	    )
+	   (UISubSpecification
+	      name: 'LabelB'
+	      layout: (LayoutFrame 0 0 0 0.5 0 1 0 1)
+	      minorKey: versionBLabelSpec
+	    )
+	   )
+
+	)
       )
 !
 
@@ -314,37 +314,37 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: labelDiff3Spec
-        window: 
+	name: labelDiff3Spec
+	window:
        (WindowSpec
-          label: 'Label'
-          name: 'Label'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 600 90)
-        )
-        component: 
+	  label: 'Label'
+	  name: 'Label'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 600 90)
+	)
+	component:
        (SpecCollection
-          collection: (
-           (UISubSpecification
-              name: 'LabelBase'
-              layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-              minorKey: versionBaseLabelSpec
-            )
-           (UISubSpecification
-              name: 'LabelA'
-              layout: (LayoutFrame 0 0 30 0 0 1 60 0)
-              minorKey: versionALabelSpec
-            )
-           (UISubSpecification
-              name: 'LabelB'
-              layout: (LayoutFrame 0 0 60 0 0 1 0 1)
-              minorKey: versionBLabelSpec
-            )
-           )
-         
-        )
+	  collection: (
+	   (UISubSpecification
+	      name: 'LabelBase'
+	      layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+	      minorKey: versionBaseLabelSpec
+	    )
+	   (UISubSpecification
+	      name: 'LabelA'
+	      layout: (LayoutFrame 0 0 30 0 0 1 60 0)
+	      minorKey: versionALabelSpec
+	    )
+	   (UISubSpecification
+	      name: 'LabelB'
+	      layout: (LayoutFrame 0 0 60 0 0 1 0 1)
+	      minorKey: versionBLabelSpec
+	    )
+	   )
+
+	)
       )
 !
 
@@ -362,42 +362,42 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: labelMergeSpec
-        window: 
+	name: labelMergeSpec
+	window:
        (WindowSpec
-          label: 'Label'
-          name: 'Label'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 600 120)
-        )
-        component: 
+	  label: 'Label'
+	  name: 'Label'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 600 120)
+	)
+	component:
        (SpecCollection
-          collection: (
-           (UISubSpecification
-              name: 'LabelBase'
-              layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-              minorKey: mergeBaseLabelSpec
-            )
-           (UISubSpecification
-              name: 'LabelA'
-              layout: (LayoutFrame 0 0 30 0 0 1 60 0)
-              minorKey: mergeALabelSpec
-            )
-           (UISubSpecification
-              name: 'LabelB'
-              layout: (LayoutFrame 0 0 60 0 0 1 90 0)
-              minorKey: mergeBLabelSpec
-            )
-           (UISubSpecification
-              name: 'SubSpecification1'
-              layout: (LayoutFrame 0 0 90 0 0 1 0 1)
-              minorKey: mergeMergeLabelSpec
-            )
-           )
-         
-        )
+	  collection: (
+	   (UISubSpecification
+	      name: 'LabelBase'
+	      layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+	      minorKey: mergeBaseLabelSpec
+	    )
+	   (UISubSpecification
+	      name: 'LabelA'
+	      layout: (LayoutFrame 0 0 30 0 0 1 60 0)
+	      minorKey: mergeALabelSpec
+	    )
+	   (UISubSpecification
+	      name: 'LabelB'
+	      layout: (LayoutFrame 0 0 60 0 0 1 90 0)
+	      minorKey: mergeBLabelSpec
+	    )
+	   (UISubSpecification
+	      name: 'SubSpecification1'
+	      layout: (LayoutFrame 0 0 90 0 0 1 0 1)
+	      minorKey: mergeMergeLabelSpec
+	    )
+	   )
+
+	)
       )
 
     "Modified: / 17-01-2013 / 23:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -417,32 +417,32 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: labelSpec
-        window: 
+	name: labelSpec
+	window:
        (WindowSpec
-          label: 'Label'
-          name: 'Label'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 600 48)
-        )
-        component: 
+	  label: 'Label'
+	  name: 'Label'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 600 48)
+	)
+	component:
        (SpecCollection
-          collection: (
-           (UISubSpecification
-              name: 'LabelA'
-              layout: (LayoutFrame 0 0 0 0 0 1 0 0.5)
-              minorKey: versionALabelSpec
-            )
-           (UISubSpecification
-              name: 'LabelB'
-              layout: (LayoutFrame 0 0 0 0.5 0 1 0 1)
-              minorKey: versionBLabelSpec
-            )
-           )
-         
-        )
+	  collection: (
+	   (UISubSpecification
+	      name: 'LabelA'
+	      layout: (LayoutFrame 0 0 0 0 0 1 0 0.5)
+	      minorKey: versionALabelSpec
+	    )
+	   (UISubSpecification
+	      name: 'LabelB'
+	      layout: (LayoutFrame 0 0 0 0.5 0 1 0 1)
+	      minorKey: versionBLabelSpec
+	    )
+	   )
+
+	)
       )
 !
 
@@ -460,67 +460,67 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: oneColumnNavigatorSpec
-        window: 
+	name: oneColumnNavigatorSpec
+	window:
        (WindowSpec
-          label: 'One Column Navigator'
-          name: 'One Column Navigator'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 300)
-        )
-        component: 
+	  label: 'One Column Navigator'
+	  name: 'One Column Navigator'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 300)
+	)
+	component:
        (SpecCollection
-          collection: (
-           (SubCanvasSpec
-              name: 'DiffList'
-              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-              hasHorizontalScrollBar: false
-              hasVerticalScrollBar: false
-              majorKey: #'Tools::ChangeSetDiffList'
-              subAspectHolders: 
-             (Array
-                
-               (SubChannelInfoSpec
-                  subAspect: highlightConflictsHolder
-                  aspect: highlightConflictsHolder
-                ) 
-               (SubChannelInfoSpec
-                  subAspect: inGeneratorHolder
-                  aspect: diffsetHolderPrivate
-                )
-                
-               (SubChannelInfoSpec
-                  subAspect: listEntryLabelGenerator
-                  aspect: diffListEntryLabelGeneratorAspect
-                ) 
-               (SubChannelInfoSpec
-                  subAspect: menuHolder
-                  aspect: listMenuHolder
-                )
-                
-               (SubChannelInfoSpec
-                  subAspect: outGeneratorHolder
-                  aspect: selectionHolder
-                ) 
-               (SubChannelInfoSpec
-                  subAspect: showCopyrightMethodDiffsHolder
-                  aspect: showCopyrightMethodDiffsHolder
-                )
-                
-               (SubChannelInfoSpec
-                  subAspect: showVersionMethodDiffsHolder
-                  aspect: showVersionMethodDiffsHolder
-                )
-              )
-              createNewApplication: true
-              createNewBuilder: false
-              postBuildCallback: list1View:
-            )
-           )
-         
-        )
+	  collection: (
+	   (SubCanvasSpec
+	      name: 'DiffList'
+	      layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+	      hasHorizontalScrollBar: false
+	      hasVerticalScrollBar: false
+	      majorKey: #'Tools::ChangeSetDiffList'
+	      subAspectHolders:
+	     (Array
+
+	       (SubChannelInfoSpec
+		  subAspect: highlightConflictsHolder
+		  aspect: highlightConflictsHolder
+		)
+	       (SubChannelInfoSpec
+		  subAspect: inGeneratorHolder
+		  aspect: diffsetHolderPrivate
+		)
+
+	       (SubChannelInfoSpec
+		  subAspect: listEntryLabelGenerator
+		  aspect: diffListEntryLabelGeneratorAspect
+		)
+	       (SubChannelInfoSpec
+		  subAspect: menuHolder
+		  aspect: listMenuHolder
+		)
+
+	       (SubChannelInfoSpec
+		  subAspect: outGeneratorHolder
+		  aspect: selectionHolder
+		)
+	       (SubChannelInfoSpec
+		  subAspect: showCopyrightMethodDiffsHolder
+		  aspect: showCopyrightMethodDiffsHolder
+		)
+
+	       (SubChannelInfoSpec
+		  subAspect: showVersionMethodDiffsHolder
+		  aspect: showVersionMethodDiffsHolder
+		)
+	      )
+	      createNewApplication: true
+	      createNewBuilder: false
+	      postBuildCallback: list1View:
+	    )
+	   )
+
+	)
       )
 !
 
@@ -538,121 +538,121 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: twoColumnNavigatorSpec
-        window: 
+	name: twoColumnNavigatorSpec
+	window:
        (WindowSpec
-          label: 'Two Column Navigator'
-          name: 'Two Column Navigator'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 300)
-        )
-        component: 
+	  label: 'Two Column Navigator'
+	  name: 'Two Column Navigator'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 300)
+	)
+	component:
        (SpecCollection
-          collection: (
-           (VariableHorizontalPanelSpec
-              name: 'Columns'
-              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-              component: 
-             (SpecCollection
-                collection: (
-                 (SubCanvasSpec
-                    name: 'LeftList'
-                    hasHorizontalScrollBar: false
-                    hasVerticalScrollBar: false
-                    majorKey: #'Tools::ChangeSetDiffList'
-                    subAspectHolders: 
-                   (Array
-                      
-                     (SubChannelInfoSpec
-                        subAspect: highlightConflictsHolder
-                        aspect: highlightConflictsHolder
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: inGeneratorHolder
-                        aspect: diffsetHolderPrivate
-                      )
-                      
-                     (SubChannelInfoSpec
-                        subAspect: listEntryLabelGenerator
-                        aspect: diffListEntryLabelGeneratorAspect
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: menuHolder
-                        aspect: listMenuHolder
-                      )
-                      
-                     (SubChannelInfoSpec
-                        subAspect: outGeneratorHolder
-                        aspect: firstColSelectionHolder
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: showCopyrightMethodDiffsHolder
-                        aspect: showCopyrightMethodDiffsHolder
-                      )
-                      
-                     (SubChannelInfoSpec
-                        subAspect: showVersionMethodDiffsHolder
-                        aspect: showVersionMethodDiffsHolder
-                      )
-                    )
-                    createNewApplication: true
-                    createNewBuilder: true
-                    postBuildCallback: list1View:
-                  )
-                 (SubCanvasSpec
-                    name: 'RightList'
-                    hasHorizontalScrollBar: false
-                    hasVerticalScrollBar: false
-                    majorKey: #'Tools::ChangeSetDiffList'
-                    subAspectHolders: 
-                   (Array
-                      
-                     (SubChannelInfoSpec
-                        subAspect: highlightConflictsHolder
-                        aspect: highlightConflictsHolder
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: inGeneratorHolder
-                        aspect: firstColSelectionHolder
-                      )
-                      
-                     (SubChannelInfoSpec
-                        subAspect: listEntryLabelGenerator
-                        aspect: diffListEntryLabelGeneratorAspect
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: menuHolder
-                        aspect: listMenuHolder
-                      )
-                      
-                     (SubChannelInfoSpec
-                        subAspect: outGeneratorHolder
-                        aspect: selectionHolder
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: showCopyrightMethodDiffsHolder
-                        aspect: showCopyrightMethodDiffsHolder
-                      )
-                      
-                     (SubChannelInfoSpec
-                        subAspect: showVersionMethodDiffsHolder
-                        aspect: showVersionMethodDiffsHolder
-                      )
-                    )
-                    createNewApplication: true
-                    createNewBuilder: true
-                    postBuildCallback: list2View:
-                  )
-                 )
-               
-              )
-              handles: (Any 0.5 1.0)
-            )
-           )
-         
-        )
+	  collection: (
+	   (VariableHorizontalPanelSpec
+	      name: 'Columns'
+	      layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+	      component:
+	     (SpecCollection
+		collection: (
+		 (SubCanvasSpec
+		    name: 'LeftList'
+		    hasHorizontalScrollBar: false
+		    hasVerticalScrollBar: false
+		    majorKey: #'Tools::ChangeSetDiffList'
+		    subAspectHolders:
+		   (Array
+
+		     (SubChannelInfoSpec
+			subAspect: highlightConflictsHolder
+			aspect: highlightConflictsHolder
+		      )
+		     (SubChannelInfoSpec
+			subAspect: inGeneratorHolder
+			aspect: diffsetHolderPrivate
+		      )
+
+		     (SubChannelInfoSpec
+			subAspect: listEntryLabelGenerator
+			aspect: diffListEntryLabelGeneratorAspect
+		      )
+		     (SubChannelInfoSpec
+			subAspect: menuHolder
+			aspect: listMenuHolder
+		      )
+
+		     (SubChannelInfoSpec
+			subAspect: outGeneratorHolder
+			aspect: firstColSelectionHolder
+		      )
+		     (SubChannelInfoSpec
+			subAspect: showCopyrightMethodDiffsHolder
+			aspect: showCopyrightMethodDiffsHolder
+		      )
+
+		     (SubChannelInfoSpec
+			subAspect: showVersionMethodDiffsHolder
+			aspect: showVersionMethodDiffsHolder
+		      )
+		    )
+		    createNewApplication: true
+		    createNewBuilder: true
+		    postBuildCallback: list1View:
+		  )
+		 (SubCanvasSpec
+		    name: 'RightList'
+		    hasHorizontalScrollBar: false
+		    hasVerticalScrollBar: false
+		    majorKey: #'Tools::ChangeSetDiffList'
+		    subAspectHolders:
+		   (Array
+
+		     (SubChannelInfoSpec
+			subAspect: highlightConflictsHolder
+			aspect: highlightConflictsHolder
+		      )
+		     (SubChannelInfoSpec
+			subAspect: inGeneratorHolder
+			aspect: firstColSelectionHolder
+		      )
+
+		     (SubChannelInfoSpec
+			subAspect: listEntryLabelGenerator
+			aspect: diffListEntryLabelGeneratorAspect
+		      )
+		     (SubChannelInfoSpec
+			subAspect: menuHolder
+			aspect: listMenuHolder
+		      )
+
+		     (SubChannelInfoSpec
+			subAspect: outGeneratorHolder
+			aspect: selectionHolder
+		      )
+		     (SubChannelInfoSpec
+			subAspect: showCopyrightMethodDiffsHolder
+			aspect: showCopyrightMethodDiffsHolder
+		      )
+
+		     (SubChannelInfoSpec
+			subAspect: showVersionMethodDiffsHolder
+			aspect: showVersionMethodDiffsHolder
+		      )
+		    )
+		    createNewApplication: true
+		    createNewBuilder: true
+		    postBuildCallback: list2View:
+		  )
+		 )
+
+	      )
+	      handles: (Any 0.5 1.0)
+	    )
+	   )
+
+	)
       )
 !
 
@@ -671,86 +671,86 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: windowSpec
-        window: 
+	name: windowSpec
+	window:
        (WindowSpec
-          label: 'Diff Browser'
-          name: 'Diff Browser'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 1024 768)
-          menu: mainMenu
-        )
-        component: 
+	  label: 'Diff Browser'
+	  name: 'Diff Browser'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 1024 768)
+	  menu: mainMenu
+	)
+	component:
        (SpecCollection
-          collection: (
-           (MenuPanelSpec
-              name: 'ToolBar'
-              layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-              menu: toolbarMenu
-              textDefault: true
-            )
-           (SubCanvasSpec
-              name: 'InfoPanel'
-              layout: (LayoutFrame 0 0 30 0 0 1 70 0)
-              level: 0
-              initiallyInvisible: true
-              hasHorizontalScrollBar: false
-              hasVerticalScrollBar: false
-              clientKey: infoPanel
-              createNewBuilder: false
-            )
-           (ViewSpec
-              name: 'Content'
-              layout: (LayoutFrame 0 0 30 0 0 1 0 1)
-              component: 
-             (SpecCollection
-                collection: (
-                 (SubCanvasSpec
-                    name: 'Labels'
-                    layout: (LayoutFrame 0 0 0 0 0 1 60 0)
-                    hasHorizontalScrollBar: false
-                    hasVerticalScrollBar: false
-                    specHolder: labelSpecHolder
-                    createNewBuilder: false
-                    postBuildCallback: labelsView:
-                  )
-                 (VariableVerticalPanelSpec
-                    name: 'NavigatorAndDiffPanel'
-                    layout: (LayoutFrame 0 0 60 0 0 1 0 1)
-                    initiallyInvisible: true
-                    visibilityChannel: hasDiffsetHolder
-                    showHandle: true
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (SubCanvasSpec
-                          name: 'NavigatorPanel'
-                          hasHorizontalScrollBar: false
-                          hasVerticalScrollBar: false
-                          specHolder: navigatorPanelSpecHolder
-                          createNewBuilder: false
-                        )
-                       (SubCanvasSpec
-                          name: 'SubCanvas1'
-                          specHolder: textDiffToolWindowSpecHolder
-                          clientHolder: textDiffToolHolder
-                          createNewBuilder: false
-                        )
-                       )
-                     
-                    )
-                    handles: (Any 0.3 1.0)
-                    postBuildCallback: navigatorAndDiffPanelView:
-                  )
-                 )
-               
-              )
-            )
-           )
-         
-        )
+	  collection: (
+	   (MenuPanelSpec
+	      name: 'ToolBar'
+	      layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+	      menu: toolbarMenu
+	      textDefault: true
+	    )
+	   (SubCanvasSpec
+	      name: 'InfoPanel'
+	      layout: (LayoutFrame 0 0 30 0 0 1 70 0)
+	      level: 0
+	      initiallyInvisible: true
+	      hasHorizontalScrollBar: false
+	      hasVerticalScrollBar: false
+	      clientKey: infoPanel
+	      createNewBuilder: false
+	    )
+	   (ViewSpec
+	      name: 'Content'
+	      layout: (LayoutFrame 0 0 30 0 0 1 0 1)
+	      component:
+	     (SpecCollection
+		collection: (
+		 (SubCanvasSpec
+		    name: 'Labels'
+		    layout: (LayoutFrame 0 0 0 0 0 1 60 0)
+		    hasHorizontalScrollBar: false
+		    hasVerticalScrollBar: false
+		    specHolder: labelSpecHolder
+		    createNewBuilder: false
+		    postBuildCallback: labelsView:
+		  )
+		 (VariableVerticalPanelSpec
+		    name: 'NavigatorAndDiffPanel'
+		    layout: (LayoutFrame 0 0 60 0 0 1 0 1)
+		    initiallyInvisible: true
+		    visibilityChannel: hasDiffsetHolder
+		    showHandle: true
+		    component:
+		   (SpecCollection
+		      collection: (
+		       (SubCanvasSpec
+			  name: 'NavigatorPanel'
+			  hasHorizontalScrollBar: false
+			  hasVerticalScrollBar: false
+			  specHolder: navigatorPanelSpecHolder
+			  createNewBuilder: false
+			)
+		       (SubCanvasSpec
+			  name: 'SubCanvas1'
+			  specHolder: textDiffToolWindowSpecHolder
+			  clientHolder: textDiffToolHolder
+			  createNewBuilder: false
+			)
+		       )
+
+		    )
+		    handles: (Any 0.3 1.0)
+		    postBuildCallback: navigatorAndDiffPanelView:
+		  )
+		 )
+
+	      )
+	    )
+	   )
+
+	)
       )
 
     "Modified: / 18-01-2013 / 00:07:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -772,60 +772,60 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: mergeALabelSpec
-        window: 
+	name: mergeALabelSpec
+	window:
        (WindowSpec
-          label: 'Version A'
-          name: 'Version A'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version A'
+	  name: 'Version A'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'mergeDiff3BaseToAArrow30x30'
-              name: 'Label1'
-              layout: (LayoutFrame 0 0 0 0 30 0 0 1)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'versionA24x24'
-              name: 'VersionAIcon'
-              layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'mergeDiff3AToMergedArrow30x30'
-              name: 'Label2'
-              layout: (LayoutFrame 60 0 0 0 90 0 0 1)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Version A'
-              name: 'VersionALabel'
-              layout: (LayoutFrame 90 0 0 0 0 1 0 1)
-              translateLabel: true
-              labelChannel: versionALabelHolder
-              resizeForLabel: true
-              adjust: left
-            )
-           (LabelSpec
-              label: '(A)'
-              name: 'ALabel'
-              layout: (LayoutFrame -30 1 0 0 0 1 0 1)
-              translateLabel: true
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'mergeDiff3BaseToAArrow30x30'
+	      name: 'Label1'
+	      layout: (LayoutFrame 0 0 0 0 30 0 0 1)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'versionA24x24'
+	      name: 'VersionAIcon'
+	      layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'mergeDiff3AToMergedArrow30x30'
+	      name: 'Label2'
+	      layout: (LayoutFrame 60 0 0 0 90 0 0 1)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Version A'
+	      name: 'VersionALabel'
+	      layout: (LayoutFrame 90 0 0 0 0 1 0 1)
+	      translateLabel: true
+	      labelChannel: versionALabelHolder
+	      resizeForLabel: true
+	      adjust: left
+	    )
+	   (LabelSpec
+	      label: '(A)'
+	      name: 'ALabel'
+	      layout: (LayoutFrame -30 1 0 0 0 1 0 1)
+	      translateLabel: true
+	    )
+	   )
+
+	)
       )
 !
 
@@ -843,62 +843,62 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: versionBLabelSpec
-        window: 
+	name: versionBLabelSpec
+	window:
        (WindowSpec
-          label: 'Version B'
-          name: 'Version B'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 100.0 90.5882352941177 60.0)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version B'
+	  name: 'Version B'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 100.0 90.5882352941177 60.0)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-            (LabelSpec
-              label: 'mergeDiff3BaseToBArrow30x30'
-              name: 'Label1'
-              layout: (LayoutFrame 0 0 0 0 30 0 0 1)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'versionB24x24'
-              name: 'VersionBIcon'
-              layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-            (LabelSpec
-              label: 'mergeDiff3BToMergedArrow30x30'
-              name: 'Label2'
-              layout: (LayoutFrame 60 0 0 0 90 0 0 1)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Version B'
-              name: 'VersionBLabel'
-              layout: (LayoutFrame 90 0 0 0 167 0 0 1)
-              translateLabel: true
-              labelChannel: versionBLabelHolder
-              resizeForLabel: true
-              adjust: left
-              useDynamicPreferredWidth: true
-              usePreferredWidth: true
-            )
-             (LabelSpec
-             label: '(B)'
-             name: 'BLabel'
-             layout: (LayoutFrame -30 1 0 0 0 1 0 1)
-             translateLabel: true
-            )
-           )
-         
-        )
+	  collection: (
+	    (LabelSpec
+	      label: 'mergeDiff3BaseToBArrow30x30'
+	      name: 'Label1'
+	      layout: (LayoutFrame 0 0 0 0 30 0 0 1)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'versionB24x24'
+	      name: 'VersionBIcon'
+	      layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	    (LabelSpec
+	      label: 'mergeDiff3BToMergedArrow30x30'
+	      name: 'Label2'
+	      layout: (LayoutFrame 60 0 0 0 90 0 0 1)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Version B'
+	      name: 'VersionBLabel'
+	      layout: (LayoutFrame 90 0 0 0 167 0 0 1)
+	      translateLabel: true
+	      labelChannel: versionBLabelHolder
+	      resizeForLabel: true
+	      adjust: left
+	      useDynamicPreferredWidth: true
+	      usePreferredWidth: true
+	    )
+	     (LabelSpec
+	     label: '(B)'
+	     name: 'BLabel'
+	     layout: (LayoutFrame -30 1 0 0 0 1 0 1)
+	     translateLabel: true
+	    )
+	   )
+
+	)
       )
 
     "Created: / 17-01-2013 / 23:44:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -918,48 +918,48 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: versionBaseLabelSpec
-        window: 
+	name: versionBaseLabelSpec
+	window:
        (WindowSpec
-          label: 'Version Base'
-          name: 'Version Base'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version Base'
+	  name: 'Version Base'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'versionBase24x24'
-              name: 'VersionBIcon'
-              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Version B'
-              name: 'VersionBLabel'
-              layout: (LayoutFrame 90 0 0 0 190 0 0 1)
-              translateLabel: true
-              labelChannel: versionBaseLabelHolder
-              resizeForLabel: true
-              adjust: left
-              useDynamicPreferredWidth: true
-              usePreferredWidth: true
-            )
-           (LabelSpec
-              label: '(Base)'
-              name: 'BaseLabel'
-              layout: (LayoutFrame -50 1 0 0 0 1 0 1)
-              translateLabel: true
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'versionBase24x24'
+	      name: 'VersionBIcon'
+	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Version B'
+	      name: 'VersionBLabel'
+	      layout: (LayoutFrame 90 0 0 0 190 0 0 1)
+	      translateLabel: true
+	      labelChannel: versionBaseLabelHolder
+	      resizeForLabel: true
+	      adjust: left
+	      useDynamicPreferredWidth: true
+	      usePreferredWidth: true
+	    )
+	   (LabelSpec
+	      label: '(Base)'
+	      name: 'BaseLabel'
+	      layout: (LayoutFrame -50 1 0 0 0 1 0 1)
+	      translateLabel: true
+	    )
+	   )
+
+	)
       )
 
     "Created: / 17-01-2013 / 23:44:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -979,48 +979,48 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: mergeMergeLabelSpec
-        window: 
+	name: mergeMergeLabelSpec
+	window:
        (WindowSpec
-          label: 'Version Merged'
-          name: 'Version Merged'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 96.2554360265507 72.7275501640345 95.8999008163577)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version Merged'
+	  name: 'Version Merged'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 96.2554360265507 72.7275501640345 95.8999008163577)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'versionMerged24x24'
-              name: 'VersionMergedIcon'
-              layout: (LayoutFrame 60 0 -12 0.5 87 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Version B'
-              name: 'VersionMergedLabel'
-              layout: (LayoutFrame 90 0 0 0 267 0 0 1)
-              translateLabel: true
-              labelChannel: versionMergedLabelHolder
-              resizeForLabel: true
-              adjust: left
-              useDynamicPreferredWidth: true
-              usePreferredWidth: true
-            )
-           (LabelSpec
-              label: '(Merge)'
-              name: 'MergedLabel'
-              layout: (LayoutFrame -70 1 0 0 0 1 0 1)
-              translateLabel: true
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'versionMerged24x24'
+	      name: 'VersionMergedIcon'
+	      layout: (LayoutFrame 60 0 -12 0.5 87 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Version B'
+	      name: 'VersionMergedLabel'
+	      layout: (LayoutFrame 90 0 0 0 267 0 0 1)
+	      translateLabel: true
+	      labelChannel: versionMergedLabelHolder
+	      resizeForLabel: true
+	      adjust: left
+	      useDynamicPreferredWidth: true
+	      usePreferredWidth: true
+	    )
+	   (LabelSpec
+	      label: '(Merge)'
+	      name: 'MergedLabel'
+	      layout: (LayoutFrame -70 1 0 0 0 1 0 1)
+	      translateLabel: true
+	    )
+	   )
+
+	)
       )
 !
 
@@ -1038,46 +1038,46 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: versionALabelSpec
-        window: 
+	name: versionALabelSpec
+	window:
        (WindowSpec
-          label: 'Version A'
-          name: 'Version A'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version A'
+	  name: 'Version A'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'versionA24x24'
-              name: 'VersionAIcon'
-              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Version A'
-              name: 'VersionALabel'
-              layout: (LayoutFrame 30 0 0 0 0 1 0 1)
-              translateLabel: true
-              labelChannel: versionALabelHolder
-              resizeForLabel: true
-              adjust: left
-            )
-           (LabelSpec
-              label: '(A)'
-              name: 'ALabel'
-              layout: (LayoutFrame -30 1 0 0 0 1 0 1)
-              translateLabel: true
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'versionA24x24'
+	      name: 'VersionAIcon'
+	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Version A'
+	      name: 'VersionALabel'
+	      layout: (LayoutFrame 30 0 0 0 0 1 0 1)
+	      translateLabel: true
+	      labelChannel: versionALabelHolder
+	      resizeForLabel: true
+	      adjust: left
+	    )
+	   (LabelSpec
+	      label: '(A)'
+	      name: 'ALabel'
+	      layout: (LayoutFrame -30 1 0 0 0 1 0 1)
+	      translateLabel: true
+	    )
+	   )
+
+	)
       )
 !
 
@@ -1095,48 +1095,48 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: versionBLabelSpec
-        window: 
+	name: versionBLabelSpec
+	window:
        (WindowSpec
-          label: 'Version B'
-          name: 'Version B'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 100.0 90.5882352941177 60.0)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version B'
+	  name: 'Version B'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 100.0 90.5882352941177 60.0)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'versionB24x24'
-              name: 'VersionBIcon'
-              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Version B'
-              name: 'VersionBLabel'
-              layout: (LayoutFrame 30 0 0 0 167 0 0 1)
-              translateLabel: true
-              labelChannel: versionBLabelHolder
-              resizeForLabel: true
-              adjust: left
-              useDynamicPreferredWidth: true
-              usePreferredWidth: true
-            )
-             (LabelSpec
-             label: '(B)'
-             name: 'BLabel'
-             layout: (LayoutFrame -30 1 0 0 0 1 0 1)
-             translateLabel: true
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'versionB24x24'
+	      name: 'VersionBIcon'
+	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Version B'
+	      name: 'VersionBLabel'
+	      layout: (LayoutFrame 30 0 0 0 167 0 0 1)
+	      translateLabel: true
+	      labelChannel: versionBLabelHolder
+	      resizeForLabel: true
+	      adjust: left
+	      useDynamicPreferredWidth: true
+	      usePreferredWidth: true
+	    )
+	     (LabelSpec
+	     label: '(B)'
+	     name: 'BLabel'
+	     layout: (LayoutFrame -30 1 0 0 0 1 0 1)
+	     translateLabel: true
+	    )
+	   )
+
+	)
       )
 
     "Modified: / 16-12-2011 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1156,48 +1156,48 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: versionBaseLabelSpec
-        window: 
+	name: versionBaseLabelSpec
+	window:
        (WindowSpec
-          label: 'Version Base'
-          name: 'Version Base'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version Base'
+	  name: 'Version Base'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'versionBase24x24'
-              name: 'VersionBIcon'
-              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Version B'
-              name: 'VersionBLabel'
-              layout: (LayoutFrame 30 0 0 0 190 0 0 1)
-              translateLabel: true
-              labelChannel: versionBaseLabelHolder
-              resizeForLabel: true
-              adjust: left
-              useDynamicPreferredWidth: true
-              usePreferredWidth: true
-            )
-           (LabelSpec
-              label: '(Base)'
-              name: 'BaseLabel'
-              layout: (LayoutFrame -50 1 0 0 0 1 0 1)
-              translateLabel: true
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'versionBase24x24'
+	      name: 'VersionBIcon'
+	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Version B'
+	      name: 'VersionBLabel'
+	      layout: (LayoutFrame 30 0 0 0 190 0 0 1)
+	      translateLabel: true
+	      labelChannel: versionBaseLabelHolder
+	      resizeForLabel: true
+	      adjust: left
+	      useDynamicPreferredWidth: true
+	      usePreferredWidth: true
+	    )
+	   (LabelSpec
+	      label: '(Base)'
+	      name: 'BaseLabel'
+	      layout: (LayoutFrame -50 1 0 0 0 1 0 1)
+	      translateLabel: true
+	    )
+	   )
+
+	)
       )
 !
 
@@ -1215,48 +1215,48 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: versionBaseLabelSpec
-        window: 
+	name: versionBaseLabelSpec
+	window:
        (WindowSpec
-          label: 'Version Merged'
-          name: 'Version Merged'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 96.2554360265507 72.7275501640345 95.8999008163577)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version Merged'
+	  name: 'Version Merged'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 96.2554360265507 72.7275501640345 95.8999008163577)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'versionMerged24x24'
-              name: 'VersionMergedIcon'
-              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Version B'
-              name: 'VersionMergedLabel'
-              layout: (LayoutFrame 30 0 0 0 190 0 0 1)
-              translateLabel: true
-              labelChannel: versionMergedLabelHolder
-              resizeForLabel: true
-              adjust: left
-              useDynamicPreferredWidth: true
-              usePreferredWidth: true
-            )
-           (LabelSpec
-              label: '(Merge)'
-              name: 'MergedLabel'
-              layout: (LayoutFrame -70 1 0 0 0 1 0 1)
-              translateLabel: true
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'versionMerged24x24'
+	      name: 'VersionMergedIcon'
+	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Version B'
+	      name: 'VersionMergedLabel'
+	      layout: (LayoutFrame 30 0 0 0 190 0 0 1)
+	      translateLabel: true
+	      labelChannel: versionMergedLabelHolder
+	      resizeForLabel: true
+	      adjust: left
+	      useDynamicPreferredWidth: true
+	      usePreferredWidth: true
+	    )
+	   (LabelSpec
+	      label: '(Merge)'
+	      name: 'MergedLabel'
+	      layout: (LayoutFrame -70 1 0 0 0 1 0 1)
+	      translateLabel: true
+	    )
+	   )
+
+	)
       )
 
     "Created: / 17-01-2013 / 22:53:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1264,6 +1264,8 @@
 
 !ChangeSetDiffTool class methodsFor:'menu specs'!
 
+
+
 listMenuDiff
     "This resource specification was automatically generated
      by the MenuEditor of ST/X."
@@ -1279,71 +1281,71 @@
 
     <resource: #menu>
 
-    ^ 
+    ^
      #(Menu
-        (
-         (MenuItem
-            enabled: hasSelection
-            label: 'Browse'
-            itemValue: listMenuBrowse
-            translateLabel: true
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            enabled: hasSelection
-            label: 'Load version A'
-            itemValue: listMenuLoadVersionA
-            nameKey: LoadVersionA
-            translateLabel: true
-            labelImage: (ResourceRetriever #'SVN::IconLibrary' versionA16x16 'Load version A')
-          )
-         (MenuItem
-            enabled: hasSelection
-            label: 'Load version B'
-            itemValue: listMenuLoadVersionB
-            nameKey: LoadVersionB
-            translateLabel: true
-            labelImage: (ResourceRetriever #'SVN::IconLibrary' versionB16x16 'Load version B')
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            label: 'Open in...'
-            translateLabel: true
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Inspector'
-                  itemValue: listMenuInspect
-                  translateLabel: true
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'kdiff3'
-                  itemValue: listMenuOpenInExternal:
-                  translateLabel: true
-                  argument: 'kdiff3'
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'meld'
-                  itemValue: listMenuOpenInExternal:
-                  translateLabel: true
-                  argument: 'meld'
-                )
-               )
-              nil
-              nil
-            )
-          )
-         )
-        nil
-        nil
+	(
+	 (MenuItem
+	    enabled: hasSelection
+	    label: 'Browse'
+	    itemValue: listMenuBrowse
+	    translateLabel: true
+	  )
+	 (MenuItem
+	    label: '-'
+	  )
+	 (MenuItem
+	    enabled: hasSelection
+	    label: 'Load version A'
+	    itemValue: listMenuLoadVersionA
+	    nameKey: LoadVersionA
+	    translateLabel: true
+	    labelImage: (ResourceRetriever #'SVN::IconLibrary' versionA16x16 'Load version A')
+	  )
+	 (MenuItem
+	    enabled: hasSelection
+	    label: 'Load version B'
+	    itemValue: listMenuLoadVersionB
+	    nameKey: LoadVersionB
+	    translateLabel: true
+	    labelImage: (ResourceRetriever #'SVN::IconLibrary' versionB16x16 'Load version B')
+	  )
+	 (MenuItem
+	    label: '-'
+	  )
+	 (MenuItem
+	    label: 'Open in...'
+	    translateLabel: true
+	    submenu:
+	   (Menu
+	      (
+	       (MenuItem
+		  enabled: hasSelection
+		  label: 'Inspector'
+		  itemValue: listMenuInspect
+		  translateLabel: true
+		)
+	       (MenuItem
+		  enabled: hasSelection
+		  label: 'kdiff3'
+		  itemValue: listMenuOpenInExternal:
+		  translateLabel: true
+		  argument: 'kdiff3'
+		)
+	       (MenuItem
+		  enabled: hasSelection
+		  label: 'meld'
+		  itemValue: listMenuOpenInExternal:
+		  translateLabel: true
+		  argument: 'meld'
+		)
+	       )
+	      nil
+	      nil
+	    )
+	  )
+	 )
+	nil
+	nil
       )
 
     "Created: / 16-01-2013 / 15:47:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1364,68 +1366,68 @@
 
     <resource: #menu>
 
-    ^ 
+    ^
      #(Menu
-        (
-         (MenuItem
-            enabled: hasSelection
-            label: 'Browse'
-            itemValue: listMenuBrowse
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            enabled: hasSelection
-            label: 'Merge using A'
-            itemValue: listMenuMergeUsingA
-            shortcutKey: Cmd2
-          )
-         (MenuItem
-            enabled: hasSelection
-            label: 'Merge using B'
-            itemValue: listMenuMergeUsingB
-            shortcutKey: Cmd3
-          )
-         (MenuItem
-            enabled: hasSelection
-            label: 'Merge using Base'
-            itemValue: listMenuMergeUsingBase
-            shortcutKey: Cmd1
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            label: 'Open in...'
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'Inspector'
-                  itemValue: listMenuInspect
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'kdiff3'
-                  itemValue: listMenuOpenInExternal:
-                  argument: 'kdiff3'
-                )
-               (MenuItem
-                  enabled: hasSelection
-                  label: 'meld'
-                  itemValue: listMenuOpenInExternal:
-                  argument: 'meld'
-                )
-               )
-              nil
-              nil
-            )
-          )
-         )
-        nil
-        nil
+	(
+	 (MenuItem
+	    enabled: hasSelection
+	    label: 'Browse'
+	    itemValue: listMenuBrowse
+	  )
+	 (MenuItem
+	    label: '-'
+	  )
+	 (MenuItem
+	    enabled: hasSelection
+	    label: 'Merge using A'
+	    itemValue: listMenuMergeUsingA
+	    shortcutKey: Cmd2
+	  )
+	 (MenuItem
+	    enabled: hasSelection
+	    label: 'Merge using B'
+	    itemValue: listMenuMergeUsingB
+	    shortcutKey: Cmd3
+	  )
+	 (MenuItem
+	    enabled: hasSelection
+	    label: 'Merge using Base'
+	    itemValue: listMenuMergeUsingBase
+	    shortcutKey: Cmd1
+	  )
+	 (MenuItem
+	    label: '-'
+	  )
+	 (MenuItem
+	    label: 'Open in...'
+	    submenu:
+	   (Menu
+	      (
+	       (MenuItem
+		  enabled: hasSelection
+		  label: 'Inspector'
+		  itemValue: listMenuInspect
+		)
+	       (MenuItem
+		  enabled: hasSelection
+		  label: 'kdiff3'
+		  itemValue: listMenuOpenInExternal:
+		  argument: 'kdiff3'
+		)
+	       (MenuItem
+		  enabled: hasSelection
+		  label: 'meld'
+		  itemValue: listMenuOpenInExternal:
+		  argument: 'meld'
+		)
+	       )
+	      nil
+	      nil
+	    )
+	  )
+	 )
+	nil
+	nil
       )
 !
 
@@ -1444,148 +1446,148 @@
 
     <resource: #menu>
 
-    ^ 
+    ^
      #(Menu
-        (
-         (MenuItem
-            label: 'File'
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  label: 'Open...'
-                  itemValue: fileMenuOpen
-                  shortcutKey: Ctrlo
-                )
-               (MenuItem
-                  enabled: canSave
-                  label: 'Save'
-                  itemValue: fileMenuSave
-                  shortcutKey: Ctrls
-                )
-               (MenuItem
-                  enabled: canSaveAs
-                  label: 'Save As...'
-                  itemValue: fileMenuSaveAs
-                )
-               (MenuItem
-                  enabled: canSaveAsPatch
-                  label: 'Save As Patch '
-                  itemValue: fileMenuSaveAsPatch
-                  isVisible: false
-                )
-               (MenuItem
-                  enabled: canSaveMergedAs
-                  label: 'Save Merged as... '
-                  itemValue: fileMenuSaveMergedAs
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'Exit'
-                  itemValue: closeRequest
-                  shortcutKey: Ctrlq
-                )
-               )
-              nil
-              nil
-            )
-          )
-         (MenuItem
-            label: 'Changeset'
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  enabled: isDiff2Or3
-                  label: 'Browse changes (A)'
-                  itemValue: changesetMenuBrowseA
-                )
-               (MenuItem
-                  enabled: isDiff2Or3
-                  label: 'Browse changes (B)'
-                  itemValue: changesetMenuBrowseB
-                )
-               (MenuItem
-                  enabled: isDiff3
-                  label: 'Browse changes (Base)'
-                  itemValue: changesetMenuBrowseBase
-                )
-               (MenuItem
-                  enabled: isMerge
-                  label: 'Browse changes (Merge)'
-                  itemValue: changesetMenuBrowseMerge
-                )
-               )
-              nil
-              nil
-            )
-          )
-         (MenuItem
-            label: 'Movement'
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  label: 'Go to Previous Delta'
-                  itemValue: menuMoveUp
-                )
-               (MenuItem
-                  label: 'Go To Next Delta'
-                  itemValue: menuMoveDown
-                )
-               (MenuItem
-                  label: 'Go to Previous Conflict'
-                  itemValue: menuMoveUpConflict
-                  shortcutKey: CmdCursorUp
-                )
-               (MenuItem
-                  label: 'Go to Next Conflict'
-                  itemValue: menuMoveDownConflict
-                  shortcutKey: CmdCursorDown
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  label: 'Automatically Go to Next Conflict'
-                  indication: autoMoveToNextConflictHolder
-                )
-               )
-              nil
-              nil
-            )
-          )
-         (MenuItem
-            label: 'Change'
-            submenuChannel: listMenu
-          )
-         (MenuItem
-            label: 'View'
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  label: 'Show Diffs in Version Methods'
-                  indication: showVersionMethodDiffsHolder
-                )
-               (MenuItem
-                  label: 'Show Diff in #copyright Methods'
-                  indication: showCopyrightMethodDiffsHolder
-                )
-               (MenuItem
-                  label: 'Highlight Conflicts'
-                  indication: highlightConflictsHolder
-                )
-               )
-              nil
-              nil
-            )
-          )
-         )
-        nil
-        nil
+	(
+	 (MenuItem
+	    label: 'File'
+	    submenu:
+	   (Menu
+	      (
+	       (MenuItem
+		  label: 'Open...'
+		  itemValue: fileMenuOpen
+		  shortcutKey: Ctrlo
+		)
+	       (MenuItem
+		  enabled: canSave
+		  label: 'Save'
+		  itemValue: fileMenuSave
+		  shortcutKey: Ctrls
+		)
+	       (MenuItem
+		  enabled: canSaveAs
+		  label: 'Save As...'
+		  itemValue: fileMenuSaveAs
+		)
+	       (MenuItem
+		  enabled: canSaveAsPatch
+		  label: 'Save As Patch '
+		  itemValue: fileMenuSaveAsPatch
+		  isVisible: false
+		)
+	       (MenuItem
+		  enabled: canSaveMergedAs
+		  label: 'Save Merged as... '
+		  itemValue: fileMenuSaveMergedAs
+		)
+	       (MenuItem
+		  label: '-'
+		)
+	       (MenuItem
+		  label: 'Exit'
+		  itemValue: closeRequest
+		  shortcutKey: Ctrlq
+		)
+	       )
+	      nil
+	      nil
+	    )
+	  )
+	 (MenuItem
+	    label: 'Changeset'
+	    submenu:
+	   (Menu
+	      (
+	       (MenuItem
+		  enabled: isDiff2Or3
+		  label: 'Browse changes (A)'
+		  itemValue: changesetMenuBrowseA
+		)
+	       (MenuItem
+		  enabled: isDiff2Or3
+		  label: 'Browse changes (B)'
+		  itemValue: changesetMenuBrowseB
+		)
+	       (MenuItem
+		  enabled: isDiff3
+		  label: 'Browse changes (Base)'
+		  itemValue: changesetMenuBrowseBase
+		)
+	       (MenuItem
+		  enabled: isMerge
+		  label: 'Browse changes (Merge)'
+		  itemValue: changesetMenuBrowseMerge
+		)
+	       )
+	      nil
+	      nil
+	    )
+	  )
+	 (MenuItem
+	    label: 'Movement'
+	    submenu:
+	   (Menu
+	      (
+	       (MenuItem
+		  label: 'Go to Previous Delta'
+		  itemValue: menuMoveUp
+		)
+	       (MenuItem
+		  label: 'Go To Next Delta'
+		  itemValue: menuMoveDown
+		)
+	       (MenuItem
+		  label: 'Go to Previous Conflict'
+		  itemValue: menuMoveUpConflict
+		  shortcutKey: CmdCursorUp
+		)
+	       (MenuItem
+		  label: 'Go to Next Conflict'
+		  itemValue: menuMoveDownConflict
+		  shortcutKey: CmdCursorDown
+		)
+	       (MenuItem
+		  label: '-'
+		)
+	       (MenuItem
+		  label: 'Automatically Go to Next Conflict'
+		  indication: autoMoveToNextConflictHolder
+		)
+	       )
+	      nil
+	      nil
+	    )
+	  )
+	 (MenuItem
+	    label: 'Change'
+	    submenuChannel: listMenu
+	  )
+	 (MenuItem
+	    label: 'View'
+	    submenu:
+	   (Menu
+	      (
+	       (MenuItem
+		  label: 'Show Diffs in Version Methods'
+		  indication: showVersionMethodDiffsHolder
+		)
+	       (MenuItem
+		  label: 'Show Diff in #copyright Methods'
+		  indication: showCopyrightMethodDiffsHolder
+		)
+	       (MenuItem
+		  label: 'Highlight Conflicts'
+		  indication: highlightConflictsHolder
+		)
+	       )
+	      nil
+	      nil
+	    )
+	  )
+	 )
+	nil
+	nil
       )
 !
 
@@ -1604,79 +1606,79 @@
 
     <resource: #menu>
 
-    ^ 
+    ^
      #(Menu
-        (
-         (MenuItem
-            label: 'Open'
-            itemValue: fileMenuOpen
-            isButton: true
-            labelImage: (ResourceRetriever ToolbarIconLibrary loadFromFile22x22Icon)
-          )
-         (MenuItem
-            enabled: canSaveHolder
-            label: 'Save'
-            itemValue: fileMenuSave
-            isButton: true
-            labelImage: (ResourceRetriever ToolbarIconLibrary saveImageIcon)
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            label: 'Go to Previous Delta'
-            itemValue: menuMoveUp
-            isButton: true
-            labelImage: (ResourceRetriever ToolbarIconLibrary mergePrev24x24)
-          )
-         (MenuItem
-            label: 'Go to Next Delta'
-            itemValue: menuMoveDown
-            isButton: true
-            labelImage: (ResourceRetriever ToolbarIconLibrary mergeNext24x24)
-          )
-         (MenuItem
-            label: 'Go to Previous Conflict'
-            itemValue: menuMoveUpConflict
-            isButton: true
-            isVisible: mergeHolder
-            labelImage: (ResourceRetriever ToolbarIconLibrary mergePrevConflict24x24)
-          )
-         (MenuItem
-            label: 'Go to Next Conflict'
-            itemValue: menuMoveDownConflict
-            isButton: true
-            isVisible: mergeHolder
-            labelImage: (ResourceRetriever ToolbarIconLibrary mergeNextConflict24x24)
-          )
-         (MenuItem
-            label: '-'
-            isVisible: mergeHolder
-          )
-         (MenuItem
-            label: 'Merge using Base'
-            itemValue: listMenuMergeUsingBase
-            isButton: true
-            isVisible: mergeHolder
-            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBaseAll24x24)
-          )
-         (MenuItem
-            label: 'Merge using A'
-            itemValue: listMenuMergeUsingA
-            isButton: true
-            isVisible: mergeHolder
-            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingAAll24x24)
-          )
-         (MenuItem
-            label: 'Merge using B'
-            itemValue: listMenuMergeUsingB
-            isButton: true
-            isVisible: mergeHolder
-            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBAll24x24)
-          )
-         )
-        nil
-        nil
+	(
+	 (MenuItem
+	    label: 'Open'
+	    itemValue: fileMenuOpen
+	    isButton: true
+	    labelImage: (ResourceRetriever ToolbarIconLibrary loadFromFile22x22Icon)
+	  )
+	 (MenuItem
+	    enabled: canSaveHolder
+	    label: 'Save'
+	    itemValue: fileMenuSave
+	    isButton: true
+	    labelImage: (ResourceRetriever ToolbarIconLibrary saveImageIcon)
+	  )
+	 (MenuItem
+	    label: '-'
+	  )
+	 (MenuItem
+	    label: 'Go to Previous Delta'
+	    itemValue: menuMoveUp
+	    isButton: true
+	    labelImage: (ResourceRetriever ToolbarIconLibrary mergePrev24x24)
+	  )
+	 (MenuItem
+	    label: 'Go to Next Delta'
+	    itemValue: menuMoveDown
+	    isButton: true
+	    labelImage: (ResourceRetriever ToolbarIconLibrary mergeNext24x24)
+	  )
+	 (MenuItem
+	    label: 'Go to Previous Conflict'
+	    itemValue: menuMoveUpConflict
+	    isButton: true
+	    isVisible: mergeHolder
+	    labelImage: (ResourceRetriever ToolbarIconLibrary mergePrevConflict24x24)
+	  )
+	 (MenuItem
+	    label: 'Go to Next Conflict'
+	    itemValue: menuMoveDownConflict
+	    isButton: true
+	    isVisible: mergeHolder
+	    labelImage: (ResourceRetriever ToolbarIconLibrary mergeNextConflict24x24)
+	  )
+	 (MenuItem
+	    label: '-'
+	    isVisible: mergeHolder
+	  )
+	 (MenuItem
+	    label: 'Merge using Base'
+	    itemValue: listMenuMergeUsingBase
+	    isButton: true
+	    isVisible: mergeHolder
+	    labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBaseAll24x24)
+	  )
+	 (MenuItem
+	    label: 'Merge using A'
+	    itemValue: listMenuMergeUsingA
+	    isButton: true
+	    isVisible: mergeHolder
+	    labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingAAll24x24)
+	  )
+	 (MenuItem
+	    label: 'Merge using B'
+	    itemValue: listMenuMergeUsingB
+	    isButton: true
+	    isVisible: mergeHolder
+	    labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBAll24x24)
+	  )
+	 )
+	nil
+	nil
       )
 ! !
 
@@ -1694,7 +1696,7 @@
      (if this app is embedded in a subCanvas)."
 
     ^ #(
-        #diffsetHolder
+	#diffsetHolder
       ).
 
 ! !
@@ -1718,8 +1720,8 @@
 beTwoColumn: aBoolean
 
     aBoolean
-        ifTrue:[self beTwoColumn]
-        ifFalse:[self beSingleColumn]
+	ifTrue:[self beTwoColumn]
+	ifFalse:[self beSingleColumn]
 
     "Created: / 20-11-2009 / 20:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -1738,7 +1740,7 @@
 !
 
 diffset
-    
+
     ^self diffsetHolder value
 
     "Created: / 05-12-2009 / 11:53:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1756,7 +1758,7 @@
     | patchset |
     patchset := ChangeSet new.
     self diffset do:
-        [:diff|patchset add:diff versionA].
+	[:diff|patchset add:diff versionA].
     ^patchset
 
     "Created: / 05-12-2009 / 11:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1817,19 +1819,19 @@
 
 
     self isOneColumnBrowser ifTrue:[
-        list1App selection: entry
+	list1App selection: entry
     ] ifFalse:[
-        | parent |
-
-        parent := self diffsetHolderPrivate value diffs 
-                    detect:[:each|each diffs includes: entry] ifNone:[nil].
-        parent notNil ifTrue:[
-            list1App selection: parent.
-            list1App updateOutputGenerator.
-            list2App updateList.
-            list2App selection: entry.
-
-        ]
+	| parent |
+
+	parent := self diffsetHolderPrivate value diffs
+		    detect:[:each|each diffs includes: entry] ifNone:[nil].
+	parent notNil ifTrue:[
+	    list1App selection: parent.
+	    list1App updateOutputGenerator.
+	    list2App updateList.
+	    list2App selection: entry.
+
+	]
     ]
 
     "Created: / 22-10-2008 / 11:30:11 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -1866,15 +1868,15 @@
     sel := self selection.
 
     (sel isCollection and:[self isString not])
-        ifFalse:[^sel].
+	ifFalse:[^sel].
 
     selSize := 0.
-    obj := nil.        
+    obj := nil.
     sel do:
-        [:each|
-        selSize := selSize + 1.
-        selSize > 1 ifTrue:[^nil].
-        obj := each].
+	[:each|
+	selSize := selSize + 1.
+	selSize > 1 ifTrue:[^nil].
+	obj := each].
     ^obj
 
     "Created: / 10-11-2009 / 11:12:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1885,16 +1887,16 @@
 
 textDiff2Tool
     textDiff2App isNil ifTrue:[
-        textDiff2App := TextDiff2Tool new
-            labelAHolder: self versionALabelHolder;
-             textAHolder: self versionATextHolder;
-
-            labelBHolder: self versionBLabelHolder;
-             textBHolder: self versionBTextHolder;
-
-            codeAspectHolder: self codeAspectHolder;
-
-            yourself
+	textDiff2App := TextDiff2Tool new
+	    labelAHolder: self versionALabelHolder;
+	     textAHolder: self versionATextHolder;
+
+	    labelBHolder: self versionBLabelHolder;
+	     textBHolder: self versionBTextHolder;
+
+	    codeAspectHolder: self codeAspectHolder;
+
+	    yourself
     ].
     ^textDiff2App
 
@@ -1904,23 +1906,23 @@
 
 textDiff3Tool
     textDiff3App isNil ifTrue:[
-        textDiff3App := TextDiff3Tool new
-            mergeHolder: self mergeHolder;
-            mergeDataHolder: self mergeDataHolder;
-
-            labelCHolder: self versionBaseLabelHolder;
-             textCHolder: self versionBaseTextHolder;
-
-            labelBHolder: self versionBLabelHolder;
-             textBHolder: self versionBTextHolder;
-
-            labelAHolder: self versionALabelHolder;
-             textAHolder: self versionATextHolder;
-
-            codeAspectHolder: self codeAspectHolder;
-
-
-            yourself
+	textDiff3App := TextDiff3Tool new
+	    mergeHolder: self mergeHolder;
+	    mergeDataHolder: self mergeDataHolder;
+
+	    labelCHolder: self versionBaseLabelHolder;
+	     textCHolder: self versionBaseTextHolder;
+
+	    labelBHolder: self versionBLabelHolder;
+	     textBHolder: self versionBTextHolder;
+
+	    labelAHolder: self versionALabelHolder;
+	     textAHolder: self versionATextHolder;
+
+	    codeAspectHolder: self codeAspectHolder;
+
+
+	    yourself
     ].
     ^textDiff3App
 
@@ -1955,8 +1957,8 @@
 autoMoveToNextConflictHolder
 
     autoMoveToNextConflictHolder isNil ifTrue:[
-        autoMoveToNextConflictHolder := AspectAdaptor forAspect: #autoMoveToNextConflict.
-        autoMoveToNextConflictHolder subject: self class.
+	autoMoveToNextConflictHolder := AspectAdaptor forAspect: #autoMoveToNextConflict.
+	autoMoveToNextConflictHolder subject: self class.
     ].
     ^autoMoveToNextConflictHolder
 
@@ -1967,7 +1969,7 @@
     "return/create the 'canSaveHolder' value holder (automatically generated)"
 
     canSaveHolder isNil ifTrue:[
-        canSaveHolder := false asValue
+	canSaveHolder := false asValue
     ].
     ^ canSaveHolder
 
@@ -1978,7 +1980,7 @@
     "return/create the valueHolder 'codeAspectHolder'"
 
     codeAspectHolder isNil ifTrue:[
-        codeAspectHolder := ValueHolder with:nil "defaultValue here".
+	codeAspectHolder := ValueHolder with:nil "defaultValue here".
     ].
     ^ codeAspectHolder
 !
@@ -1987,8 +1989,8 @@
     "return/create the 'diffInfoHolder' value holder (automatically generated)"
 
     diffInfoHolder isNil ifTrue:[
-        diffInfoHolder := ValueHolder new.
-        diffInfoHolder addDependent:self.
+	diffInfoHolder := ValueHolder new.
+	diffInfoHolder addDependent:self.
     ].
     ^ diffInfoHolder
 !
@@ -1999,16 +2001,16 @@
     |oldValue newValue|
 
     diffInfoHolder notNil ifTrue:[
-        oldValue := diffInfoHolder value.
-        diffInfoHolder removeDependent:self.
+	oldValue := diffInfoHolder value.
+	diffInfoHolder removeDependent:self.
     ].
     diffInfoHolder := something.
     diffInfoHolder notNil ifTrue:[
-        diffInfoHolder addDependent:self.
+	diffInfoHolder addDependent:self.
     ].
     newValue := diffInfoHolder value.
     oldValue ~~ newValue ifTrue:[
-        self update:#value with:newValue from:diffInfoHolder.
+	self update:#value with:newValue from:diffInfoHolder.
     ].
 !
 
@@ -2023,8 +2025,8 @@
     "return/create the 'diffsetHolder' value holder (automatically generated)"
 
     diffsetHolder isNil ifTrue:[
-        diffsetHolder := ValueHolder new.
-        diffsetHolder addDependent:self.
+	diffsetHolder := ValueHolder new.
+	diffsetHolder addDependent:self.
     ].
     ^ diffsetHolder
 !
@@ -2035,16 +2037,16 @@
     |oldValue newValue|
 
     diffsetHolder notNil ifTrue:[
-        oldValue := diffsetHolder value.
-        diffsetHolder removeDependent:self.
+	oldValue := diffsetHolder value.
+	diffsetHolder removeDependent:self.
     ].
     diffsetHolder := aValueHolder.
     diffsetHolder notNil ifTrue:[
-        diffsetHolder addDependent:self.
+	diffsetHolder addDependent:self.
     ].
     newValue := diffsetHolder value.
     oldValue ~~ newValue ifTrue:[
-        self update:#value with:newValue from:diffsetHolder.
+	self update:#value with:newValue from:diffsetHolder.
     ].
 !
 
@@ -2052,7 +2054,7 @@
     "return/create the 'diffSetHolderPrivate' value holder (automatically generated)"
 
     diffsetHolderPrivate isNil ifTrue:[
-        diffsetHolderPrivate := ValueHolder with: (self diffsetHolder value).
+	diffsetHolderPrivate := ValueHolder with: (self diffsetHolder value).
     ].
     ^ diffsetHolderPrivate
 
@@ -2063,7 +2065,7 @@
     "return/create the valueHolder 'firstColSelectionHolder'"
 
     firstColSelectionHolder isNil ifTrue:[
-        firstColSelectionHolder := ValueHolder with:nil "defaultValue here".
+	firstColSelectionHolder := ValueHolder with:nil "defaultValue here".
     ].
     ^ firstColSelectionHolder
 !
@@ -2072,7 +2074,7 @@
     "return/create the 'hasDiffsetHolder' value holder (automatically generated)"
 
     hasDiffsetHolder isNil ifTrue:[
-        hasDiffsetHolder := false asValue
+	hasDiffsetHolder := false asValue
     ].
     ^ hasDiffsetHolder
 
@@ -2090,9 +2092,9 @@
     |holder|
 
     (holder := builder bindingAt:#hasSelectionHolder) isNil ifTrue:[
-        holder := (AspectAdaptor forAspect: #notEmptyOrNil)
-            subjectChannel: self selectionHolder.
-        builder aspectAt:#hasSelectionHolder put: holder
+	holder := (AspectAdaptor forAspect: #notEmptyOrNil)
+	    subjectChannel: self selectionHolder.
+	builder aspectAt:#hasSelectionHolder put: holder
     ].
     ^ holder.
 
@@ -2104,7 +2106,7 @@
     "return/create the 'highlightConflictsHolder' value holder (automatically generated)"
 
     highlightConflictsHolder isNil ifTrue:[
-        highlightConflictsHolder := true asValue
+	highlightConflictsHolder := true asValue
     ].
     ^ highlightConflictsHolder
 
@@ -2119,7 +2121,7 @@
 
 infoPanel
     infoPanel isNil ifTrue:[
-        infoPanel := InlineMessageDialog new
+	infoPanel := InlineMessageDialog new
     ].
     ^ infoPanel
 
@@ -2130,7 +2132,7 @@
     "return/create the 'labelSpecHolder' value holder (automatically generated)"
 
     labelSpecHolder isNil ifTrue:[
-        labelSpecHolder := nil asValue
+	labelSpecHolder := nil asValue
 
     ].
     ^ labelSpecHolder
@@ -2142,7 +2144,7 @@
     "return/create the 'listHolder' value holder (automatically generated)"
 
     listHolder isNil ifTrue:[
-        listHolder := ValueHolder new.
+	listHolder := ValueHolder new.
     ].
     ^ listHolder
 
@@ -2150,8 +2152,8 @@
 !
 
 listMenuHolder
-    diffMenuHolder isNil ifTrue:[ 
-"/        diffMenuHolder := ValueHolder with:self listMenu 
+    diffMenuHolder isNil ifTrue:[
+"/        diffMenuHolder := ValueHolder with:self listMenu
       diffMenuHolder := BlockValue with:[:v|self listMenu] argument: self mergeHolder
     ].
     ^ diffMenuHolder
@@ -2165,8 +2167,8 @@
     "return/create the 'mergeDataHolder' value holder (automatically generated)"
 
     mergeDataHolder isNil ifTrue:[
-        mergeDataHolder := ValueHolder new.
-        mergeDataHolder addDependent:self.
+	mergeDataHolder := ValueHolder new.
+	mergeDataHolder addDependent:self.
     ].
     ^ mergeDataHolder
 !
@@ -2177,16 +2179,16 @@
     |oldValue newValue|
 
     mergeDataHolder notNil ifTrue:[
-        oldValue := mergeDataHolder value.
-        mergeDataHolder removeDependent:self.
+	oldValue := mergeDataHolder value.
+	mergeDataHolder removeDependent:self.
     ].
     mergeDataHolder := something.
     mergeDataHolder notNil ifTrue:[
-        mergeDataHolder addDependent:self.
+	mergeDataHolder addDependent:self.
     ].
     newValue := mergeDataHolder value.
     oldValue ~~ newValue ifTrue:[
-        self update:#value with:newValue from:mergeDataHolder.
+	self update:#value with:newValue from:mergeDataHolder.
     ].
 !
 
@@ -2194,7 +2196,7 @@
     "return/create the 'mergeHolder' value holder (automatically generated)"
 
     mergeHolder isNil ifTrue:[
-        mergeHolder := ValueHolder with: false.
+	mergeHolder := ValueHolder with: false.
     ].
     ^ mergeHolder
 
@@ -2211,7 +2213,7 @@
     "return/create the 'mergeSavedHolder' value holder (automatically generated)"
 
     mergeSavedHolder isNil ifTrue:[
-        mergeSavedHolder := false asValue
+	mergeSavedHolder := false asValue
     ].
     ^ mergeSavedHolder
 
@@ -2221,7 +2223,7 @@
 nameAspect
 
     ^(AspectAdaptor forAspect: #name)
-        subjectChannel: self diffsetHolder
+	subjectChannel: self diffsetHolder
 
     "Created: / 01-11-2009 / 11:14:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -2230,7 +2232,7 @@
     <resource: #uiAspect>
 
     navigatorPanelSpecHolder isNil ifTrue:[
-        navigatorPanelSpecHolder := ValueHolder with: #twoColumnNavigatorSpec.
+	navigatorPanelSpecHolder := ValueHolder with: #twoColumnNavigatorSpec.
     ].
     ^ navigatorPanelSpecHolder.
 
@@ -2250,8 +2252,8 @@
 
     selectionHolder isNil ifTrue:[
 
-        selectionHolder := ValueHolder new.
-        selectionHolder addDependent:self.
+	selectionHolder := ValueHolder new.
+	selectionHolder addDependent:self.
     ].
     ^ selectionHolder
 
@@ -2262,7 +2264,7 @@
     "return/create the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)"
 
     showCopyrightMethodDiffsHolder isNil ifTrue:[
-        showCopyrightMethodDiffsHolder := true asValue
+	showCopyrightMethodDiffsHolder := true asValue
     ].
     ^ showCopyrightMethodDiffsHolder
 
@@ -2279,7 +2281,7 @@
     "return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
 
     showVersionMethodDiffsHolder isNil ifTrue:[
-        showVersionMethodDiffsHolder := true asValue.
+	showVersionMethodDiffsHolder := true asValue.
     ].
     ^ showVersionMethodDiffsHolder
 
@@ -2296,7 +2298,7 @@
     "return/create the 'singleSelectionHolder' value holder (automatically generated)"
 
     singleSelectionHolder isNil ifTrue:[
-        singleSelectionHolder := ValueHolder new.
+	singleSelectionHolder := ValueHolder new.
     ].
     ^ singleSelectionHolder
 
@@ -2307,7 +2309,7 @@
     "return/create the 'textDiffToolHolder' value holder (automatically generated)"
 
     textDiffToolHolder isNil ifTrue:[
-        textDiffToolHolder := ValueHolder with: self textDiff2Tool.
+	textDiffToolHolder := ValueHolder with: self textDiff2Tool.
     ].
     ^ textDiffToolHolder
 
@@ -2324,7 +2326,7 @@
     "return/create the 'textDiffToolWindowSpecHolder' value holder (automatically generated)"
 
     textDiffToolWindowSpecHolder isNil ifTrue:[
-        textDiffToolWindowSpecHolder := #windowSpecForEmbedding asValue.
+	textDiffToolWindowSpecHolder := #windowSpecForEmbedding asValue.
     ].
     ^ textDiffToolWindowSpecHolder
 
@@ -2341,7 +2343,7 @@
     "return/create the 'titleHolder' value holder (automatically generated)"
 
     titleHolder isNil ifTrue:[
-        titleHolder := ValueHolder with: 'Diff Browser'.
+	titleHolder := ValueHolder with: 'Diff Browser'.
     ].
     ^ titleHolder
 
@@ -2351,7 +2353,7 @@
 versionALabelHolder
 
     ^(AspectAdaptor forAspect: #versionALabel)
-        subjectChannel: self diffsetHolder
+	subjectChannel: self diffsetHolder
 
     "Created: / 09-04-2011 / 23:30:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -2359,7 +2361,7 @@
 versionATextHolder
 
     versionATextHolder isNil ifTrue:[
-        versionATextHolder := ValueHolder new
+	versionATextHolder := ValueHolder new
     ].
     ^versionATextHolder
 
@@ -2370,7 +2372,7 @@
 versionBLabelHolder
 
     ^(AspectAdaptor forAspect: #versionBLabel)
-        subjectChannel: self diffsetHolder
+	subjectChannel: self diffsetHolder
 
     "Created: / 09-04-2011 / 23:30:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -2378,7 +2380,7 @@
 versionBTextHolder
 
     versionBTextHolder isNil ifTrue:[
-        versionBTextHolder := ValueHolder new
+	versionBTextHolder := ValueHolder new
     ].
     ^versionBTextHolder
 
@@ -2389,7 +2391,7 @@
 versionBaseLabelHolder
 
     ^(AspectAdaptor forAspect: #versionBaseLabel)
-        subjectChannel: self diffsetHolder
+	subjectChannel: self diffsetHolder
 
     "Created: / 16-03-2012 / 15:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -2397,7 +2399,7 @@
 versionBaseTextHolder
 
     versionBaseTextHolder isNil ifTrue:[
-        versionBaseTextHolder := ValueHolder new
+	versionBaseTextHolder := ValueHolder new
     ].
     ^versionBaseTextHolder
 
@@ -2415,10 +2417,10 @@
     self mergeSavedHolder value: false.
     self canSaveHolder value: false.
     info notNil ifTrue:[
-        self infoPanel showProgressLabeled: (resources string:'Reading changesets') while: [
-            info read.
-            self diffset: info diffset.
-        ].
+	self infoPanel showProgressLabeled: (resources string:'Reading changesets') while: [
+	    info read.
+	    self diffset: info diffset.
+	].
     ].
 
     "Created: / 19-03-2012 / 23:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2431,21 +2433,21 @@
 
     ds := self diffsetHolder value.
     ds depth = 2 ifTrue:[
-        self beTwoColumn.
+	self beTwoColumn.
     ] ifFalse:[
-        self beSingleColumn.
+	self beSingleColumn.
     ].
     self hasDiffsetHolder value: ds notNil.
     self canSaveHolder value: self canSave.
     alreadyWarnedAboutUnsavedMerge := false.
 
 
-    self diffsetHolderPrivate value: 
-        (self isOneColumnBrowser 
-            ifTrue:[ds flattened sort]
-            ifFalse:[ds value sort]).
+    self diffsetHolderPrivate value:
+	(self isOneColumnBrowser
+	    ifTrue:[ds flattened sort]
+	    ifFalse:[ds value sort]).
     self autoMoveToNextConflictHolder value ifTrue:[
-        self menuMoveDownConflict.
+	self menuMoveDownConflict.
     ].
     self versionALabelHolder value: ds versionALabel.
     self versionBLabelHolder value: ds versionBLabel.
@@ -2463,7 +2465,7 @@
     self canSaveHolder value: self canSave.
     alreadyWarnedAboutUnsavedMerge := false.
     (self autoMoveToNextConflictHolder value and:[mergeData isMerged]) ifTrue:[
-        self menuMoveDownConflict
+	self menuMoveDownConflict
     ]
 
     "Created: / 17-01-2013 / 20:06:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2488,7 +2490,7 @@
     diffItem isNil ifTrue:[^self].
 
     self isMerge ifTrue:[
-        self mergeDataHolder setValue: (mergeData := diffItem mergeInfo).
+	self mergeDataHolder setValue: (mergeData := diffItem mergeInfo).
     ].
     self versionATextHolder setValue: diffItem versionAText.
     self versionBTextHolder setValue: diffItem versionBText.
@@ -2499,12 +2501,12 @@
     self versionBTextHolder changed: #value.
     self versionBaseTextHolder changed: #value.
     self isMerge ifTrue:[
-        self mergeDataHolder changed: #value.
-        "Maybe, there was no merge data beforehand. In that case,
-         update"
-        mergeData isNil ifTrue:[
-            diffItem mergeInfo: (self mergeDataHolder value).
-        ]
+	self mergeDataHolder changed: #value.
+	"Maybe, there was no merge data beforehand. In that case,
+	 update"
+	mergeData isNil ifTrue:[
+	    diffItem mergeInfo: (self mergeDataHolder value).
+	]
     ]
 
     "Created: / 22-10-2008 / 11:29:24 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -2514,29 +2516,29 @@
 update: aspect with: param from: sender
 
     sender == selectionHolder ifTrue:[
-        self selectionChanged.
-        ^self.
+	self selectionChanged.
+	^self.
     ].
 
     sender == diffsetHolder ifTrue:[
-        self diffsetChanged.
-        ^self.
+	self diffsetChanged.
+	^self.
     ].
 
     sender == diffInfoHolder ifTrue:[
-        self diffInfoChanged.
-        ^self.
+	self diffInfoChanged.
+	^self.
     ].
 
     sender == mergeDataHolder ifTrue:[
-        self mergeDataHolderChanged.
-        ^self.
+	self mergeDataHolderChanged.
+	^self.
     ].
 
     sender == mergeData ifTrue:[
-        "Resolution has been changed..."    
-        self mergeDataChanged.
-        ^self.
+	"Resolution has been changed..."
+	self mergeDataChanged.
+	^self.
     ].
 
     ^super update: aspect with: param from: sender
@@ -2554,46 +2556,46 @@
     loadA disable.
     loadB := menu atNameKey:#LoadVersionB.
     loadB disable.
-    (diffs select:[:e | true ]) do:[:diff | 
-        diff versionA 
-            ifNotNil:[
-                loadA enable.
-                loadA label:'Load version ' , diff versionALabel
-            ].
-        diff versionB 
-            ifNotNil:[
-                loadB
-                    label:'Load version ' , diff versionBLabel;
-                    enable
-            ].
+    (diffs select:[:e | true ]) do:[:diff |
+	diff versionA
+	    ifNotNil:[
+		loadA enable.
+		loadA label:'Load version ' , diff versionALabel
+	    ].
+	diff versionB
+	    ifNotNil:[
+		loadB
+		    label:'Load version ' , diff versionBLabel;
+		    enable
+	    ].
     ].
 !
 
 updateViews
 
     (self diffInfo notNil and:[self diffInfo isDiff3]) ifTrue:[
-        self diffInfo isMerge ifTrue:[
-            self mergeHolder value: true.
-            self labelSpecHolder value: #labelMergeSpec.
-            self labelHeight: 120.
-        ] ifFalse:[
-            self mergeHolder value: false.
-            self labelSpecHolder value: #labelDiff3Spec.
-            self labelHeight: 90.
-        ].
-        self textDiffToolHolder value isDiff3 ifFalse:[
-            textDiffToolHolder value: self textDiff3Tool.
-        ].
+	self diffInfo isMerge ifTrue:[
+	    self mergeHolder value: true.
+	    self labelSpecHolder value: #labelMergeSpec.
+	    self labelHeight: 120.
+	] ifFalse:[
+	    self mergeHolder value: false.
+	    self labelSpecHolder value: #labelDiff3Spec.
+	    self labelHeight: 90.
+	].
+	self textDiffToolHolder value isDiff3 ifFalse:[
+	    textDiffToolHolder value: self textDiff3Tool.
+	].
 
 
     ] ifFalse:[
-        self mergeHolder value: false.
-        self labelSpecHolder value: #labelDiff2Spec.
-        self labelHeight: 60.
-
-        self textDiffToolHolder value isDiff2 ifFalse:[
-            textDiffToolHolder value: self textDiff2Tool.
-        ].
+	self mergeHolder value: false.
+	self labelSpecHolder value: #labelDiff2Spec.
+	self labelHeight: 60.
+
+	self textDiffToolHolder value isDiff2 ifFalse:[
+	    textDiffToolHolder value: self textDiff2Tool.
+	].
     ].
 
     "Created: / 20-03-2012 / 10:21:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2661,8 +2663,8 @@
     dlg := OpenDialog new.
     info := LastDiffInfo.
     info isNil ifFalse:[
-        info := ChangeSetDiffInfo new.
-        info specMerge: ChangeSetSpec changeSet
+	info := ChangeSetDiffInfo new.
+	info specMerge: ChangeSetSpec changeSet
     ].
     dlg diffInfo: info.
     dlg open ifFalse:[^self].
@@ -2673,9 +2675,11 @@
     "Modified: / 18-09-2012 / 11:37:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+
+
 fileMenuOpenOnDiffInfo: info
 
-    LastDiffInfo := info.    
+    LastDiffInfo := info.
     self diffInfoHolder value: info
 
     "Created: / 20-03-2012 / 00:04:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2740,24 +2744,24 @@
     | items |
     items := self selection collect:[:e|e]. "/must do collect as selection is an iterator..."
     items size == 1 ifTrue:[
-        | item cls sel |
-        item:= items anElement.
-        cls := item changeClass.
-        sel := item changeSelector.
-        cls notNil ifTrue:[
-            sel notNil ifTrue:[
-                UserPreferences current systemBrowserClass
-                    openInClass:cls selector:sel
-
-            ] ifFalse:[
-                UserPreferences current systemBrowserClass
-                    browseClass: cls
-            ]
-        ] ifFalse:[
-            Dialog warn: (self class resources at: 'Oops, class is gone')
-        ]
+	| item cls sel |
+	item:= items anElement.
+	cls := item changeClass.
+	sel := item changeSelector.
+	cls notNil ifTrue:[
+	    sel notNil ifTrue:[
+		UserPreferences systemBrowserClass
+		    openInClass:cls selector:sel
+
+	    ] ifFalse:[
+		UserPreferences systemBrowserClass
+		    browseClass: cls
+	    ]
+	] ifFalse:[
+	    Dialog warn: (self class resources at: 'Oops, class is gone')
+	]
     ] ifFalse:[
-        Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool>>listMenuBrowse)'.                        
+	Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool>>listMenuBrowse)'.
     ]
 
     "Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2773,7 +2777,7 @@
 listMenuLoadVersionA
 
     self selection do:
-        [:diff|diff versionA apply]
+	[:diff|diff versionA apply]
 
     "Modified: / 09-12-2009 / 23:09:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -2781,7 +2785,7 @@
 listMenuLoadVersionB
 
     self selection do:
-        [:diff|diff versionB apply]
+	[:diff|diff versionB apply]
 
     "Modified: / 09-12-2009 / 23:10:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -2807,29 +2811,29 @@
 listMenuOpenInExternal: command
 
     (OperatingSystem canExecuteCommand: command) ifFalse:[
-        Dialog warn: 'Sorry. ', command , ' is not installed or not in PATH'
+	Dialog warn: 'Sorry. ', command , ' is not installed or not in PATH'
     ].
 
     self selection do:[:item|
-        | base a b cmd |
-        item versionBase notNil ifTrue:[
-            base := Filename newTemporary.
-            base writingFileDo:[:s|s nextPutAll: item versionBase source].
-        ].
-        a := Filename newTemporary.
-        a writingFileDo:[:s|s nextPutAll: item versionA source].
-        b := Filename newTemporary.
-        b writingFileDo:[:s|s nextPutAll: item versionB source].
-
-        base isNil ifTrue:[
-            cmd := '%1 %2 %3' bindWith: command with: a pathName with: b pathName
-        ] ifFalse:[
-            cmd := '%1 %4 %2 %3 ' bindWith: command with: a pathName with: b pathName with: base pathName.
-        ].
-        [ OperatingSystem executeCommand: cmd.
-        a remove.
-        b remove.
-        base notNil ifTrue:[base remove]. ] fork
+	| base a b cmd |
+	item versionBase notNil ifTrue:[
+	    base := Filename newTemporary.
+	    base writingFileDo:[:s|s nextPutAll: item versionBase source].
+	].
+	a := Filename newTemporary.
+	a writingFileDo:[:s|s nextPutAll: item versionA source].
+	b := Filename newTemporary.
+	b writingFileDo:[:s|s nextPutAll: item versionB source].
+
+	base isNil ifTrue:[
+	    cmd := '%1 %2 %3' bindWith: command with: a pathName with: b pathName
+	] ifFalse:[
+	    cmd := '%1 %4 %2 %3 ' bindWith: command with: a pathName with: b pathName with: base pathName.
+	].
+	[ OperatingSystem executeCommand: cmd.
+	a remove.
+	b remove.
+	base notNil ifTrue:[base remove]. ] fork
     ]
 
     "Modified: / 17-03-2012 / 08:55:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2890,8 +2894,8 @@
 
 labelHeight: height
     (labelsView notNil and:[navigatorAndDiffPanelView notNil]) ifTrue:[
-        labelsView layout: (labelsView layout copy bottomOffset: height).
-        navigatorAndDiffPanelView layout: (navigatorAndDiffPanelView layout copy topOffset: height).
+	labelsView layout: (labelsView layout copy bottomOffset: height).
+	navigatorAndDiffPanelView layout: (navigatorAndDiffPanelView layout copy topOffset: height).
     ].
 
     "Created: / 17-01-2013 / 23:38:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2904,8 +2908,8 @@
 
     ^true
 
-    "^[self selection notNil 
-        and:[self selection versionA notNil]]"
+    "^[self selection notNil
+	and:[self selection versionA notNil]]"
 
     "Created: / 02-11-2009 / 18:32:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 21-11-2009 / 18:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2963,18 +2967,18 @@
 
     "/Warn about unsaved merge..."
     (alreadyWarnedAboutUnsavedMerge not and:[self canSave and:[mergeSavedHolder value not]]) ifTrue:[
-        alreadyWarnedAboutUnsavedMerge := true.
-        self infoPanel 
-            reset;
-            beInformation;
-            message: (self resources string:'Output file (merge) has not been saved. Save?');
-            addButtonWithLabel: (self resources string:'Save') action: [
-                self fileMenuSave.
-                self closeDownViews.
-            ];
-            addButtonWithLabel: (self resources string:'Cancel') action:[self infoPanel hide];
-            show.
-        ^self.
+	alreadyWarnedAboutUnsavedMerge := true.
+	self infoPanel
+	    reset;
+	    beInformation;
+	    message: (self resources string:'Output file (merge) has not been saved. Save?');
+	    addButtonWithLabel: (self resources string:'Save') action: [
+		self fileMenuSave.
+		self closeDownViews.
+	    ];
+	    addButtonWithLabel: (self resources string:'Cancel') action:[self infoPanel hide];
+	    show.
+	^self.
     ].
     self closeDownViews.
 
@@ -3061,210 +3065,210 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: windowSpec
-        window: 
+	name: windowSpec
+	window:
        (WindowSpec
-          label: 'Open...'
-          name: 'Open...'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 640 457)
-        )
-        component: 
+	  label: 'Open...'
+	  name: 'Open...'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 640 457)
+	)
+	component:
        (SpecCollection
-          collection: (
-           (VerticalPanelViewSpec
-              name: 'VerticalPanel1'
-              layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
-              horizontalLayout: fit
-              verticalLayout: top
-              horizontalSpace: 3
-              verticalSpace: 3
-              component: 
-             (SpecCollection
-                collection: (
-                 (ViewSpec
-                    name: 'B'
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (UISubSpecification
-                          name: 'SubSpecification2'
-                          layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-                          minorKey: versionBLabelSpec
-                        )
-                       (SubCanvasSpec
-                          name: 'SubCanvas1'
-                          layout: (LayoutFrame 30 0 30 0 0 1 0 1)
-                          level: 0
-                          hasHorizontalScrollBar: false
-                          hasVerticalScrollBar: false
-                          majorKey: #'Tools::ChangeSetSelectionDialog'
-                          minorKey: windowSpecForEmbedding
-                          subAspectHolders: 
-                         (Array
-                            
-                           (SubChannelInfoSpec
-                              subAspect: specHolder
-                              aspect: changesetSpecBHolder
-                            )
-                          )
-                          createNewApplication: true
-                          createNewBuilder: true
-                        )
-                       )
-                     
-                    )
-                    extent: (Point 640 99)
-                  )
-                 (ViewSpec
-                    name: 'A'
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (UISubSpecification
-                          name: 'SubSpecification1'
-                          layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-                          minorKey: versionALabelSpec
-                        )
-                       (SubCanvasSpec
-                          name: 'ChangesetASpec'
-                          layout: (LayoutFrame 30 0 30 0 0 1 0 1)
-                          level: 0
-                          hasHorizontalScrollBar: false
-                          hasVerticalScrollBar: false
-                          majorKey: #'Tools::ChangeSetSelectionDialog'
-                          minorKey: windowSpecForEmbedding
-                          subAspectHolders: 
-                         (Array
-                            
-                           (SubChannelInfoSpec
-                              subAspect: specHolder
-                              aspect: changesetSpecAHolder
-                            )
-                          )
-                          createNewApplication: true
-                          createNewBuilder: true
-                        )
-                       )
-                     
-                    )
-                    extent: (Point 640 99)
-                  )
-                 (ViewSpec
-                    name: 'Base'
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (UISubSpecification
-                          name: 'SubSpecification3'
-                          layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-                          minorKey: versionBaseLabelSpec
-                        )
-                       (SubCanvasSpec
-                          name: 'SubCanvas2'
-                          layout: (LayoutFrame 30 0 30 0 0 1 0 1)
-                          level: 0
-                          hasHorizontalScrollBar: false
-                          hasVerticalScrollBar: false
-                          majorKey: #'Tools::ChangeSetSelectionDialog'
-                          minorKey: windowSpecForEmbedding
-                          subAspectHolders: 
-                         (Array
-                            
-                           (SubChannelInfoSpec
-                              subAspect: enabledHolder
-                              aspect: changesetSpecBaseEnabledHolder
-                            ) 
-                           (SubChannelInfoSpec
-                              subAspect: specHolder
-                              aspect: changesetSpecBaseHolder
-                            )
-                          )
-                          createNewApplication: true
-                          createNewBuilder: true
-                        )
-                       )
-                     
-                    )
-                    extent: (Point 640 98)
-                  )
-                 (ViewSpec
-                    name: 'Merge'
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (UISubSpecification
-                          name: 'SubSpecification4'
-                          layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-                          minorKey: versionMergedLabelSpec
-                        )
-                       (SubCanvasSpec
-                          name: 'SubCanvas3'
-                          layout: (LayoutFrame 30 0 30 0 0 1 -25 1)
-                          level: 0
-                          hasHorizontalScrollBar: false
-                          hasVerticalScrollBar: false
-                          majorKey: #'Tools::ChangeSetSelectionDialog'
-                          minorKey: windowSpecForEmbedding
-                          subAspectHolders: 
-                         (Array
-                            
-                           (SubChannelInfoSpec
-                              subAspect: enabledHolder
-                              aspect: changesetSpecMergedEnabledHolder
-                            ) 
-                           (SubChannelInfoSpec
-                              subAspect: specHolder
-                              aspect: changesetSpecMergedHolder
-                            )
-                          )
-                          createNewApplication: true
-                          createNewBuilder: true
-                        )
-                       )
-                     
-                    )
-                    extent: (Point 640 123)
-                  )
-                 )
-               
-              )
-            )
-           (HorizontalPanelViewSpec
-              name: 'ButtonPanel'
-              layout: (LayoutFrame 3 0 -30 1 -3 1 0 1)
-              horizontalLayout: right
-              verticalLayout: center
-              horizontalSpace: 3
-              verticalSpace: 3
-              reverseOrderIfOKAtLeft: true
-              component: 
-             (SpecCollection
-                collection: (
-                 (ActionButtonSpec
-                    label: 'OK'
-                    name: 'Button1'
-                    translateLabel: true
-                    model: doAccept
-                    enableChannel: doAcceptEnabled
-                    extent: (Point 125 22)
-                  )
-                 (ActionButtonSpec
-                    label: 'Cancel'
-                    name: 'Button2'
-                    translateLabel: true
-                    model: doCancel
-                    extent: (Point 125 22)
-                  )
-                 )
-               
-              )
-            )
-           )
-         
-        )
+	  collection: (
+	   (VerticalPanelViewSpec
+	      name: 'VerticalPanel1'
+	      layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
+	      horizontalLayout: fit
+	      verticalLayout: top
+	      horizontalSpace: 3
+	      verticalSpace: 3
+	      component:
+	     (SpecCollection
+		collection: (
+		 (ViewSpec
+		    name: 'B'
+		    component:
+		   (SpecCollection
+		      collection: (
+		       (UISubSpecification
+			  name: 'SubSpecification2'
+			  layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+			  minorKey: versionBLabelSpec
+			)
+		       (SubCanvasSpec
+			  name: 'SubCanvas1'
+			  layout: (LayoutFrame 30 0 30 0 0 1 0 1)
+			  level: 0
+			  hasHorizontalScrollBar: false
+			  hasVerticalScrollBar: false
+			  majorKey: #'Tools::ChangeSetSelectionDialog'
+			  minorKey: windowSpecForEmbedding
+			  subAspectHolders:
+			 (Array
+
+			   (SubChannelInfoSpec
+			      subAspect: specHolder
+			      aspect: changesetSpecBHolder
+			    )
+			  )
+			  createNewApplication: true
+			  createNewBuilder: true
+			)
+		       )
+
+		    )
+		    extent: (Point 640 99)
+		  )
+		 (ViewSpec
+		    name: 'A'
+		    component:
+		   (SpecCollection
+		      collection: (
+		       (UISubSpecification
+			  name: 'SubSpecification1'
+			  layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+			  minorKey: versionALabelSpec
+			)
+		       (SubCanvasSpec
+			  name: 'ChangesetASpec'
+			  layout: (LayoutFrame 30 0 30 0 0 1 0 1)
+			  level: 0
+			  hasHorizontalScrollBar: false
+			  hasVerticalScrollBar: false
+			  majorKey: #'Tools::ChangeSetSelectionDialog'
+			  minorKey: windowSpecForEmbedding
+			  subAspectHolders:
+			 (Array
+
+			   (SubChannelInfoSpec
+			      subAspect: specHolder
+			      aspect: changesetSpecAHolder
+			    )
+			  )
+			  createNewApplication: true
+			  createNewBuilder: true
+			)
+		       )
+
+		    )
+		    extent: (Point 640 99)
+		  )
+		 (ViewSpec
+		    name: 'Base'
+		    component:
+		   (SpecCollection
+		      collection: (
+		       (UISubSpecification
+			  name: 'SubSpecification3'
+			  layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+			  minorKey: versionBaseLabelSpec
+			)
+		       (SubCanvasSpec
+			  name: 'SubCanvas2'
+			  layout: (LayoutFrame 30 0 30 0 0 1 0 1)
+			  level: 0
+			  hasHorizontalScrollBar: false
+			  hasVerticalScrollBar: false
+			  majorKey: #'Tools::ChangeSetSelectionDialog'
+			  minorKey: windowSpecForEmbedding
+			  subAspectHolders:
+			 (Array
+
+			   (SubChannelInfoSpec
+			      subAspect: enabledHolder
+			      aspect: changesetSpecBaseEnabledHolder
+			    )
+			   (SubChannelInfoSpec
+			      subAspect: specHolder
+			      aspect: changesetSpecBaseHolder
+			    )
+			  )
+			  createNewApplication: true
+			  createNewBuilder: true
+			)
+		       )
+
+		    )
+		    extent: (Point 640 98)
+		  )
+		 (ViewSpec
+		    name: 'Merge'
+		    component:
+		   (SpecCollection
+		      collection: (
+		       (UISubSpecification
+			  name: 'SubSpecification4'
+			  layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+			  minorKey: versionMergedLabelSpec
+			)
+		       (SubCanvasSpec
+			  name: 'SubCanvas3'
+			  layout: (LayoutFrame 30 0 30 0 0 1 -25 1)
+			  level: 0
+			  hasHorizontalScrollBar: false
+			  hasVerticalScrollBar: false
+			  majorKey: #'Tools::ChangeSetSelectionDialog'
+			  minorKey: windowSpecForEmbedding
+			  subAspectHolders:
+			 (Array
+
+			   (SubChannelInfoSpec
+			      subAspect: enabledHolder
+			      aspect: changesetSpecMergedEnabledHolder
+			    )
+			   (SubChannelInfoSpec
+			      subAspect: specHolder
+			      aspect: changesetSpecMergedHolder
+			    )
+			  )
+			  createNewApplication: true
+			  createNewBuilder: true
+			)
+		       )
+
+		    )
+		    extent: (Point 640 123)
+		  )
+		 )
+
+	      )
+	    )
+	   (HorizontalPanelViewSpec
+	      name: 'ButtonPanel'
+	      layout: (LayoutFrame 3 0 -30 1 -3 1 0 1)
+	      horizontalLayout: right
+	      verticalLayout: center
+	      horizontalSpace: 3
+	      verticalSpace: 3
+	      reverseOrderIfOKAtLeft: true
+	      component:
+	     (SpecCollection
+		collection: (
+		 (ActionButtonSpec
+		    label: 'OK'
+		    name: 'Button1'
+		    translateLabel: true
+		    model: doAccept
+		    enableChannel: doAcceptEnabled
+		    extent: (Point 125 22)
+		  )
+		 (ActionButtonSpec
+		    label: 'Cancel'
+		    name: 'Button2'
+		    translateLabel: true
+		    model: doCancel
+		    extent: (Point 125 22)
+		  )
+		 )
+
+	      )
+	    )
+	   )
+
+	)
       )
 !
 
@@ -3283,129 +3287,129 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: windowSpec
-        window: 
+	name: windowSpec
+	window:
        (WindowSpec
-          label: 'Open...'
-          name: 'Open...'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 640 130)
-        )
-        component: 
+	  label: 'Open...'
+	  name: 'Open...'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 640 130)
+	)
+	component:
        (SpecCollection
-          collection: (
-           (VariableHorizontalPanelSpec
-              name: 'ChangeSetsSpecPanel'
-              layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
-              barWidth: 3
-              showHandle: true
-              component: 
-             (SpecCollection
-                collection: (
-                 (ViewSpec
-                    name: 'A'
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (UISubSpecification
-                          name: 'SubSpecification1'
-                          layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-                          minorKey: versionALabelSpec
-                        )
-                       (SubCanvasSpec
-                          name: 'ChangesetASpec'
-                          layout: (LayoutFrame 0 0 30 0 0 1 0 1)
-                          hasHorizontalScrollBar: false
-                          hasVerticalScrollBar: false
-                          majorKey: #'Tools::ChangeSetSelectionDialog'
-                          minorKey: windowSpecForEmbedding
-                          subAspectHolders: 
-                         (Array
-                            
-                           (SubChannelInfoSpec
-                              subAspect: specHolder
-                              aspect: changesetSpecAHolder
-                            )
-                          )
-                          createNewApplication: true
-                          createNewBuilder: true
-                        )
-                       )
-                     
-                    )
-                  )
-                 (ViewSpec
-                    name: 'B'
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (UISubSpecification
-                          name: 'SubSpecification2'
-                          layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-                          minorKey: versionBLabelSpec
-                        )
-                       (SubCanvasSpec
-                          name: 'SubCanvas1'
-                          layout: (LayoutFrame 0 0 30 0 0 1 0 1)
-                          hasHorizontalScrollBar: false
-                          hasVerticalScrollBar: false
-                          majorKey: #'Tools::ChangeSetSelectionDialog'
-                          minorKey: windowSpecForEmbedding
-                          subAspectHolders: 
-                         (Array
-                            
-                           (SubChannelInfoSpec
-                              subAspect: specHolder
-                              aspect: changesetSpecBHolder
-                            )
-                          )
-                          createNewApplication: true
-                          createNewBuilder: true
-                        )
-                       )
-                     
-                    )
-                  )
-                 )
-               
-              )
-              handles: (Any 0.5 1.0)
-            )
-           (HorizontalPanelViewSpec
-              name: 'ButtonPanel'
-              layout: (LayoutFrame 3 0 -30 1 -3 1 0 1)
-              horizontalLayout: right
-              verticalLayout: center
-              horizontalSpace: 3
-              verticalSpace: 3
-              reverseOrderIfOKAtLeft: true
-              component: 
-             (SpecCollection
-                collection: (
-                 (ActionButtonSpec
-                    label: 'OK'
-                    name: 'Button1'
-                    translateLabel: true
-                    model: doAccept
-                    enableChannel: doAcceptEnabled
-                    extent: (Point 125 22)
-                  )
-                 (ActionButtonSpec
-                    label: 'Cancel'
-                    name: 'Button2'
-                    translateLabel: true
-                    model: doCancel
-                    extent: (Point 125 22)
-                  )
-                 )
-               
-              )
-            )
-           )
-         
-        )
+	  collection: (
+	   (VariableHorizontalPanelSpec
+	      name: 'ChangeSetsSpecPanel'
+	      layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
+	      barWidth: 3
+	      showHandle: true
+	      component:
+	     (SpecCollection
+		collection: (
+		 (ViewSpec
+		    name: 'A'
+		    component:
+		   (SpecCollection
+		      collection: (
+		       (UISubSpecification
+			  name: 'SubSpecification1'
+			  layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+			  minorKey: versionALabelSpec
+			)
+		       (SubCanvasSpec
+			  name: 'ChangesetASpec'
+			  layout: (LayoutFrame 0 0 30 0 0 1 0 1)
+			  hasHorizontalScrollBar: false
+			  hasVerticalScrollBar: false
+			  majorKey: #'Tools::ChangeSetSelectionDialog'
+			  minorKey: windowSpecForEmbedding
+			  subAspectHolders:
+			 (Array
+
+			   (SubChannelInfoSpec
+			      subAspect: specHolder
+			      aspect: changesetSpecAHolder
+			    )
+			  )
+			  createNewApplication: true
+			  createNewBuilder: true
+			)
+		       )
+
+		    )
+		  )
+		 (ViewSpec
+		    name: 'B'
+		    component:
+		   (SpecCollection
+		      collection: (
+		       (UISubSpecification
+			  name: 'SubSpecification2'
+			  layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+			  minorKey: versionBLabelSpec
+			)
+		       (SubCanvasSpec
+			  name: 'SubCanvas1'
+			  layout: (LayoutFrame 0 0 30 0 0 1 0 1)
+			  hasHorizontalScrollBar: false
+			  hasVerticalScrollBar: false
+			  majorKey: #'Tools::ChangeSetSelectionDialog'
+			  minorKey: windowSpecForEmbedding
+			  subAspectHolders:
+			 (Array
+
+			   (SubChannelInfoSpec
+			      subAspect: specHolder
+			      aspect: changesetSpecBHolder
+			    )
+			  )
+			  createNewApplication: true
+			  createNewBuilder: true
+			)
+		       )
+
+		    )
+		  )
+		 )
+
+	      )
+	      handles: (Any 0.5 1.0)
+	    )
+	   (HorizontalPanelViewSpec
+	      name: 'ButtonPanel'
+	      layout: (LayoutFrame 3 0 -30 1 -3 1 0 1)
+	      horizontalLayout: right
+	      verticalLayout: center
+	      horizontalSpace: 3
+	      verticalSpace: 3
+	      reverseOrderIfOKAtLeft: true
+	      component:
+	     (SpecCollection
+		collection: (
+		 (ActionButtonSpec
+		    label: 'OK'
+		    name: 'Button1'
+		    translateLabel: true
+		    model: doAccept
+		    enableChannel: doAcceptEnabled
+		    extent: (Point 125 22)
+		  )
+		 (ActionButtonSpec
+		    label: 'Cancel'
+		    name: 'Button2'
+		    translateLabel: true
+		    model: doCancel
+		    extent: (Point 125 22)
+		  )
+		 )
+
+	      )
+	    )
+	   )
+
+	)
       )
 
     "Modified: / 06-07-2011 / 11:32:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3428,39 +3432,39 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: versionALabelSpec
-        window: 
+	name: versionALabelSpec
+	window:
        (WindowSpec
-          label: 'Version A'
-          name: 'Changeset A'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version A'
+	  name: 'Changeset A'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'versionA24x24'
-              name: 'VersionAIcon'
-              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Version A (working copy)'
-              name: 'VersionALabel'
-              layout: (LayoutFrame 30 0 5 0 0 1 0 1)
-              translateLabel: true
-              resizeForLabel: true
-              adjust: left
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'versionA24x24'
+	      name: 'VersionAIcon'
+	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Version A (working copy)'
+	      name: 'VersionALabel'
+	      layout: (LayoutFrame 30 0 5 0 0 1 0 1)
+	      translateLabel: true
+	      resizeForLabel: true
+	      adjust: left
+	    )
+	   )
+
+	)
       )
 
     "Modified: / 19-03-2012 / 22:15:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3480,41 +3484,41 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: versionBLabelSpec
-        window: 
+	name: versionBLabelSpec
+	window:
        (WindowSpec
-          label: 'Version B'
-          name: 'Changeset B'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 100.0 90.5882352941177 60.0)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version B'
+	  name: 'Changeset B'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 100.0 90.5882352941177 60.0)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'versionB24x24'
-              name: 'VersionBIcon'
-              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Version B (to be merged)'
-              name: 'VersionBLabel'
-              layout: (LayoutFrame 30 0 5 0 97 0 0 1)
-              translateLabel: true
-              resizeForLabel: true
-              adjust: left
-              useDynamicPreferredWidth: true
-              usePreferredWidth: true
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'versionB24x24'
+	      name: 'VersionBIcon'
+	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Version B (to be merged)'
+	      name: 'VersionBLabel'
+	      layout: (LayoutFrame 30 0 5 0 97 0 0 1)
+	      translateLabel: true
+	      resizeForLabel: true
+	      adjust: left
+	      useDynamicPreferredWidth: true
+	      usePreferredWidth: true
+	    )
+	   )
+
+	)
       )
 
     "Modified: / 19-03-2012 / 22:15:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3534,48 +3538,48 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: versionBaseLabelSpec
-        window: 
+	name: versionBaseLabelSpec
+	window:
        (WindowSpec
-          label: 'Version B'
-          name: 'Version B'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 57.2182803082322 81.2832837415122 91.0872053101396)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Version B'
+	  name: 'Version B'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 57.2182803082322 81.2832837415122 91.0872053101396)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'versionBase24x24'
-              name: 'VersionBaseIcon'
-              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Base'
-              name: 'VersionBLabel'
-              layout: (LayoutFrame 30 0 5 0 68 0 0 1)
-              translateLabel: true
-              resizeForLabel: true
-              adjust: left
-              useDynamicPreferredWidth: true
-              usePreferredWidth: true
-            )
-           (CheckBoxSpec
-              label: ''
-              name: 'CheckBox1'
-              layout: (LayoutFrame -30 1 0 0 0 1 0 1)
-              model: changesetSpecBaseEnabledHolder
-              translateLabel: true
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'versionBase24x24'
+	      name: 'VersionBaseIcon'
+	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Base'
+	      name: 'VersionBLabel'
+	      layout: (LayoutFrame 30 0 5 0 68 0 0 1)
+	      translateLabel: true
+	      resizeForLabel: true
+	      adjust: left
+	      useDynamicPreferredWidth: true
+	      usePreferredWidth: true
+	    )
+	   (CheckBoxSpec
+	      label: ''
+	      name: 'CheckBox1'
+	      layout: (LayoutFrame -30 1 0 0 0 1 0 1)
+	      model: changesetSpecBaseEnabledHolder
+	      translateLabel: true
+	    )
+	   )
+
+	)
       )
 !
 
@@ -3593,48 +3597,48 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
      #(FullSpec
-        name: versionMergedLabelSpec
-        window: 
+	name: versionMergedLabelSpec
+	window:
        (WindowSpec
-          label: 'Merge'
-          name: 'Merge'
-          min: (Point 10 10)
-          bounds: (Rectangle 0 0 300 30)
-          backgroundColor: (Color 92.6909285114824 62.388036926833 93.2265201800565)
-          forceRecursiveBackground: true
-        )
-        component: 
+	  label: 'Merge'
+	  name: 'Merge'
+	  min: (Point 10 10)
+	  bounds: (Rectangle 0 0 300 30)
+	  backgroundColor: (Color 92.6909285114824 62.388036926833 93.2265201800565)
+	  forceRecursiveBackground: true
+	)
+	component:
        (SpecCollection
-          collection: (
-           (LabelSpec
-              label: 'versionMerged24x24'
-              name: 'VersionMergedIcon'
-              layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
-              hasCharacterOrientedLabel: false
-              translateLabel: true
-            )
-           (LabelSpec
-              label: 'Merge'
-              name: 'VersionBLabel'
-              layout: (LayoutFrame 30 0 5 0 68 0 0 1)
-              translateLabel: true
-              resizeForLabel: true
-              adjust: left
-              useDynamicPreferredWidth: true
-              usePreferredWidth: true
-            )
-           (CheckBoxSpec
-              label: ''
-              name: 'CheckBox1'
-              layout: (LayoutFrame -30 1 0 0 0 1 0 1)
-              model: changesetSpecMergedEnabledHolder
-              translateLabel: true
-            )
-           )
-         
-        )
+	  collection: (
+	   (LabelSpec
+	      label: 'versionMerged24x24'
+	      name: 'VersionMergedIcon'
+	      layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
+	      hasCharacterOrientedLabel: false
+	      translateLabel: true
+	    )
+	   (LabelSpec
+	      label: 'Merge'
+	      name: 'VersionBLabel'
+	      layout: (LayoutFrame 30 0 5 0 68 0 0 1)
+	      translateLabel: true
+	      resizeForLabel: true
+	      adjust: left
+	      useDynamicPreferredWidth: true
+	      usePreferredWidth: true
+	    )
+	   (CheckBoxSpec
+	      label: ''
+	      name: 'CheckBox1'
+	      layout: (LayoutFrame -30 1 0 0 0 1 0 1)
+	      model: changesetSpecMergedEnabledHolder
+	      translateLabel: true
+	    )
+	   )
+
+	)
       )
 
     "Modified: / 19-03-2012 / 23:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3730,7 +3734,7 @@
     "Created: / 01-08-2012 / 15:38:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-diffInfo    
+diffInfo
     "Returns a ChangeSetDiffInfo based on current data"
 
     | info |
@@ -3738,10 +3742,10 @@
     info specA: self changeSetASpec.
     info specB: self changeSetBSpec.
     self changesetSpecBaseEnabledHolder value ifTrue:[
-        info specBase: self changeSetBaseSpec.
+	info specBase: self changeSetBaseSpec.
     ].
     changesetSpecMergedEnabledHolder value ifTrue:[
-        info specMerge: self changeSetMergedSpec.
+	info specMerge: self changeSetMergedSpec.
     ].
     ^info
 
@@ -3753,7 +3757,7 @@
 
     info isNil ifTrue:[ ^ self ].
 
-    self changeSetASpec: info specA. 
+    self changeSetASpec: info specA.
     self changeSetBSpec: info specB.
     self changeSetBaseSpec: info specBase.
     self changeSetMergedSpec: info specMerge.
@@ -3767,7 +3771,7 @@
     "return/create the 'changesetSpecAHolder' value holder (automatically generated)"
 
     changesetSpecAHolder isNil ifTrue:[
-        changesetSpecAHolder := ValueHolder new.
+	changesetSpecAHolder := ValueHolder new.
     ].
     ^ changesetSpecAHolder
 !
@@ -3782,7 +3786,7 @@
     "return/create the 'changesetSpecBHolder' value holder (automatically generated)"
 
     changesetSpecBHolder isNil ifTrue:[
-        changesetSpecBHolder := ValueHolder new.
+	changesetSpecBHolder := ValueHolder new.
     ].
     ^ changesetSpecBHolder
 !
@@ -3797,7 +3801,7 @@
     "return/create the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)"
 
     changesetSpecBaseEnabledHolder isNil ifTrue:[
-        changesetSpecBaseEnabledHolder := false asValue
+	changesetSpecBaseEnabledHolder := false asValue
     ].
     ^ changesetSpecBaseEnabledHolder
 
@@ -3814,7 +3818,7 @@
     "return/create the 'changesetSpecBHolder' value holder (automatically generated)"
 
     changesetSpecBaseHolder isNil ifTrue:[
-        changesetSpecBaseHolder := ValueHolder new.
+	changesetSpecBaseHolder := ValueHolder new.
     ].
     ^ changesetSpecBaseHolder
 
@@ -3833,7 +3837,7 @@
     "return/create the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)"
 
     changesetSpecMergedEnabledHolder isNil ifTrue:[
-        changesetSpecMergedEnabledHolder := false asValue
+	changesetSpecMergedEnabledHolder := false asValue
     ].
     ^ changesetSpecMergedEnabledHolder
 
@@ -3850,7 +3854,7 @@
     "return/create the 'changesetSpecMergedHolder' value holder (automatically generated)"
 
     changesetSpecMergedHolder isNil ifTrue:[
-        changesetSpecMergedHolder := ValueHolder new.
+	changesetSpecMergedHolder := ValueHolder new.
     ].
     ^ changesetSpecMergedHolder
 !
@@ -3864,10 +3868,10 @@
 doAcceptEnabled
     <resource: #uiAspect>
 
-    ^BlockValue 
-        with:[:a :b|a value notNil and:[b value notNil]]
-        argument:self changesetSpecAHolder
-        argument:self changesetSpecAHolder.
+    ^BlockValue
+	with:[:a :b|a value notNil and:[b value notNil]]
+	argument:self changesetSpecAHolder
+	argument:self changesetSpecAHolder.
 
     "Modified: / 06-07-2011 / 11:26:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -3884,7 +3888,7 @@
 !ChangeSetDiffTool class methodsFor:'documentation'!
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.6 2013-06-25 17:12:36 cg Exp $'
 !
 
 version_HG
@@ -3893,6 +3897,5 @@
 !
 
 version_SVN
-    ^ '§Id: Tools__ChangeSetDiffTool.st 8092 2013-01-18 00:33:28Z vranyj1 §'
+    ^ '$Id: Tools__ChangeSetDiffTool.st,v 1.6 2013-06-25 17:12:36 cg Exp $'
 ! !
-
--- a/Tools__CodeHighlightingService.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__CodeHighlightingService.st	Mon Jul 01 22:15:23 2013 +0100
@@ -360,11 +360,11 @@
 !CodeHighlightingService class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.36 2013-01-11 09:56:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.39 2013-06-30 08:08:39 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.36 2013-01-11 09:56:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.39 2013-06-30 08:08:39 cg Exp $'
 !
 
 version_HG
@@ -373,6 +373,6 @@
 !
 
 version_SVN
-    ^ '§Id: Tools__CodeHighlightingService.st 7715 2011-04-10 16:32:58Z vranyj1 §'
+    ^ '$Id: Tools__CodeHighlightingService.st,v 1.39 2013-06-30 08:08:39 cg Exp $'
 ! !
 
--- a/Tools__CodeNavigationService.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__CodeNavigationService.st	Mon Jul 01 22:15:23 2013 +0100
@@ -28,9 +28,11 @@
 "{ NameSpace: Tools }"
 
 CodeViewService subclass:#CodeNavigationService
-	instanceVariableNames:'selectorEmphasis variableEmphasis currentEmphasis linesToRedraw
-		menuShown'
-	classVariableNames:'DefaultVariableEmphasis DefaultSelectorEmphasis'
+	instanceVariableNames:'selectorEmphasis variableEmphasis currentEmphasis
+		currentEmphasisForAssign linesToRedraw menuShown
+		assignmentEmphasis'
+	classVariableNames:'DefaultVariableEmphasis DefaultSelectorEmphasis
+		DefaultAssignmentEmphasis'
 	poolDictionaries:''
 	category:'Interface-CodeView'
 !
@@ -85,6 +87,13 @@
 
 !CodeNavigationService class methodsFor:'accessing - defaults'!
 
+defaultAssignmentEmphasis
+    DefaultAssignmentEmphasis isNil ifTrue:[
+        ^ Array with:(#backgroundColor -> (UserPreferences current assignmentBackgroundColorForNavigationService))
+    ].
+    ^ DefaultAssignmentEmphasis
+!
+
 defaultSelectorEmphasis
     DefaultSelectorEmphasis isNil ifTrue:[
         ^ Array with:(#backgroundColor -> (UserPreferences current selectorBackgroundColorForNavigationService))
@@ -418,11 +427,29 @@
     super initialize.
     selectorEmphasis := self class defaultSelectorEmphasis.
     variableEmphasis := self class defaultVariableEmphasis.
+    assignmentEmphasis := self class defaultAssignmentEmphasis.
     linesToRedraw := OrderedCollection new.
 
     "Created: / 25-06-2010 / 14:05:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!CodeNavigationService methodsFor:'misc'!
+
+highlightInstanceVariable:name
+    |element|
+
+    element := (codeView syntaxElements ? #()) 
+                    detect:[:e |     
+                        e isVariable
+                        and:[ e isInstanceVariable
+                        and:[ e name = name ]]
+                    ] ifNone:nil.
+
+    self highlightClear.
+    codeView syntaxElementSelection:nil.
+    self highlightVariable:element.
+! !
+
 !CodeNavigationService methodsFor:'private'!
 
 elementAtCursor
@@ -507,12 +534,18 @@
 highlightClear: redraw
 
     codeView syntaxElementSelection == nil ifTrue:[ ^ self ].
+
     textView list isNil ifTrue:[ ^ self ].
     textView list withIndexDo:[:line :lineNo | 
         line isText ifTrue:[ 
             (line hasEmphasis: currentEmphasis) ifTrue:[
                 line emphasisAllRemove:currentEmphasis.
                 linesToRedraw add: lineNo.
+            ] ifFalse:[
+                (currentEmphasisForAssign notNil and:[line hasEmphasis: currentEmphasisForAssign]) ifTrue:[
+                    line emphasisAllRemove:currentEmphasisForAssign.
+                    linesToRedraw add: lineNo.
+                ]
             ]
         ] 
     ].
@@ -526,19 +559,30 @@
 !
 
 highlightElement:element 
-    |e|
+    |e savedEmphasis currentSelection|
 
-    codeView syntaxElementSelection == element ifTrue:[ ^ self ]. "/ no change
-    codeView syntaxElementSelection notNil ifTrue:[
+    (currentSelection := codeView syntaxElementSelection) == element ifTrue:[ ^ self ]. "/ no change
+    currentSelection notNil ifTrue:[
         self highlightClear: false.
     ].
 
-    currentEmphasis := self highlighEmphasisFor:element.
+    currentEmphasis := savedEmphasis := self highlighEmphasisFor:element.
+    currentEmphasisForAssign := nil.
+
     element notNil ifTrue:[ 
         codeView syntaxElementSelection:element.
         e := element firstElementInChain.
         [ e notNil ] whileTrue:[ 
-            self highlightWithoutClearFrom:e start to:e stop.
+            e assigned ifTrue:[
+                [
+                    currentEmphasis := currentEmphasisForAssign := assignmentEmphasis.
+                    self highlightWithoutClearFrom:e start to:e stop.
+                ] ensure:[
+                    currentEmphasis := savedEmphasis.
+                ].
+            ] ifFalse:[
+                self highlightWithoutClearFrom:e start to:e stop.
+            ].
             e := e nextElement 
         ].
     ].
@@ -603,6 +647,7 @@
     |line start end|
 
     (lineNo between:startLine and:endLine) ifFalse:[ ^ self ].
+
     line := textView listAt:lineNo.
     line isEmpty ifTrue:[^self].
     start := (lineNo = startLine) 
@@ -611,21 +656,29 @@
     end := (lineNo = endLine) 
                 ifTrue:[ endCol ] 
                 ifFalse:[ line size ].
+    line setRuns:(line runs asArray).
+    "/ JV: CG commented following and added the commtent code below.
+    "/     however, this clear all other emphasis like bold, color and so on!!
     line 
         emphasisFrom:(start max: 1)
         to:(end min: line size)
         add: currentEmphasis.
+"/    line 
+"/        emphasizeFrom:(start max: 1)
+"/        to:(end min: line size)
+"/        with: currentEmphasis.
+    line setRuns:(line runs asRunArray).                              
 
     linesToRedraw add: lineNo.
 
     "Created: / 25-06-2010 / 14:15:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 08-07-2011 / 13:02:51 / cg"
-    "Modified: / 20-07-2011 / 18:43:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 01-07-2013 / 22:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-highlightVariable:e 
-    (e notNil and:[ e isVariableOrSelf ]) ifTrue:[
-        self highlightElement:e.
+highlightVariable:element 
+    (element notNil and:[ element isVariableOrSelf ]) ifTrue:[
+        self highlightElement:element.
     ] ifFalse:[
         self highlightClear.
     ].
@@ -679,7 +732,7 @@
     linesToRedraw do:[:lineNo|
         textView invalidateLine: lineNo.
     ].
-    linesToRedraw := OrderedCollection new: 1
+    linesToRedraw := OrderedCollection new
 
     "Created: / 20-07-2011 / 18:45:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (format): / 18-08-2011 / 16:01:34 / cg"
@@ -688,11 +741,11 @@
 !CodeNavigationService class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.25 2013-06-19 11:18:22 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.28 2013-06-24 19:44:05 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.25 2013-06-19 11:18:22 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.28 2013-06-24 19:44:05 cg Exp $'
 !
 
 version_HG
@@ -701,6 +754,6 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeNavigationService.st,v 1.25 2013-06-19 11:18:22 stefan Exp $'
+    ^ '$Id: Tools__CodeNavigationService.st,v 1.28 2013-06-24 19:44:05 cg Exp $'
 ! !
 
--- a/Tools__CodeView2.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__CodeView2.st	Mon Jul 01 22:15:23 2013 +0100
@@ -43,7 +43,7 @@
 SimpleView subclass:#GutterView
 	instanceVariableNames:'codeView textView textViewScroller widthAcceptCancel
 		widthAnnotations widthDiffInfo firstLineShown lastLineShown
-		acceptColor cancelColor diffColor currentBlockNodeHolder'
+		numberOfLines acceptColor cancelColor diffColor currentBlockNodeHolder'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:CodeView2
@@ -335,28 +335,7 @@
 	 (MenuItem
 	    label: 'Debug'
 	    translateLabel: true
-	    submenu:
-	   (Menu
-	      (
-	       (MenuItem
-		  label: 'Inspect '
-		  itemValue: inspectView
-		  translateLabel: true
-		)
-	       (MenuItem
-		  label: 'Inspect Syntax Elements'
-		  itemValue: inspectSyntaxElements
-		  translateLabel: true
-		)
-	       (MenuItem
-		  label: 'Inspect Selected Selector'
-		  itemValue: inspectSelectedSelector
-		  translateLabel: true
-		)
-	       )
-	      nil
-	      nil
-	    )
+	    submenuChannel: debugMenu
 	  )
 	 )
 	nil
@@ -500,9 +479,9 @@
 
 breakpoints
 
-    services do:[:each|
-	(each isKindOf: BreakpointService) ifTrue:[
-	    ^each breakpoints
+    services do:[:any|
+	(any isKindOf: BreakpointService) ifTrue:[
+	    ^ any breakpoints
 	]
     ].
     ^ nil
@@ -1393,6 +1372,12 @@
 	].
 !
 
+highlightInstanceVariable:name
+    services do:[:each|
+	each highlightInstanceVariable:name
+    ].
+!
+
 linesDeletedFrom: start to: end
 
     services do: [:each |
@@ -1664,12 +1649,14 @@
     | editMenu superEditMenu moreMenu moreMenuItem |
 
     superEditMenu := textView superEditMenu.
-    moreMenu := superEditMenu subMenuAt: superEditMenu numberOfItems.
 
     textView sensor ctrlDown ifTrue:[
 	^superEditMenu
     ].
 
+    "/ install the standard 'more' menu into my own menu
+    moreMenu := superEditMenu subMenuAt: superEditMenu numberOfItems.
+
     editMenu := self class editMenu decodeAsLiteralArray.
     moreMenuItem := editMenu menuItemLabeled: 'More'.
     moreMenuItem submenu: moreMenu asMenu.
@@ -2027,6 +2014,20 @@
 
 !CodeView2 methodsFor:'realization'!
 
+disableAllServices
+
+    services do:[:service|
+	service enabled:false.
+    ]
+!
+
+enableAllServices
+
+    services do:[:service|
+	service enabled:true.
+    ]
+!
+
 postRealize
 
     services do:[:service|
@@ -2078,6 +2079,8 @@
     self assert: textView isNil message:'Attempting to set textView twice'.
     textView := aTextView.
 
+    textView addDependent:self.
+
     "/ self backgroundPaint: textView backgroundPaint darkened lighter.
     self viewBackground: (View defaultBackgroundColor). "/ textView backgroundPaint darkened lighter.
     self paint: textView paint.
@@ -2215,37 +2218,46 @@
 
 !CodeView2::GutterView methodsFor:'change & update'!
 
+adjustSizeForLongestLine
+    |longestLineString textW requiredW newWidth|
+
+    longestLineString := self displayedString:textView list size.
+
+    textW := (longestLineString widthOn:self).
+    requiredW := textW + self padding.
+
+    ((requiredW > width) or:[requiredW < (width * 3 // 4)]) ifTrue:[
+	"/ some hysteresis to avoid quick readjust again
+	newWidth := (requiredW * 1.1) rounded.
+	self corner:(newWidth+1 @ 1.0).
+	textViewScroller origin:(newWidth @ 0.0) corner:(1.0 @ 1.0).
+	self invalidate.
+    ].
+!
+
 update:something with:aParameter from:changedObject
-    self shown ifFalse:[^self].
+"/    self shown ifFalse:[^self].
 
     (changedObject == textView) ifTrue:[
 	(something == #sizeOfContents) ifTrue:[
-	    "/ cg: with that test, it does not update when the text becomes smaller...
-"/            (firstLineShown ~= textView firstLineShown
-"/            or:[lastLineShown ~= (textView lastLineShown - 1)]) ifTrue:[
-		self invalidate.
-		^self.
-"/            ]
+	    self adjustSizeForLongestLine.
+
+"/            (numberOfLines ~= (textView list size max:textView cursorLine)) ifTrue:[
+"/                self invalidate.
+"/            ].
+	    ^ self.
 	].
     ].
+
     (changedObject == textView reallyModifiedChannel) ifTrue:[
 	self invalidate.
-    ].
-
-    changedObject == codeView currentBlockNodeHolder ifTrue:[
-	 self invalidate.
-	 ^ self.
+	^ self.
     ].
 
-
-    "/ changedObject == someOfMyValueHolders ifTrue:[
-    "/     self doSomethingApropriate.
-    "/     ^ self.
-    "/ ].
     super update:something with:aParameter from:changedObject
 
     "Modified (format): / 15-07-2011 / 20:14:04 / cg"
-    "Modified: / 05-04-2012 / 17:47:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-10-2011 / 19:25:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CodeView2::GutterView methodsFor:'event handling'!
@@ -2291,7 +2303,7 @@
 !CodeView2::GutterView methodsFor:'help'!
 
 flyByHelpText
-    |bpntService|
+    |bpntService topView|
 
     bpntService := codeView services detect:[:service | service isBreakpointService] ifNone:nil.
     bpntService isNil ifTrue:[
@@ -2299,10 +2311,13 @@
     ].
 
     (bpntService canCreateOrToggleBreakpointAtLine:nil) ifFalse:[
-	bpntService hasBreakpoints ifFalse:[
-	    ^ 'Sorry - cannot add breakpoint in the debugger (would need recompilation)\(can only add breakpoints if stopped at a method breakpoint)' withCRs
+	((topView := codeView topView) class == DebugView) ifTrue:[
+	    bpntService hasBreakpoints ifFalse:[
+		^ 'Sorry - cannot add breakpoint in the debugger (would need recompilation)\(can only add breakpoints if stopped at a method breakpoint)' withCRs
+	    ].
+	    ^ 'Click to toggle existing breakpoint. Shift-Click to toggle tracepoint.\Sorry - cannot add new breakpoint if method is already entered\(i.e. if not stopped at a method breakpoint).' withCRs
 	].
-	^ 'Click to toggle existing breakpoint. Shift-Click to toggle tracepoint.\Sorry - cannot add new breakpoint if method is already entered\(i.e. if not stopped at a method breakpoint).' withCRs
+	^ 'Cannot add breakpoint when modified. Please accept first.'
     ].
 
     ^ 'Click to toggle breakpoint. Shift-Click to toggle tracepoint.'
@@ -2320,9 +2335,9 @@
     widthAnnotations := "16"8.
     widthDiffInfo := 5.
 
-    acceptColor := Color green lighter.
-    cancelColor := Color red lighter lighter.
-    diffColor := Color yellow lighter lighter.
+    acceptColor := Color green lighter onDevice:device.
+    cancelColor := Color red lighter lighter onDevice:device.
+    diffColor := Color yellow lighter lighter onDevice:device.
 
     "Created: / 16-06-2011 / 13:47:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -2423,18 +2438,23 @@
     "redraws gutter background"
 
     "background is filled with background color"
+"/    self
+"/        fillRectangleX:x
+"/        y:y
+"/        width:w
+"/        height:h
+"/        color: self viewBackground "backgroundPaint".
     self
-	fillRectangleX:x
+	clearRectangleX:x
 	y:y
 	width:w
-	height:h
-	color: self viewBackground "backgroundPaint".
+	height:h.
 
     "separator line is drawn with foreground color"
     self
-	displayLineFromX:(self width - 2)
+	displayLineFromX:(width - 1)
 	y:y
-	toX:(self width - 2)
+	toX:(width - 1)
 	y:(y+h).
 
     "Created: / 14-12-2009 / 13:15:53 / Jindra <a>"
@@ -2453,24 +2473,32 @@
 redrawLine:line cleared: cleared
     "redraws specified line. Returns width of drawn object. Color of drawn objects should be taken from lineFont, lineColor"
 
+    ^ self redrawLine:line cleared:cleared drawServices:true
+!
+
+redrawLine:line cleared:cleared drawServices:drawServices
+    "redraws specified line. Returns width of drawn object. Color of drawn objects should be taken from lineFont, lineColor"
+
     |lineString y0 textW requiredW oldFont newFont oldColor newColor|
 
     lineString := self displayedString:line.
+
     textW := (lineString widthOn:self).
     requiredW := textW + self padding.
 
     oldFont := self font.
     oldColor := self paint.
+
     newFont := self lineFont:line.
     newFont isNil ifTrue:[
 	newFont := oldFont.
 	newColor := self lineColor:line.
-	newColor notNil ifTrue:[ self paint:newColor ].
-    ] ifFalse:[
-	self font:newFont.
+	newColor ifNotNil:[ self paint:newColor ].
     ].
-    (newFont heightOn:device) > (textView font heightOn:device) ifTrue:[
-	newFont := textView font.
+    newFont ~~ oldFont ifTrue:[
+	(newFont heightOn:device) > (textView font heightOn:device) ifTrue:[
+	    newFont := textView font.
+	].
 	self font:newFont
     ].
 
@@ -2483,11 +2511,17 @@
 	self clearRectangleX:0 y:y0 - font height width: self width - 2 height: font height + font descent.
     ].
 
-    "Let the services draw annotations and other stuff"
-    codeView
-	drawLine:line in: self
-	atX: (self paddingLeft + self usedWidthForAcceptCancel) y:y0 width: widthAnnotations height: font height
-	from:nil to:nil with:self paint and: self backgroundColor.
+    "/ cg: this should be done differently: services know about the
+    "/ gutter, so they should respond to a special drawGutter message.
+    "/ otherwise, some redraws become unusably slow (esecially
+    "/ with multiple fonts/colors/emphases)...
+    drawServices ifTrue:[
+	"Let services draw annotations and other stuff"
+	codeView
+	    drawLine:line in: self
+	    atX: (self paddingLeft + self usedWidthForAcceptCancel) y:y0 width: widthAnnotations height: font height
+	    from:nil to:nil with:self paint and: self backgroundColor.
+    ].
 
     self
 	displayString:lineString
@@ -2510,7 +2544,7 @@
 !
 
 redrawLinesFrom:start
-
+    "/ cg: obsolete?
     start to: (textView lastLineShown - 1 min: textView list size) do:[:line|
 	self redrawLine:line cleared: false.
     ]
@@ -2520,31 +2554,19 @@
 !
 
 redrawX:x y:y width:w height:h
-    | requiredW currentW |
-
     self redrawBackgroundX:x y:y width:w height:h.
 
     codeView showAcceptCancelBar ifTrue:[
 	self redrawAcceptCancelBarX:x y:y width:w height:h.
     ].
 
+    numberOfLines := (textView list size max:textView cursorLine).
     firstLineShown := textView firstLineShown.
-    lastLineShown := textView lastLineShown - 1 min: textView list size.
-
-    currentW := requiredW := self width.
-    firstLineShown to:lastLineShown do:
-	[:line |
-	requiredW := requiredW max: (self redrawLine:line cleared: true)].
-
-    (requiredW > self width) ifTrue:[
-	self corner:(requiredW @ 1.0).
-	textViewScroller origin:(requiredW @ 0.0) corner:(1.0 @ 1.0).
-	self invalidate.
+    lastLineShown := textView lastLineShown - 1 min: numberOfLines.
+
+    firstLineShown to:lastLineShown do: [:line |
+	self redrawLine:line cleared:true drawServices:true
     ].
-
-    "Created: / 03-09-2009 / 08:22:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 14-12-2009 / 14:13:14 / Jindra <a>"
-    "Modified: / 10-10-2011 / 16:35:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CodeView2::TextView methodsFor:'accessing'!
@@ -2898,6 +2920,7 @@
 
     pom := self hasSelection.
     (pom) ifTrue:[ ^ self. ].
+
     i := 1.
     [
 	i <= (deletedLines size)
@@ -2943,16 +2966,18 @@
 !CodeView2::TextView methodsFor:'editing'!
 
 contentsChanged
+    "this one is sent, whenever contents changes its size"
+
     super contentsChanged.
-    "
-    codeView diffMode ifTrue:[
-	changedDiffText ifTrue:[
-	    codeView recomputeDiff:self.
-	] ifFalse:[
-	    changedDiffText := true.
-	].
-    ]
-    "
+
+"/    codeView diffMode ifTrue:[
+"/        changedDiffText ifTrue:[
+"/            codeView recomputeDiff:self.
+"/        ] ifFalse:[
+"/            changedDiffText := true.
+"/        ].
+"/    ]
+
 
     "Created: / 22-06-2010 / 23:13:24 / Jakub <zelenja7@fel.cvut.cz>"
     "Modified: / 01-08-2010 / 20:33:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3612,11 +3637,11 @@
 !CodeView2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.86 2013-06-23 10:46:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.93 2013-06-30 07:12:03 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.86 2013-06-23 10:46:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.93 2013-06-30 07:12:03 cg Exp $'
 !
 
 version_HG
@@ -3625,7 +3650,7 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeView2.st,v 1.86 2013-06-23 10:46:46 cg Exp $'
+    ^ '$Id: Tools__CodeView2.st,v 1.93 2013-06-30 07:12:03 cg Exp $'
 ! !
 
 
--- a/Tools__CodeViewService.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__CodeViewService.st	Mon Jul 01 22:15:23 2013 +0100
@@ -342,6 +342,9 @@
 
 !CodeViewService methodsFor:'misc'!
 
+highlightInstanceVariable:name
+!
+
 showInfo: aString
 
     codeView showInfo: aString
@@ -425,7 +428,7 @@
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeViewService.st,v 1.10 2013-06-14 11:49:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeViewService.st,v 1.11 2013-06-24 17:08:38 cg Exp $'
 !
 
 version_HG
@@ -434,6 +437,6 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeViewService.st,v 1.10 2013-06-14 11:49:52 cg Exp $'
+    ^ '$Id: Tools__CodeViewService.st,v 1.11 2013-06-24 17:08:38 cg Exp $'
 ! !
 
--- a/Tools__Inspector2.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__Inspector2.st	Mon Jul 01 22:15:23 2013 +0100
@@ -984,7 +984,7 @@
     ].
     "/ if that fails, open a new one
 
-    browser := UserPreferences current systemBrowserClass 
+    browser := UserPreferences systemBrowserClass 
                     openInClass:class selector:nil "/ browseSingleClass: class
 
     "Modified: / 23-07-2011 / 11:28:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1104,6 +1104,7 @@
     "Created: / 15-07-2011 / 16:25:42 / cg"
 ! !
 
+
 !Inspector2::NavigationState class methodsFor:'creating classes'!
 
 for:anObject 
@@ -1119,11 +1120,11 @@
 !Inspector2::NavigationState class methodsFor:'documentation'!
 
 version
-    ^'$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.38 2013-06-13 13:59:18 cg Exp $'
+    ^'$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.39 2013-06-25 17:12:19 cg Exp $'
 !
 
 version_SVN
-    ^'$Id: Tools__Inspector2.st,v 1.38 2013-06-13 13:59:18 cg Exp $'
+    ^'$Id: Tools__Inspector2.st,v 1.39 2013-06-25 17:12:19 cg Exp $'
 ! !
 
 !Inspector2::NavigationState methodsFor:'accessing'!
@@ -1339,15 +1340,15 @@
 !Inspector2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.38 2013-06-13 13:59:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.39 2013-06-25 17:12:19 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.38 2013-06-13 13:59:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.39 2013-06-25 17:12:19 cg Exp $'
 !
 
 version_CVS_jvrany
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.38 2013-06-13 13:59:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.39 2013-06-25 17:12:19 cg Exp $'
 !
 
 version_HG
@@ -1356,7 +1357,7 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__Inspector2.st,v 1.38 2013-06-13 13:59:18 cg Exp $'
+    ^ '$Id: Tools__Inspector2.st,v 1.39 2013-06-25 17:12:19 cg Exp $'
 ! !
 
 
--- a/Tools__LintRuleDetail.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__LintRuleDetail.st	Mon Jul 01 22:15:23 2013 +0100
@@ -210,7 +210,7 @@
     (ruleClass implements:#rationale) ifTrue:[
         sel := #rationale.
     ].
-    UserPreferences current systemBrowserClass
+    UserPreferences systemBrowserClass
        openInClass:ruleClass selector:sel
 
     "Created: / 07-09-2011 / 04:09:38 / cg"
@@ -439,11 +439,11 @@
 !LintRuleDetail class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__LintRuleDetail.st,v 1.13 2012-03-01 19:59:38 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__LintRuleDetail.st,v 1.14 2013-06-25 17:12:11 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__LintRuleDetail.st,v 1.13 2012-03-01 19:59:38 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__LintRuleDetail.st,v 1.14 2013-06-25 17:12:11 cg Exp $'
 !
 
 version_HG
@@ -452,6 +452,6 @@
 !
 
 version_SVN
-    ^ '§Id: Tools__LintRuleDetail.st 7617 2010-08-25 12:56:19Z vranyj1 §'
+    ^ '$Id: Tools__LintRuleDetail.st,v 1.14 2013-06-25 17:12:11 cg Exp $'
 ! !
 
--- a/Tools__NewSystemBrowser.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__NewSystemBrowser.st	Mon Jul 01 22:15:23 2013 +0100
@@ -58,6 +58,13 @@
 	privateIn:NewSystemBrowser
 !
 
+ListEntry subclass:#OwnershipGraph
+	instanceVariableNames:'ownershipInfo cachedForm'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
+!
+
 !NewSystemBrowser class methodsFor:'documentation'!
 
 aboutThisApplicationText
@@ -7128,6 +7135,84 @@
       )
 !
 
+classDocumentationMenu
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+
+    "
+     MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#classMenu
+     (Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser classMenu)) startUp
+    "
+
+    <resource: #menu>
+
+    ^
+     #(Menu
+	      (
+	       (MenuItem
+		  enabled: hasClassSelectedHolder
+		  label: 'PrintOut'
+		  itemValue: classMenuPrintOut
+		  showBusyCursorWhilePerforming: true
+		)
+	       (MenuItem
+		  enabled: hasClassSelectedHolder
+		  label: 'PrintOut Protocol'
+		  itemValue: classMenuPrintOutProtocol
+		  showBusyCursorWhilePerforming: true
+		)
+	       (MenuItem
+		  label: '-'
+		)
+	       (MenuItem
+		  enabled: hasClassSelectedHolder
+		  label: 'HTML Documentation'
+		  itemValue: classMenuDocumentation
+		  showBusyCursorWhilePerforming: true
+		)
+	       (MenuItem
+		  enabled: hasClassSelectedHolder
+		  label: 'Save HTML Documentation As...'
+		  itemValue: classMenuSaveDocumentationAs
+		  showBusyCursorWhilePerforming: true
+		)
+	       (MenuItem
+		  label: '-'
+		)
+	       (MenuItem
+		  label: 'Show Comment'
+		  itemValue: classMenuComment
+		)
+	       (MenuItem
+		  label: 'Show Hierarchy'
+		  itemValue: classMenuHierarchy
+		)
+	       (MenuItem
+		  label: 'Show Definition'
+		  itemValue: classMenuDefinition
+		)
+	       (MenuItem
+		  label: '-'
+		)
+	       (MenuItem
+		  enabled: hasOOMPackageLoadedHolder
+		  label: 'Metrics Report'
+		  itemValue: classMenuMetrics
+		)
+	       (MenuItem
+		  label: 'Ownership Graph'
+		  itemValue: classMenuOwnershipGraph
+		)
+	       )
+	      nil
+	      nil
+	    )
+!
+
 classGenerateMenu
     "This resource specification was automatically generated
      by the MenuEditor of ST/X."
@@ -7724,63 +7809,7 @@
 	 (MenuItem
 	    enabled: hasClassSelectedHolder
 	    label: 'Documentation'
-	    submenu:
-	   (Menu
-	      (
-	       (MenuItem
-		  enabled: hasClassSelectedHolder
-		  label: 'PrintOut'
-		  itemValue: classMenuPrintOut
-		  showBusyCursorWhilePerforming: true
-		)
-	       (MenuItem
-		  enabled: hasClassSelectedHolder
-		  label: 'PrintOut Protocol'
-		  itemValue: classMenuPrintOutProtocol
-		  showBusyCursorWhilePerforming: true
-		)
-	       (MenuItem
-		  label: '-'
-		)
-	       (MenuItem
-		  enabled: hasClassSelectedHolder
-		  label: 'HTML Documentation'
-		  itemValue: classMenuDocumentation
-		  showBusyCursorWhilePerforming: true
-		)
-	       (MenuItem
-		  enabled: hasClassSelectedHolder
-		  label: 'Save HTML Documentation As...'
-		  itemValue: classMenuSaveDocumentationAs
-		  showBusyCursorWhilePerforming: true
-		)
-	       (MenuItem
-		  label: '-'
-		)
-	       (MenuItem
-		  label: 'Show Comment'
-		  itemValue: classMenuComment
-		)
-	       (MenuItem
-		  label: 'Show Hierarchy'
-		  itemValue: classMenuHierarchy
-		)
-	       (MenuItem
-		  label: 'Show Definition'
-		  itemValue: classMenuDefinition
-		)
-	       (MenuItem
-		  label: '-'
-		)
-	       (MenuItem
-		  enabled: hasOOMPackageLoadedHolder
-		  label: 'Metrics Report'
-		  itemValue: classMenuMetrics
-		)
-	       )
-	      nil
-	      nil
-	    )
+	    submenuChannel: classDocumentationMenu
 	  )
 	 (MenuItem
 	    label: '-'
@@ -10706,82 +10735,74 @@
     "Do not manually edit this!! If it is corrupted,
      the MenuEditor may not be able to read the specification."
 
-    "
-     MenuEditor new openOnClass:NewSystemBrowser andSelector:#searchMenu
-     (Menu new fromLiteralArrayEncoding:(NewSystemBrowser searchMenu)) startUp
-    "
-
-    <resource: #menu>
-    ^
-     #(#Menu
-	#(
-	 #(#MenuItem
-	    #label: 'Class...'
-	    #translateLabel: true
-	    #value: #searchMenuFindClass
-	    shortcutKey: #'Cmds'
-ignoreShortcutKeys: true
-	  )
-	 #(#MenuItem
-	    #label: 'Class Hierarchy'
-	    #translateLabel: true
-	    #enabled: #hasSelectedClassWithSuperclassHolder
-	    #submenuChannel: #selectedClassesHierarchyMenu
-	  )
-	 #(#MenuItem
-	    #label: 'Changed Classes'
-	    #translateLabel: true
-	    #enabled: #hasChangedClassesHolder
-	    #submenuChannel: #changedClassesMenu
-	  )
-	 #(#MenuItem
-	    #label: 'Visited Classes'
-	    #translateLabel: true
-	    #enabled: #hasVisitedClassesHolder
-	    #submenuChannel: #visitedClassesMenu
-	  )
-	 #(#MenuItem
-	    #label: '-'
-	  )
-	 #(#MenuItem
-	    #label: 'Method...'
-	    #translateLabel: true
-	    #value: #searchMenuFindMethod
-	  )
-	 #(#MenuItem
-	    #label: 'Changed Methods'
-	    #translateLabel: true
-	    #enabled: #hasChangedMethodsHolder
-	    #submenuChannel: #changedMethodsMenu
-	  )
-	 #(#MenuItem
-	    #label: 'Visited Methods'
-	    #translateLabel: true
-	    #enabled: #hasFindHistoryClassesHolder
-	    #submenuChannel: #findHistoryMenu
-	  )
-	 #(#MenuItem
-	    #label: '-'
-	  )
-	 #(#MenuItem
-	    #label: 'Response to...'
-	    #translateLabel: true
-	    #value: #searchMenuFindResponseTo
-	    #enabled: #hasSingleClassOrMethodSelectedHolder
-	  )
-	 #(#MenuItem
-	    #label: 'Response to'
-	    #translateLabel: true
-	    #submenuChannel: #sentMessagesResponseMenu
-	    #isVisible: #hasSingleMethodSelectedHolder
-	  )
-	 #(#MenuItem
-	    #label: '-'
-	  )
-	 #(#MenuItem
-	    #label: 'Bookmarks'
-	    #translateLabel: true
-	    #submenuChannel: #boockmarksMenu
+
+    "
+     MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#searchMenu
+     (Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser searchMenu)) startUp
+    "
+
+    <resource: #menu>
+
+    ^
+     #(Menu
+	(
+	 (MenuItem
+	    label: 'Class...'
+	    itemValue: searchMenuFindClass
+	    shortcutKey: Cmds
+	    ignoreShortcutKeys: true
+	  )
+	 (MenuItem
+	    enabled: hasVisitedClassesHolder
+	    label: 'Visited Classes'
+	    submenuChannel: visitedClassesMenu
+	  )
+	 (MenuItem
+	    enabled: hasChangedClassesHolder
+	    label: 'Changed Classes'
+	    submenuChannel: changedClassesMenu
+	  )
+	 (MenuItem
+	    enabled: hasSelectedClassWithSuperclassHolder
+	    label: 'Class Hierarchy'
+	    submenuChannel: selectedClassesHierarchyMenu
+	  )
+	 (MenuItem
+	    label: '-'
+	  )
+	 (MenuItem
+	    label: 'Method...'
+	    itemValue: searchMenuFindMethod
+	  )
+	 (MenuItem
+	    enabled: hasFindHistoryClassesHolder
+	    label: 'Visited Methods'
+	    submenuChannel: findHistoryMenu
+	  )
+	 (MenuItem
+	    enabled: hasChangedMethodsHolder
+	    label: 'Changed Methods'
+	    submenuChannel: changedMethodsMenu
+	  )
+	 (MenuItem
+	    label: '-'
+	  )
+	 (MenuItem
+	    enabled: hasSingleClassOrMethodSelectedHolder
+	    label: 'Response to...'
+	    itemValue: searchMenuFindResponseTo
+	  )
+	 (MenuItem
+	    label: 'Response to'
+	    isVisible: hasSingleMethodSelectedHolder
+	    submenuChannel: sentMessagesResponseMenu
+	  )
+	 (MenuItem
+	    label: '-'
+	  )
+	 (MenuItem
+	    label: 'Bookmarks'
+	    submenuChannel: boockmarksMenu
 	  )
 	 )
 	nil
@@ -11090,17 +11111,29 @@
 		  itemValue: selectorMenuGenerateFalseReturnInSuperclass
 		)
 	       (MenuItem
-		  label: 'Templates in Subclasses'
+		  label: 'Redefinition in Subclass...'
+		  itemValue: selectorMenuGenerateRedefinitionInSubclass
+		)
+	       (MenuItem
+		  label: 'SubclassResponsibility in direct Subclasses'
 		  itemValue: selectorMenuGenerateTemplateInSubclasses
 		)
 	       (MenuItem
-		  label: 'Templates in all Subclasses'
+		  label: 'SubclassResponsibility in all Subclasses'
 		  itemValue: selectorMenuGenerateTemplateInAllSubclasses
 		)
 	       (MenuItem
 		  label: '-'
 		)
 	       (MenuItem
+		  enabled: canGenerateAspectMethodHolder
+		  label: 'Aspect Method...'
+		  itemValue: selectorMenuGenerateAspectMethod
+		)
+	       (MenuItem
+		  label: '-'
+		)
+	       (MenuItem
 		  enabled: hasInstanceMethodsSelectedHolder
 		  label: 'Corresponding Instance Creation in Class'
 		  itemValue: selectorMenuGenerateCorrespondingInstanceCreationInClass
@@ -13317,7 +13350,7 @@
 		  enabled: hasCategorySelectedAndCVSSourceCodeManagerHolder
 		  label: 'CheckIn all...'
 		  itemValue: categoryMenuCheckInEachUsingManager:
-		  argument: SourceCodeManagerNamePlaceholder
+		  argument: SourceCodeManagerPlaceholder
 		  translateLabel: true
 		  labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckIn 'CheckIn all...')
 		  showBusyCursorWhilePerforming: true
@@ -13330,7 +13363,7 @@
 		  label: 'CheckOut Newest All'
 		  itemValue: categoryMenuCheckOutNewestUsingManager:
 		  translateLabel: true
-		  argument: SourceCodeManagerNamePlaceholder
+		  argument: SourceCodeManagerPlaceholder
 		  labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckOut 'CheckOut Newest All')
 		  showBusyCursorWhilePerforming: true
 		)
@@ -13338,7 +13371,7 @@
 		  enabled: hasCategorySelectedAndCVSSourceCodeManagerHolder
 		  label: 'CheckOut Previous Versions All...'
 		  itemValue: categoryMenuCheckOutUsingManager:
-		  argument: SourceCodeManagerNamePlaceholder
+		  argument: SourceCodeManagerPlaceholder
 		  translateLabel: true
 		  showBusyCursorWhilePerforming: true
 		)
@@ -15665,7 +15698,7 @@
 	  )
 	 (MenuItem
 	    label: 'Import Structure...'
-	    itemValue: projectMenuImportUsing:
+	    itemValue: projectMenuImportUsingManagerNamed:
 	    translateLabel: true
 	    argument: SourceCodeManagerNamePlaceholder
 	    showBusyCursorWhilePerforming: true
@@ -15690,17 +15723,17 @@
 	 (MenuItem
 	    enabled: hasProjectSelectedAndSourceCodeManagerHolder
 	    label: 'Compare with Stable Version in Repository'
-	    itemValue: projectMenuCompareAgainstStableInRepositoryUsingManagerNamed:
-	    translateLabel: true
-	    argument: SourceCodeManagerNamePlaceholder
+	    itemValue: projectMenuCompareAgainstStableInRepositoryUsingManager:
+	    translateLabel: true
+	    argument: SourceCodeManagerPlaceholder
 	    isVisible: false
 	  )
 	 (MenuItem
 	    enabled: hasProjectSelectedAndSourceCodeManagerHolder
 	    label: 'Compare with Repository at Date...'
-	    itemValue: projectMenuCompareAgainstRepositoryUsingManagerNamed:
-	    translateLabel: true
-	    argument: SourceCodeManagerNamePlaceholder
+	    itemValue: projectMenuCompareAgainstRepositoryUsingManager:
+	    translateLabel: true
+	    argument: SourceCodeManagerPlaceholder
 	  )
 	 (MenuItem
 	    label: 'Compare Build Support File'
@@ -15711,9 +15744,9 @@
 	 (MenuItem
 	    enabled: hasProjectSelectedAndSourceCodeManagerHolder
 	    label: 'Consistency Check...'
-	    itemValue: projectMenuCheckRepositoryConsistencyUsingManagerNamed:
-	    translateLabel: true
-	    argument: SourceCodeManagerNamePlaceholder
+	    itemValue: projectMenuCheckRepositoryConsistencyUsingManager:
+	    translateLabel: true
+	    argument: SourceCodeManagerPlaceholder
 	  )
 	 (MenuItem
 	    enabled: hasProjectSelectedAndSourceCodeManagerHolder
@@ -15728,18 +15761,18 @@
 	 (MenuItem
 	    enabled: hasProjectSelectedHolder
 	    label: 'Resource Files...'
-	    itemValue: projectMenuResourcesUsingManagerNamed:
+	    itemValue: projectMenuResourcesUsingManager:
 	    translateLabel: true
 	    isVisible: false
-	    argument: SourceCodeManagerNamePlaceholder
+	    argument: SourceCodeManagerPlaceholder
 	  )
 	 (MenuItem
 	    enabled: hasProjectSelectedHolder
 	    label: 'Bitmap Files...'
-	    itemValue: projectMenuBitmapFilesUsingManagerNamed:
+	    itemValue: projectMenuBitmapFilesUsingManager:
 	    translateLabel: true
 	    isVisible: false
-	    argument: SourceCodeManagerNamePlaceholder
+	    argument: SourceCodeManagerPlaceholder
 	  )
 	 (MenuItem
 	    label: 'Extras'
@@ -15891,10 +15924,10 @@
 	 (MenuItem
 	    enabled: hasProjectSelectedAndSourceCodeManagerHolder
 	    label: 'Set Tag (Release As)...'
-	    itemValue: projectMenuSetTagUsing:
+	    itemValue: projectMenuSetTagUsingManager:
 	    translateLabel: true
 	    labelImage: (ResourceRetriever ToolbarIconLibrary repositoryTag 'Set Tag (Release As)...')
-	    argument: SourceCodeManagerNamePlaceholder
+	    argument: SourceCodeManagerPlaceholder
 	  )
 	 )
 	nil
@@ -16329,8 +16362,8 @@
 	 (MenuItem
 	    enabled: hasRealExtensionMethodSelectedHolder
 	    label: 'CheckIn Extensions for Project...'
-	    itemValue: selectorMenuCheckInProjectExtensionsUsingManagerNamed:
-	    argument: SourceCodeManagerNamePlaceholder
+	    itemValue: selectorMenuCheckInProjectExtensionsUsingManager:
+	    argument: SourceCodeManagerPlaceholder
 	    translateLabel: true
 	    isVisible: hasExtensionMethodSelectedHolder
 	  )
@@ -17784,6 +17817,266 @@
 
 !NewSystemBrowser class methodsFor:'utilities'!
 
+askForClassToSearch:doWhatByDefault single:singleClass msgTail:msgTail resources:resourcesOrNil filter:filterOrNil forBrowser:aBrowserOrNil thenDo:aBlock
+    "utility common code for both opening a new browser on a class and
+     to search for a class in an existing browser.
+     If singleClass is true, a single class will be asked for and browsed,
+     otherwise, a match pattern is allowed and a multi-class browser is opened.
+     Moved from instance protocol for better reusability."
+
+    |box boxLabel title okText okText2 okText3 className canFind
+     button2 button3 doWhat doWhat2 doWhat3 classNameHolder updateList
+     allClasses classNamesInChangeSet
+     allNames allFullNames initialShortNames initialFullNames
+     colorizedFullNames colorizedShortNames
+     resources check showingWhatLabel showFullNameHolder genShortNameListEntry|
+
+    resources := resourcesOrNil ? self classResources.
+    showFullNameHolder := (LastClassSearchBoxShowedFullName ? false) asValue.
+
+    doWhat := doWhatByDefault.
+    canFind := aBrowserOrNil notNil
+	       and:[aBrowserOrNil navigationState notNil and:[ aBrowserOrNil navigationState isFullBrowser ]].
+
+    (doWhat isNil or:[aBrowserOrNil isNil]) ifTrue:[
+	title := ''.
+	boxLabel := (resources string:'Select a class').
+	okText := 'OK'.
+	okText2 := nil. doWhat2 := nil.
+	okText3 := nil. doWhat3 := nil.
+    ] ifFalse:[
+	title := (singleClass ifTrue:[ 'Class to browse' ] ifFalse:[ 'Class(es) to browse' ]).
+	boxLabel := (resources string:'Browse or Search').
+
+	(doWhat isNil and:[canFind not]) ifTrue:[
+	    doWhat := #newBuffer.
+	].
+
+	doWhat == #newBrowser ifTrue:[
+	    okText := 'Open'.
+	    okText2 := 'Add Buffer'. doWhat2 := #newBuffer.
+	    okText3 := 'Find'.       doWhat3 := nil.
+	] ifFalse:[ doWhat == #newBuffer ifTrue:[
+	    okText := 'Add Buffer'.
+	    okText2 := 'Open New'.   doWhat2 := #newBrowser.
+	    okText3 := 'Find'.       doWhat3 := nil.
+	] ifFalse:[
+	    title := (singleClass ifTrue:[ 'Class to find' ] ifFalse:[ 'Class(es) to find' ]).
+	    okText := 'Find'.
+	    okText2 := 'Open New'.   doWhat2 := #newBrowser.
+	    okText3 := 'Add Buffer'. doWhat3 := #newBuffer.
+	]].
+    ].
+
+    genShortNameListEntry :=
+	[:cls |
+	    |ns|
+
+	    cls isNil ifTrue:[
+		nil
+	    ] ifFalse:[
+		ns := cls topNameSpace name.
+		ns = 'Smalltalk'
+		    ifTrue:[ ns := '' ]
+		    ifFalse:[ns := ' (in ',ns,')'].
+		cls nameWithoutNameSpacePrefix,ns
+	    ].
+	].
+
+    classNamesInChangeSet := ChangeSet current changedClasses
+				select: (filterOrNil ? [:cls | true])
+				thenCollect:[:each | each theNonMetaclass name].
+
+    initialFullNames := self visitedClassNamesHistory.
+    (filterOrNil notNil) ifTrue:[
+	initialFullNames := initialFullNames select:[:nm | filterOrNil value:(Smalltalk at:nm)].
+    ].
+
+    initialShortNames := initialFullNames collect:[:nm | genShortNameListEntry value:(Smalltalk at:nm)] thenSelect:[:nm | nm notNil].
+
+    colorizedFullNames := initialFullNames collect:[:clsName |
+				(classNamesInChangeSet includes:clsName) ifTrue:[
+				    clsName asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+				] ifFalse:[
+				    clsName
+				].
+			    ].
+
+    colorizedShortNames := initialShortNames with:initialFullNames collect:[:shortName :clsName |
+				(classNamesInChangeSet includes:clsName) ifTrue:[
+				    shortName asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+				] ifFalse:[
+				    shortName
+				].
+			    ].
+
+    title := (resources string:title) , msgTail , '.\' , (resources string:'(TAB to complete; matchPattern allowed - "*" for all):').
+
+    box := self
+		enterBoxForClassWithCodeSelectionTitle:title withCRs
+		withList:(showFullNameHolder value ifTrue:[colorizedFullNames] ifFalse:[colorizedShortNames])
+		okText:okText
+		forBrowser:aBrowserOrNil.
+
+    box label:boxLabel.
+
+    doWhat notNil ifTrue:[
+	button2 := Button label:(resources string:okText2).
+	(aBrowserOrNil notNil and:[aBrowserOrNil navigationState isFullBrowser]) "singleClass" ifTrue:[
+	    button3 := Button label:(resources string:okText3)
+	].
+	(DialogBox defaultOKButtonAtLeft) ifFalse:[
+	    box addButton:button2 before:(box okButton).
+	    button3 notNil ifTrue:[box addButton:button3 before:button2].
+	] ifTrue:[
+	    box addButton:button2 after:(box okButton).
+	    button3 notNil ifTrue:[box addButton:button3 after:button2].
+	].
+
+	button2 action:[
+	   doWhat := doWhat2.
+	   box doAccept.
+	   box okPressed.
+	].
+	button3 notNil ifTrue:[
+	    button3 action:[
+	       doWhat := doWhat3.
+	       box doAccept.
+	       box okPressed.
+	    ].
+	].
+    ].
+
+    allClasses := Smalltalk allClasses copyAsOrderedCollection.
+    filterOrNil notNil ifTrue:[
+	allClasses := allClasses select: filterOrNil
+    ].
+
+    allNames := (allClasses
+		    collect:[:cls |
+			|ns nm|
+
+			ns := cls topNameSpace name.
+			ns = 'Smalltalk'
+			    ifTrue:[ ns := '' ]
+			    ifFalse:[ns := ' (in ',ns,')'].
+			cls isNameSpace ifTrue:[
+			    nm := cls nameWithoutNameSpacePrefix,ns,' (Namespace)'
+			] ifFalse:[
+			    nm := cls nameWithoutNameSpacePrefix,ns
+			].
+			(classNamesInChangeSet includes:cls name) ifTrue:[
+			    nm asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+			] ifFalse:[
+			    nm
+			].
+		    ]) sortWith:allClasses; yourself.
+
+    allFullNames := (allClasses
+		    collect:[:cls |
+			|nm|
+
+			nm := cls name.
+			(classNamesInChangeSet includes:cls name) ifTrue:[
+			    nm asText emphasisAllAdd:(UserPreferences current emphasisForChangedCode)
+			] ifFalse:[
+			    nm
+			].
+		    ]) sortWith:allClasses; yourself.
+
+    updateList := [
+	    |nameToSearch list namesStarting namesIncluding lcName nameList|
+
+	    (nameToSearch := classNameHolder value withoutSeparators) isEmpty ifTrue:[
+		showingWhatLabel label:(resources string:'Recently visited:').
+		list := (showFullNameHolder value ifTrue:[colorizedFullNames] ifFalse:[colorizedShortNames]).
+	    ] ifFalse:[
+		showingWhatLabel label:(resources string:'Matching classes:').
+		nameList := showFullNameHolder value
+				ifTrue:[ allFullNames ]
+				ifFalse:[ allNames ].
+
+		lcName := nameToSearch asLowercase.
+		(lcName includesString:'::') ifTrue:[
+		    list := OrderedCollection new.
+		    allClasses doWithIndex:[:cls :idx |
+			|isIncluded|
+
+			(nameToSearch includesMatchCharacters) ifTrue:[
+			    isIncluded := (lcName match:cls name asLowercase)
+			] ifFalse:[
+			    isIncluded := (cls name includesString:lcName caseSensitive:false)
+			].
+			isIncluded ifTrue:[
+			    list add:(nameList at:idx)
+			].
+		    ].
+		] ifFalse:[
+		    (nameToSearch includesMatchCharacters) ifTrue:[
+			list := nameList select:[:nm | lcName match:nm asLowercase]
+		    ] ifFalse:[
+			namesIncluding := nameList
+					    select:[:nm |
+						"/ nm asLowercase startsWith:lcName
+						nm asLowercase includesString:lcName caseSensitive:false
+					    ].
+			namesStarting := namesIncluding select:[:nm | nm asLowercase startsWith:lcName].
+			list := namesStarting , {nil} , (namesIncluding \ namesStarting).
+		    ]
+		]
+	    ].
+	    box listView
+		list:list;
+		scrollToLine:((list findFirst:[:line | (line ? '') startsWith:lcName]) max:1)
+	].
+
+    classNameHolder := '' asValue.
+    box enterField
+	model:classNameHolder;
+	immediateAccept:true.
+    classNameHolder onChangeEvaluate:updateList.
+
+    box entryCompletionBlock:(DoWhatIMeanSupport classNameEntryCompletionBlock).
+    box action:[:aString | className := aString].
+
+    box panelView
+	addSubView:(showingWhatLabel := (Label label:(resources string:'Recently visited:')) adjust:#left) before:nil;
+	addSubView:(check := CheckBox label:(resources string:'Show Full Name (do not strip off Namespace)') model:showFullNameHolder) before:nil.
+    showFullNameHolder onChangeEvaluate:updateList.
+    box enterField origin:(0 @ check corner y).
+    box listView origin:(0 @ check corner y).
+
+    box extent:(400 @ 350).
+    box open.
+
+    className isEmptyOrNil ifTrue:[^ nil "cancel"].
+
+    LastClassSearchBoxShowedFullName := showFullNameHolder value.
+
+    (className endsWith:$) ) ifTrue:[
+	(className indexOfSubCollection:'(in ') == 0 ifTrue:[
+	    "/ a namespace
+	    className := (className copyTo:(className indexOfSubCollection:'(Name')-1) withoutSeparators
+	] ifFalse:[
+	    className := ((className copyFrom:(className indexOfSubCollection:'(in ')+4)
+			    copyButLast:1)
+			 , '::' , className asCollectionOfWords first
+	].
+    ].
+
+    (doWhat isNil or:[aBrowserOrNil isNil]) ifTrue:[
+	aBlock notNil ifTrue:[aBlock value:className optionalArgument:singleClass and:doWhat].
+	^ className
+    ].
+
+    aBrowserOrNil withSearchCursorDo:[
+	aBlock value:className value:singleClass value:doWhat.
+    ].
+    ^ className
+
+    "Modified: / 23-07-2012 / 11:00:22 / cg"
+!
+
 enterBoxTitle:title okText:okText label:label
     "convenient method: setup an enterBox"
 
@@ -22458,7 +22751,27 @@
     self hasMethodWithBreakPointSelectedHolder value:(self hasMethodWithBreakPointSelected).
 !
 
-
+delayedMethodTrapChanged:methodTrapChangeInfo
+    |mthd|
+
+    self hasMethodWithoutBreakPointSelectedHolder value:(self hasMethodWithoutBreakPointSelected).
+    self hasMethodWithBreakPointSelectedHolder value:(self hasMethodWithBreakPointSelected).
+
+    self codeView isCodeView2 ifTrue:[
+	mthd := self theSingleSelectedMethod.
+	mthd == self codeView methodHolder value ifTrue:[
+	    mthd notNil ifTrue:[
+		"/ would not send an update notification
+		self codeView updateGutter
+	    ]
+	] ifFalse:[
+	    self codeView methodHolder value notNil ifTrue:[
+		"/ will send update notification to services
+		self codeView methodHolder value:mthd.
+	    ].
+	]
+    ].
+!
 
 delayedMethodsSelectionChanged
     |codeAspect process|
@@ -22690,6 +23003,10 @@
     |var val mclass cls|
 
     var := self theSingleSelectedVariable.
+    self codeView isCodeView2 ifTrue:[
+	self codeView highlightInstanceVariable:var.
+    ].
+
     var isNil ifTrue:[
 	navigationState autoSearchAction:nil.
 	^ self
@@ -25107,10 +25424,11 @@
 	browseMethodsForWhich:[:mthd |
 	    |cls def|
 
-	    mthd isExtension
-	    and:[ (cls := mthd mclass) notNil
-	    and:[ (def := cls theNonMetaclass projectDefinition) notNil
-	    and:[ (def savedOverwrittenMethodForClass:cls selector:mthd selector) notNil ]]]
+	    mthd isShadowingExtension
+"/            mthd isExtension
+"/            and:[ (cls := mthd mclass) notNil
+"/            and:[ (def := cls theNonMetaclass projectDefinitionClass) notNil
+"/            and:[ (def savedOverwrittenMethodForClass:cls selector:mthd selector) notNil ]]]
 	]
 	in:openHow
 	label:'Overwritten Methods (Package Conflicts)'
@@ -27076,7 +27394,7 @@
        t := Time millisecondsToRun:[
 		(SmalllintChecker runRule: rule onEnvironment: anEnvironment)
 	    ].
-       Transcript show:rule name,': ';showCR:t.
+       Transcript show:rule name; show:': '; show:t; showCR:'ms'.
     ].
     ProgressNotification new
 	messageText: ('Done');
@@ -27996,6 +28314,10 @@
 	self showClassDefinition:cls.
 	^ self
     ].
+    aspect == #classOwnershipGraph ifTrue:[
+	self showClassOwnershipGraph:cls.
+	^ self
+    ].
 
     self error:'unknown aspect: ', aspect printString.
 
@@ -29952,6 +30274,12 @@
     "Modified: / 29-12-2011 / 13:48:54 / cg"
 !
 
+classMenuOwnershipGraph
+    "show a classes ownership graph/trend"
+
+    self classMenuChangeAspect:#classOwnershipGraph
+!
+
 classMenuPrimitiveCode:aspect
     "show the classes primitiveFunction in the codeView.
      Also, set accept action to change it."
@@ -31861,8 +32189,7 @@
 			where:[:cls :mthdIn :sel |
 			    |mthd mSource isCandidate isReference usedGlobals|
 
-			    mthd := mthdIn.
-			    mthd isWrapped ifTrue:[ mthd := mthd originalMethod ].
+			    mthd := mthdIn originalMethodIfWrapped.
 
 			    "/ kludge: Lazy methods do not include symbols in the literal array - sigh
 			    mthd isLazyMethod ifTrue:[
@@ -34730,7 +35057,7 @@
 	    self selectedMethods value:nil.
 	    self selectProtocols:nil.
 
-"/            self clearAcceptAction.
+"/            self setNoAcceptAction.
 "/            self clearExplainAction.
 
 	    self normalLabel
@@ -34768,8 +35095,11 @@
     "show a classes repository log - append to codeView.
      CAVEAT: that is almost the same code as found in SystemBrowser;
 	     move to SourceCodeManagerUtilities."
+
     |codeView aStream|
+
     aStream := WriteStream on:(String new:200).
+
     Processor activeProcess
 	withPriority:Processor activePriority-1 to:Processor activePriority
     do:[
@@ -34780,19 +35110,25 @@
 		ifFalse:[ managerOrNil utilities ])
 	    repositoryLogOf:aClass short:shortOrNot onto:aStream
     ].
+
     self codeAspect:#repositoryLog.
     self selectedMethods value:nil.
     self selectProtocols:nil.
+
     codeView := self codeView.
     codeView contents:(codeView contents ,
 		       Character cr asString ,
 		       Character cr asString ,
 		       aStream contents).
+
     codeView modified:false.
     navigationState realModifiedState:false.
-"/    self clearAcceptAction.
+
+"/    self setNoAcceptAction.
 "/    self clearExplainAction.
+
     self normalLabel
+
     "Created: / 11-10-2011 / 20:33:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 21-12-2011 / 20:24:55 / cg"
 !
@@ -36800,6 +37136,9 @@
 commonTraceHelperWith:aSelector with:argumentOrNil clear:doClear
     "install a break/trace or countPoint for the current method(s)"
 
+    |anyHaltIgnored|
+
+    anyHaltIgnored := false.
     self selectedMethodsDo:[:mthdArg |
 	|mthd originalMethod cls sel|
 
@@ -36827,12 +37166,28 @@
 		]
 	    ].
 
-	    sel isNil ifTrue:[sel := mthd selector].
-	    (sel isNil
-	    and:[mthd isWrapped
-	    and:[(originalMethod := mthd originalMethod) notNil]]) ifTrue:[
-		sel := originalMethod selector
-	    ].
+"/            sel isNil ifTrue:[sel := mthd selector].
+"/            (sel isNil
+"/            and:[mthd isWrapped
+"/            and:[(originalMethod := mthd originalMethod) notNil]]) ifTrue:[
+"/                sel := originalMethod selector
+"/            ].
+
+	    anyHaltIgnored := anyHaltIgnored
+				and:[
+				    DebugView
+					isHaltToBeIgnoredIn:mthd
+					atLineNr:1
+					context:nil
+					modifyEntryCount:false
+				]
+	]
+    ].
+
+    anyHaltIgnored ifTrue:[
+	(Dialog confirm:'Some halts/breakpoints are currently ignored (in the debugger).\Stop ignoring now?')
+	ifTrue:[
+	    DebugView stopIgnoringHalts
 	]
     ].
 !
@@ -37003,7 +37358,8 @@
 		 ].
     processes := processes sort:[:a :b | a id < b id].
     processNames := processes collect:[:aProcess |
-			|pName theGroup top topLabel winLabel|
+			|pName theGroup topViews topView topLabel winLabel
+			 busyOrNot iconifiedOrNot sensor pending |
 
 			pName := aProcess nameOrId.
 
@@ -37014,13 +37370,39 @@
 
 			theGroup := windowGroups detect:[:g | g process == aProcess] ifNone:nil.
 			theGroup notNil ifTrue:[
-			    top := theGroup topViews.
-			    top size > 0 ifTrue:[
-				top := top first.
-				topLabel := top label.
-				(topLabel notNil and:[topLabel ~= pName]) ifTrue:[
-				     winLabel := '  ("' , topLabel , '")'.
-				]
+			    topViews := theGroup topViews.
+			    topViews size > 0 ifTrue:[
+				topView := topViews first.
+				topLabel := (topView label ? '').
+
+				busyOrNot := ''.
+				aProcess isDebugged ifTrue:[
+				    busyOrNot := ' debug'
+				] ifFalse:[
+				    (sensor := theGroup sensor) notNil ifTrue:[
+					(pending := sensor pendingEvent) notNil ifTrue:[
+					    (Timestamp now - pending timeStamp) > 1 ifTrue:[
+						(aProcess isDebugged) ifTrue:[
+						    busyOrNot := ' debug'
+						] ifFalse:[
+						    busyOrNot := ' busy'
+						].
+					    ]
+					]
+				    ].
+				].
+				iconifiedOrNot := ''.
+				topView isCollapsed ifTrue:[
+				    iconifiedOrNot := ' iconified' colorizeAllWith:Color blue.
+				].
+				busyOrNot notEmptyOrNil ifTrue:[
+				    busyOrNot := busyOrNot allBold colorizeAllWith:Color red
+				].
+				winLabel := '  ("' , topLabel , '"',busyOrNot,iconifiedOrNot, ')'
+			    ].
+			] ifFalse:[
+			    (aProcess isDebugged) ifTrue:[
+				winLabel := ' (debug)' allBold colorizeAllWith:Color red
 			    ].
 			].
 			aProcess id printString , ' [' , pName , ']' , winLabel
@@ -38468,6 +38850,10 @@
 !
 
 projectMenuBitmapFiles
+    self projectMenuBitmapFilesUsingManager:SourceCodeManager
+!
+
+projectMenuBitmapFilesUsingManager:aManager
     self information:'Sorry - this functionality is not yet implemented'
 !
 
@@ -39375,6 +39761,15 @@
     "
 
     SourceCodeManager isNil ifTrue:[^ self warn:'No SourceCodeManagement is configured.'].
+    self projectMenuCheckRepositoryConsistencyUsingManager:SourceCodeManager
+!
+
+projectMenuCheckRepositoryConsistencyUsingManager:aManager
+    "check for container consistency in the source repository.
+     That is: for every class in the project there must be a container (unstored classes),
+     and for every container there must be a class (obsolete containers).
+     Display this information as required..
+    "
 
     self withWaitCursorDo:[
 	|classesToLoad classesToUnload classesWithMissingContainer classesWithRepositoryMismatches
@@ -39397,8 +39792,8 @@
 
 	    self busyLabel:'Checking ' , packageToCheck , '...'.
 
-	    allContainers := SourceCodeManager getExistingContainersInModule:containerModule directory:containerPackage.
-	    allContainers := allContainers select:[:each | (each startsWith:'.') not].
+	    allContainers := aManager getExistingContainersInModule:containerModule directory:containerPackage.
+	    allContainers := allContainers reject:[:each | (each startsWith:'.') ].
 
 	    hasLoadAll := allContainers includes:'loadAll'.
 	    hasMakeProto := allContainers includes:'Make.proto'.
@@ -39410,7 +39805,7 @@
 
 	    containers := allContainers copyAsOrderedCollection.
 	    containers removeAllFoundIn:#('loadAll' 'Make.proto' 'Make.spec' 'nt.mak' 'bc.mak' 'abbrev.stc' 'extensions.st').
-	    otherFiles := containers select:[:each | (each asFilename hasSuffix:'st') not].
+	    otherFiles := containers reject:[:each | (each asFilename hasSuffix:'st') ].
 	    containers removeAllFoundIn:otherFiles.
 
 	    classesInProject := IdentitySet new.
@@ -39457,7 +39852,7 @@
 		  "/ eachClassInProject isLoaded ifTrue:[
 		    self busyLabel:'Checking ' , packageToCheck , ' - ' , eachClassInProject name.
 
-		    mgr := SourceCodeManagerUtilities default sourceCodeManagerFor:eachClassInProject.
+		    mgr := aManager utilities sourceCodeManagerFor:eachClassInProject.
 		    info := mgr sourceInfoOfClass:eachClassInProject.
 		    info isNil ifTrue:[
 			"/ no container for that class
@@ -39618,6 +40013,13 @@
     "Comparing the current (in-image) version of the project(s)
      against some older version found in the repository."
 
+    self projectMenuCompareAgainstRepositoryUsingManager:SourceCodeManager
+!
+
+projectMenuCompareAgainstRepositoryUsingManager:aManager
+    "Comparing the current (in-image) version of the project(s)
+     against some older version found in the repository."
+
     |dateFormat string dateOrNil symbolicName|
 
     dateFormat := UserPreferences current dateInputFormat.
@@ -39636,9 +40038,9 @@
     self withWaitCursorDo:[
 	self selectedProjects value do:[:eachProject |
 	    dateOrNil notNil ifTrue:[
-		SourceCodeManagerUtilities default compareProject:eachProject withRepositoryVersionFrom:dateOrNil
-	    ] ifFalse:[
-		SourceCodeManagerUtilities default compareProject:eachProject withRepositoryVersionTaggedAs:symbolicName
+		aManager utilities compareProject:eachProject withRepositoryVersionFrom:dateOrNil
+	    ] ifFalse:[
+		aManager utilities compareProject:eachProject withRepositoryVersionTaggedAs:symbolicName
 	    ]
 	].
     ].
@@ -39651,14 +40053,18 @@
     "Comparing the current (in-image) version of the project(s)
      against the stable version found in the repository."
 
+    self projectMenuCompareAgainstStableInRepositoryUsingManager:SourceCodeManager
+!
+
+projectMenuCompareAgainstStableInRepositoryUsingManager:aManager
+    "Comparing the current (in-image) version of the project(s)
+     against the stable version found in the repository."
+
     self withWaitCursorDo:[
 	self selectedProjects value do:[:eachProject |
-	    SourceCodeManagerUtilities default compareProject:eachProject withRepositoryVersionTaggedAs:'stable'
-	].
-    ].
-
-    "Created: / 12-10-2006 / 17:41:55 / cg"
-    "Modified: / 12-10-2006 / 21:46:14 / cg"
+	    aManager utilities compareProject:eachProject withRepositoryVersionTaggedAs:'stable'
+	].
+    ].
 !
 
 projectMenuDocumentation
@@ -40816,6 +41222,10 @@
 !
 
 projectMenuResources
+    self projectMenuResourcesUsingManager:SourceCodeManager
+!
+
+projectMenuResourcesUsingManager:aManager
     self information:'Sorry - this functionality is not yet implemented'
 !
 
@@ -40823,6 +41233,13 @@
 
     <resource: #obsolete> "use ...Using:manager variant"
 
+    self projectMenuSetTagUsingManager:SourceCodeManager
+
+    "Created: / 12-09-2006 / 13:25:09 / cg"
+    "Modified: / 15-10-2011 / 22:45:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+projectMenuSetTagUsingManager:aManager
     |tag allClasses|
 
     tag := Dialog request:'Tag:'.
@@ -40835,7 +41252,7 @@
 				    asOrderedCollection reject:[:cls | cls isPrivate]).
 	].
 
-	SourceCodeManagerUtilities default tagClasses:allClasses as:tag.
+	aManager utilities tagClasses:allClasses as:tag.
     ]
 
     "Created: / 12-09-2006 / 13:25:09 / cg"
@@ -42080,209 +42497,14 @@
      If singleClass is true, a single class will be asked for and browsed,
      otherwise, a match pattern is allowed and a multi-class browser is opened."
 
-    |box boxLabel title okText okText2 okText3 className canFind
-     button2 button3 doWhat doWhat2 doWhat3 classNameHolder updateList
-     allClasses
-     allNames allFullNames initialShortNames initialFullNames
-     resources check showingWhatLabel showFullNameHolder genShortNameListEntry|
-
-    resources := resourcesOrNil ? self class classResources.
-    showFullNameHolder := (LastClassSearchBoxShowedFullName ? false) asValue.
-
-    doWhat := doWhatByDefault.
-    canFind := navigationState notNil and:[ navigationState isFullBrowser ].
-
-    doWhat isNil ifTrue:[
-	title := ''.
-	boxLabel := (resources string:'Select a class').
-	okText := 'OK'.
-	okText2 := nil. doWhat2 := nil.
-	okText3 := nil. doWhat3 := nil.
-    ] ifFalse:[
-	title := (singleClass ifTrue:[ 'Class to browse' ] ifFalse:[ 'Class(es) to browse' ]).
-	boxLabel := (resources string:'Browse or Search').
-
-	(doWhat isNil and:[canFind not]) ifTrue:[
-	    doWhat := #newBuffer.
-	].
-
-	doWhat == #newBrowser ifTrue:[
-	    okText := 'Open'.
-	    okText2 := 'Add Buffer'. doWhat2 := #newBuffer.
-	    okText3 := 'Find'.       doWhat3 := nil.
-	] ifFalse:[ doWhat == #newBuffer ifTrue:[
-	    okText := 'Add Buffer'.
-	    okText2 := 'Open New'.   doWhat2 := #newBrowser.
-	    okText3 := 'Find'.       doWhat3 := nil.
-	] ifFalse:[
-	    title := (singleClass ifTrue:[ 'Class to find' ] ifFalse:[ 'Class(es) to find' ]).
-	    okText := 'Find'.
-	    okText2 := 'Open New'.   doWhat2 := #newBrowser.
-	    okText3 := 'Add Buffer'. doWhat3 := #newBuffer.
-	]].
-    ].
-
-    genShortNameListEntry :=
-	[:cls |
-	    |ns|
-	    cls isNil ifTrue:[
-		nil
-	    ] ifFalse:[
-		ns := cls topNameSpace name.
-		ns = 'Smalltalk'
-		    ifTrue:[ ns := '' ]
-		    ifFalse:[ns := ' (in ',ns,')'].
-		cls nameWithoutNameSpacePrefix,ns
-	    ].
-	].
-
-    initialFullNames := self class visitedClassNamesHistory.
-    initialShortNames := initialFullNames collect:[:nm | genShortNameListEntry value:(Smalltalk at:nm)] thenSelect:[:nm | nm notNil].
-
-    title := (resources string:title) , msgTail , '.\' , (resources string:'(TAB to complete; matchPattern allowed):').
-
-    box := self
-		enterBoxForClassWithCodeSelectionTitle:title withCRs
-		withList:(showFullNameHolder value ifTrue:[initialFullNames] ifFalse:[initialShortNames])
-		okText:okText.
-
-    box label:boxLabel.
-
-    doWhat notNil ifTrue:[
-	button2 := Button label:(resources string:okText2).
-	navigationState isFullBrowser "singleClass" ifTrue:[
-	    button3 := Button label:(resources string:okText3)
-	].
-	(DialogBox defaultOKButtonAtLeft) ifFalse:[
-	    box addButton:button2 before:(box okButton).
-	    button3 notNil ifTrue:[box addButton:button3 before:button2].
-	] ifTrue:[
-	    box addButton:button2 after:(box okButton).
-	    button3 notNil ifTrue:[box addButton:button3 after:button2].
-	].
-
-	button2 action:[
-	   doWhat := doWhat2.
-	   box doAccept.
-	   box okPressed.
-	].
-	button3 notNil ifTrue:[
-	    button3 action:[
-	       doWhat := doWhat3.
-	       box doAccept.
-	       box okPressed.
-	    ].
-	].
-    ].
-
-    allClasses := Smalltalk allClasses copyAsOrderedCollection.
-
-    allNames := (allClasses
-		    collect:[:cls |
-			|ns|
-			ns := cls topNameSpace name.
-			ns = 'Smalltalk'
-			    ifTrue:[ ns := '' ]
-			    ifFalse:[ns := ' (in ',ns,')'].
-			cls isNameSpace ifTrue:[
-			    cls nameWithoutNameSpacePrefix,ns,' (Namespace)'
-			] ifFalse:[
-			    cls nameWithoutNameSpacePrefix,ns
-			]
-		    ]) sortWith:allClasses; yourself.
-    allFullNames := (allClasses collect:[:cls | cls name]) sortWith:allClasses; yourself.
-
-    updateList := [
-	    |nameToSearch list namesStarting namesIncluding lcName nameList|
-
-	    (nameToSearch := classNameHolder value withoutSeparators) isEmpty ifTrue:[
-		showingWhatLabel label:(resources string:'Recently visited:').
-		list := (showFullNameHolder value ifTrue:[initialFullNames] ifFalse:[initialShortNames]).
-	    ] ifFalse:[
-		showingWhatLabel label:(resources string:'Matching classes:').
-		nameList := showFullNameHolder value
-				ifTrue:[ allFullNames ]
-				ifFalse:[ allNames ].
-
-		lcName := nameToSearch asLowercase.
-		(lcName includesString:'::') ifTrue:[
-		    list := OrderedCollection new.
-		    allClasses doWithIndex:[:cls :idx |
-			|isIncluded|
-
-			(nameToSearch includesMatchCharacters) ifTrue:[
-			    isIncluded := (lcName match:cls name asLowercase)
-			] ifFalse:[
-			    isIncluded := (cls name includesString:lcName caseSensitive:false)
-			].
-			isIncluded ifTrue:[
-			    list add:(nameList at:idx)
-			].
-		    ].
-		] ifFalse:[
-		    (nameToSearch includesMatchCharacters) ifTrue:[
-			list := nameList select:[:nm | lcName match:nm asLowercase]
-		    ] ifFalse:[
-			namesIncluding := nameList
-					    select:[:nm |
-						"/ nm asLowercase startsWith:lcName
-						nm asLowercase includesString:lcName caseSensitive:false
-					    ].
-			namesStarting := namesIncluding select:[:nm | nm asLowercase startsWith:lcName].
-			list := namesStarting , {nil} , (namesIncluding \ namesStarting).
-		    ]
-		]
-	    ].
-	    box listView
-		list:list;
-		scrollToLine:((list findFirst:[:line | (line ? '') startsWith:lcName]) max:1)
-	].
-
-    classNameHolder := '' asValue.
-    box enterField
-	model:classNameHolder;
-	immediateAccept:true.
-    classNameHolder onChangeEvaluate:updateList.
-
-    box entryCompletionBlock:(DoWhatIMeanSupport classNameEntryCompletionBlock).
-    box action:[:aString | className := aString].
-
-    box panelView
-	addSubView:(showingWhatLabel := (Label label:(resources string:'Recently visited:')) adjust:#left) before:nil;
-	addSubView:(check := CheckBox label:(resources string:'Show Full Name (do not strip off Namespace)') model:showFullNameHolder) before:nil.
-    showFullNameHolder onChangeEvaluate:updateList.
-    box enterField origin:(0 @ check corner y).
-    box listView origin:(0 @ check corner y).
-
-    box extent:(400 @ 350).
-    box open.
-
-    className isEmptyOrNil ifTrue:[^ nil "cancel"].
-
-    LastClassSearchBoxShowedFullName := showFullNameHolder value.
-
-    (className endsWith:$) ) ifTrue:[
-	(className indexOfSubCollection:'(in ') == 0 ifTrue:[
-	    "/ a namespace
-	    className := (className copyTo:(className indexOfSubCollection:'(Name')-1) withoutSeparators
-	] ifFalse:[
-	    className := ((className copyFrom:(className indexOfSubCollection:'(in ')+4)
-			    copyWithoutLast:1)
-			 , '::' , className asCollectionOfWords first
-	].
-    ].
-
-    doWhat isNil ifTrue:[
-	aBlock notNil ifTrue:[aBlock value:className optionalArgument:singleClass and:doWhat].
-	^ className
-    ].
-
-    self withSearchCursorDo:[
-	aBlock value:className value:singleClass value:doWhat.
-    ].
-    ^ className
-
-    "Modified: / 23-07-2012 / 11:00:22 / cg"
+    ^ self class
+	askForClassToSearch:doWhatByDefault
+	single:singleClass
+	msgTail:msgTail
+	resources:resourcesOrNil
+	filter:nil
+	forBrowser:self
+	thenDo:aBlock
 !
 
 askForClassToSearch:doWhatByDefault single:singleClass msgTail:msgTail thenDo:aBlock
@@ -42311,12 +42533,18 @@
 
 	    aliases := Smalltalk
 			keysAndValuesSelect:[:nm :val | (nm sameAs:classNameArg) ]
-			thenCollect:[:nm :val | val isBehavior ifTrue:[val] ifFalse:[val class]].
+			thenCollect:[:nm :val | val isNil
+						    ifTrue:[ nil ]
+						    ifFalse:[
+							val isBehavior
+							    ifTrue:[val]
+							    ifFalse:[val class]]].
+	    aliases := aliases select:[:cls | cls notNil].
 
 	    classes := (self class classesWithNameSimilarTo:className from:currentNamespace) asOrderedCollection.
-	    classes := classes select:[:each | each isRealNameSpace not].
-
-	    aliases := aliases select:[:eachAlias | (classes includesIdentical:eachAlias) not].
+	    classes := classes reject:[:each | each isRealNameSpace].
+
+	    aliases := aliases reject:[:eachAlias | (classes includesIdentical:eachAlias)].
 	    classes addAll:aliases.
 
 	    class := classes firstIfEmpty:nil.
@@ -42393,16 +42621,15 @@
     className includesMatchCharacters ifFalse:[
 	class := Smalltalk at:className asSymbol.
 	class isBehavior ifTrue:[
-	    classes := Array with:class
+	    classes := IdentitySet with:class
 	]
     ] ifTrue:[
-	classes := Smalltalk allClasses select:[:each | className match:each name].
-	classes := classes asOrderedCollection.
+	classes := Smalltalk allClasses select:[:each | className match:each name] as:IdentitySet.
     ].
     classes size == 0 ifTrue:[
 	^ self warn:'No className matches'.
     ].
-    classes := classes asSet.
+
     classes copy do:[:eachClass |
 	|owner|
 
@@ -44155,6 +44382,10 @@
 !
 
 selectorMenuCheckInProjectExtensions
+    self selectorMenuCheckInProjectExtensionsUsingManager:SourceCodeManager
+!
+
+selectorMenuCheckInProjectExtensionsUsingManager:aManager
     |projects|
 
     projects := self selectedMethodsValue collect:[:each | each package] as:Set.
@@ -44164,7 +44395,7 @@
 	    classes:false
 	    extensions:true
 	    buildSupport:false
-	    usingManager:SourceCodeManager
+	    usingManager:aManager
     ].
 
     "Modified: / 28-02-2012 / 16:28:43 / cg"
@@ -44575,6 +44806,59 @@
 	]
 !
 
+selectorMenuGenerateRedefinitionInSubclass
+    "generate a ^ super xxx in a subclass"
+
+    |possibleSubclasses selectedSubclasses|
+
+    possibleSubclasses :=
+	(self selectedMethodsClasses collectAll:[:cls |
+	    cls allSubclasses
+	]) asSet.
+
+    possibleSubclasses isEmpty ifTrue:[
+	Dialog information:'No subclass'.
+	^ self
+    ].
+    possibleSubclasses size == 1 ifTrue:[
+	selectedSubclasses := possibleSubclasses
+    ] ifFalse:[
+	possibleSubclasses := possibleSubclasses asOrderedCollection sort:[:a :b | a name < b name].
+	selectedSubclasses := Dialog
+	    choose:'Generate super-send in class(es):'
+	    fromList:possibleSubclasses values:possibleSubclasses
+	    buttons:nil values:nil
+	    lines:10 cancel:nil multiple:true.
+
+	selectedSubclasses isEmptyOrNil ifTrue:[^ self].
+    ].
+
+    self
+    generateUndoableChangeOverSelectedMethods:'Generate Responsibility for %(singleMethodNameOrNumberOfMethods)'
+    via:[:generator :eachMethod |
+	|selector category implClass defineIt parser spec |
+
+	selector := eachMethod selector.
+	category := eachMethod category.
+
+	parser := Parser for:eachMethod source.
+	parser parseMethod.
+	spec := Parser methodSpecificationForSelector:selector argNames:parser methodArgs.
+
+	selectedSubclasses do:[:eachSubClass |
+	    |code|
+
+	    (eachSubClass includesSelector:selector) ifFalse:[
+		code := (spec , '\    "/ self halt.\    ^ super ',spec) withCRs.
+		generator
+		    compile:code
+		    forClass:eachSubClass
+		    inCategory:category
+	    ].
+	].
+    ]
+!
+
 selectorMenuGenerateSubclassResponsibilityHere
     "generate a subclassResponsibility method (for the selected string)
      in the current class"
@@ -46758,16 +47042,20 @@
 
     allNames := Set new.
     (self selectedClasses value ? #()) do:[:eachClass |
-	(varType == #classVarNames or:[ varType == #poolVarNames ]) ifTrue:[
+	(varType == #classVarNames) ifTrue:[
 	    allNames addAll:(eachClass allClassVarNames).
 	] ifFalse:[
-	    (varType == #instVarNames) ifTrue:[
-		allNames addAll:(eachClass allInstVarNames).
-	    ] ifFalse:[
-		(varType == #classInstVarNames) ifTrue:[
-		    allNames addAll:(eachClass theMetaclass allInstVarNames).
+	    (varType == #poolVarNames) ifTrue:[
+		allNames addAll:(eachClass classVarNames).
+	    ] ifFalse:[
+		(varType == #instVarNames) ifTrue:[
+		    allNames addAll:(eachClass allInstVarNames).
 		] ifFalse:[
-		    "/ self halt
+		    (varType == #classInstVarNames) ifTrue:[
+			allNames addAll:(eachClass theMetaclass allInstVarNames).
+		    ] ifFalse:[
+			"/ self halt
+		    ]
 		]
 	    ]
 	].
@@ -47823,7 +48111,7 @@
     ] ifFalse:[
 	searchClass := currentClass whichClassDefinesInstVar:name.
 
-	idx := searchClass instVarOffsetOf:name.
+	idx := searchClass instVarIndexFor:name.
 	idx isNil ifTrue:[^ nil].
 
 	classes := IdentitySet new.
@@ -49451,12 +49739,12 @@
     ^self
 	commonMenuSCMSliceNamed: #categoryMenuSCMSlice
 	computeManagerWith:
-	    [:managers|
+	    [:managersInOutCollection|
 	    self selectedCategoryClassesDo: [:cls|
 		| mgr |
 
 		mgr := cls theNonMetaclass sourceCodeManager.
-		mgr isNil ifFalse:[managers add: mgr]
+		mgr isNil ifFalse:[managersInOutCollection add: mgr]
 	    ]].
 
     "Created: / 19-04-2011 / 14:29:47 / cg"
@@ -49609,6 +49897,7 @@
     ] ifFalse:[
 	manager := nil
     ].
+
     item := menu menuItemWithKey:#SCM.
     (item notNil) ifTrue:[
 	manager notNil ifTrue:[
@@ -51311,6 +51600,15 @@
     |theNonMetaclass|
 
     theNonMetaclass := aClass theNonMetaclass.
+    codeAspect == #classOwnershipGraph ifTrue:[
+	self showClassOwnershipGraph:theNonMetaclass.
+	^ self
+    ].
+
+    self codeView isCodeView2 ifTrue:[
+	self codeView enableAllServices
+    ].
+
     codeAspect == #classComment ifTrue:[
 	self showClassComment:theNonMetaclass.
 	^ self.
@@ -51323,9 +51621,11 @@
     ((codeAspect == #primitiveDefinitions)
     or:[ (codeAspect == #primitiveFunctions)
     or:[ (codeAspect == #primitiveVariables) ]]) ifTrue:[
-	self showClassPrimitive:codeAspect class:aClass theNonMetaclass.
-	^ self.
-    ].
+	self showClassPrimitive:codeAspect class:theNonMetaclass.
+	^ self.
+    ].
+
+    self codeAspect: #classDefinition.
     self setAcceptActionForClass.
     self showClassDefinition:aClass.
 !
@@ -51449,6 +51749,148 @@
     "Modified: / 8.11.2001 / 23:07:57 / cg"
 !
 
+showClassOwnershipGraph:aClass
+    |mgr info log numLinesByAuthorAndVersion numLinesByAuthor lineInfo
+     prevAuthor prevRevision|
+
+    self codeAspect:#classOwnershipGraph.
+    self setNoAcceptAction.
+    self codeView isCodeView2 ifTrue:[
+	self codeView disableAllServices
+    ].
+
+    aClass isNil ifTrue:[ ^ self ].
+    (aClass isClass or:[aClass isMetaclass]) ifFalse:[ ^ self ].
+    aClass isLoaded ifFalse:[^ self].
+
+    mgr := aClass sourceCodeManager.
+
+"/     info := aClass revisionInfo.
+    self withWaitCursorDo:[
+	log := mgr
+		revisionLogOf:aClass
+		fromRevision:nil toRevision:nil finishAfter:nil.
+
+	numLinesByAuthorAndVersion := OrderedCollection new.
+	(log at:#revisions) reverseDo:[:eachRevision |
+	    |author revision codeStream codeLines diffs|
+
+	    author := eachRevision at:#author.
+	    revision := eachRevision at:#revision.
+	    numLinesByAuthorAndVersion isEmpty ifTrue:[
+		codeStream := mgr getSourceStreamFor:aClass revision:revision.
+		codeLines := codeStream contents.
+		codeStream close.
+
+		numLinesByAuthor := Bag new.
+		numLinesByAuthor add:author withOccurrences:codeLines size.
+	    ] ifFalse:[
+		lineInfo isNil ifTrue:[
+		    lineInfo := OrderedCollection new:(numLinesByAuthor size) withAll:prevAuthor.
+		].
+		self activityNotification:('diffing %1 against %2' bindWith:prevRevision with:revision).
+		diffs := mgr
+			    diffListFor:aClass fileName:nil directory:nil module:nil
+			    revision1:prevRevision revision2:revision.
+
+		[
+		    |state delta|
+
+		    delta := 0.
+		    state := #initial.
+		    diffs do:[:entry |
+			|s nr1a nr1b op nr2a nr2b|
+
+			state ~~ #initial ifTrue:[
+			    state == #changed ifTrue:[
+				(entry startsWith:'<') ifTrue:[
+				] ifFalse:[
+				    (entry startsWith:'>') ifTrue:[
+				    ] ifFalse:[
+					(entry startsWith:'---') ifTrue:[
+					] ifFalse:[
+					    entry first isDigit ifFalse:[
+						self halt
+					    ].
+					    state := #initial.
+					]
+				    ]
+				]
+			    ] ifFalse:[
+				state == #added ifTrue:[
+				    (entry startsWith:'>') ifTrue:[
+				    ] ifFalse:[
+					entry first isDigit ifFalse:[
+					    self halt
+					].
+					state := #initial.
+				    ]
+				] ifFalse:[
+				    state == #deleted ifTrue:[
+					(entry startsWith:'<') ifTrue:[
+					] ifFalse:[
+					    entry first isDigit ifFalse:[
+						self halt
+					    ].
+					    state := #initial.
+					]
+				    ] ifFalse:[
+					self halt.
+				    ]
+				]
+			    ]
+			].
+
+			"entry is of the form <nr> <op> <offs> [<offs2>]"
+			state == #initial ifTrue:[
+			    s := ReadStream on:entry.
+			    nr1a := nr1b := Integer readFrom:s.
+			    s peek == $, ifTrue:[
+				s next.
+				nr1b := Integer readFrom:s
+			    ].
+			    op := s next.
+			    nr2a := nr2b := Integer readFrom:s.
+			    s peek == $, ifTrue:[
+				s next.
+				nr2b := Integer readFrom:s
+			    ].
+
+			    op == $c ifTrue:[
+				state := #changed.
+				lineInfo removeFromIndex:delta+nr1a toIndex:delta+nr1b.
+				delta := delta - (nr1b - nr1a + 1).
+				lineInfo addAll:(Array new:(nr2b - nr2a + 1) withAll:author) afterIndex:delta+nr1a.
+				delta := delta + (nr2b - nr2a + 1).
+			    ] ifFalse:[
+				(op == $a) ifTrue:[
+				    state := #added.
+				    lineInfo addAll:(Array new:(nr2b - nr2a + 1) withAll:author) afterIndex:delta+nr1a.
+				    delta := delta + (nr2b - nr2a + 1).
+				] ifFalse:[
+				    op == $d ifTrue:[
+					state := #deleted.
+					lineInfo removeFromIndex:delta+nr1a toIndex:delta+nr1b.
+					delta := delta - (nr1b - nr1a + 1).
+				    ] ifFalse:[
+					self halt:'unexpected diff entry'.
+				    ]
+				]
+			    ].
+			].
+		    ]
+		] value.
+
+		numLinesByAuthor := lineInfo asBag.
+	    ].
+	    numLinesByAuthorAndVersion add:(revision -> numLinesByAuthor).
+	    prevAuthor := author.
+	    prevRevision := revision.
+	].
+	self codeView list:(Array with:(OwnershipGraph new ownershipInfo:numLinesByAuthorAndVersion)).
+    ].
+!
+
 showClassPrimitive:aspect class:aClass
     |primCode codeView|
 
@@ -52814,101 +53256,11 @@
     "convenient method: setup an enterBox with initial text taken
      from the codeviews selection."
 
-    |sel box initialText superclass currentClass
-     methods someMethod offeredClass anyClose closeName s usedGlobals list|
-
-    currentClass := self theSingleSelectedClass.
-    list := listOrNil.
-
-    sel := self selectionInCodeView.
-    sel notNil ifTrue:[
-	self selectedNamespacesValue doWithExit:[:eachNs :exit |
-	    s := eachNs , '::' , sel asSymbol.
-	    (s knownAsSymbol
-	    and:[(Smalltalk at:s asSymbol) isBehavior]) ifTrue:[
-		"/ a private class of current ...
-		sel := eachNs , '::' , sel asSymbol.
-		exit value:nil.
-	    ].
-	].
-	(sel knownAsSymbol and:[currentClass notNil
-	and:[(currentClass theNonMetaclass privateClassesAt:sel asSymbol) notNil]]) ifTrue:[
-	    "/ a private class of current ...
-	    sel := (currentClass theNonMetaclass privateClassesAt:sel asSymbol) name
-	] ifFalse:[
-	    (sel knownAsSymbol and:[(Smalltalk at:sel asSymbol) isBehavior]) ifFalse:[
-		"/ ignore it, if there is no class-name which comes close.
-		anyClose := false.
-		Smalltalk keysAndValuesDo:[:aGlobalName :aGlobal|
-		    aGlobal isBehavior ifTrue:[
-			aGlobal isMeta ifFalse:[
-			    aGlobal name == aGlobalName ifTrue:[
-				((aGlobalName startsWith:sel)
-				or:[(sel startsWith:aGlobalName)]) ifTrue:[
-				    closeName isNil ifTrue:[closeName := aGlobalName].
-				    anyClose := true.
-				]
-			    ]
-			]
-		    ]
-		].
-		anyClose ifFalse:[
-		    sel := nil
-		] ifTrue:[
-		    sel := closeName
-		]
-	    ]
-	]
-    ].
-
-    sel notNil ifTrue:[
-	initialText := sel asString withoutSeparators
-    ] ifFalse:[
-	self codeAspect == SyntaxHighlighter codeAspectMethod ifTrue:[
-	    methods := self selectedMethodsValue.
-	    methods size > 0 ifTrue:[
-		someMethod := methods first.
-		usedGlobals := someMethod usedGlobals collect:[:eachVar | eachVar asSymbol].
-		usedGlobals := usedGlobals select:[:eachVar | (Smalltalk at:eachVar) isBehavior].
-		usedGlobals size > 0 ifTrue:[
-		    list := list reject:[:each | usedGlobals includes:each ].
-		    list := usedGlobals asOrderedCollection sort , list.
-		    offeredClass := Smalltalk at:usedGlobals first
-		] ifFalse:[
-		    offeredClass := someMethod mclass
-		]
-	    ]
-	] ifFalse:[
-	    (navigationState isVersionDiffBrowser
-	    or:[navigationState isClassDocumentationBrowser]) ifTrue:[
-		offeredClass := currentClass.
-		(offeredClass notNil and:[offeredClass isPrivate]) ifTrue:[
-		    offeredClass := offeredClass owningClass
-		]
-	    ] ifFalse:[
-		(currentClass notNil
-		and:[(superclass := currentClass superclass) notNil]) ifTrue:[
-		    offeredClass := superclass
-		]
-	    ]
-	].
-	offeredClass notNil ifTrue:[
-	    initialText := offeredClass theNonMetaclass name
-	]
-    ].
-
-    box := self
-		enterBoxTitle:((resources ? self class classResources) string:title)
-		withList:list
-		okText:((resources ? self class classResources) string:okText).
-
-    initialText notNil ifTrue:[
-	box initialText:initialText
-    ].
-    ^ box
-
-    "Created: / 13-02-2000 / 20:56:18 / cg"
-    "Modified: / 27-07-2012 / 22:18:34 / cg"
+    ^ self class
+	enterBoxForClassWithCodeSelectionTitle:title
+	withList:listOrNil
+	okText:okText
+	forBrowser:self
 !
 
 enterBoxForCodeSelectionTitle:title okText:okText
@@ -52973,32 +53325,14 @@
 enterBoxTitle:title okText:okText label:label
     "convenient method: setup enterBox (especially do the resource stuff)"
 
-    |box|
-
-    box := EnterBox new.
-    box label:(resources string:label).
-    box title:(resources string:title)
-	okText:(resources string:okText).
-    ^ box
-
-
+    ^ self class enterBoxTitle:title okText:okText label:label
 !
 
 enterBoxTitle:title withList:aListOrNil okText:okText
     "convenient method: setup enterBox"
 
-    |box rsrcs|
-
-    aListOrNil notNil ifTrue:[
-	box := ListSelectionBox new.
-	"/ box := EnterBoxWithList new.
-	box list:aListOrNil.
-    ] ifFalse:[
-	box := EnterBox new.
-    ].
-    rsrcs := (resources ? self class classResources).
-    box title:(rsrcs string:title) okText:(rsrcs string:okText).
-    ^ box
+    ^ self class
+	enterBoxTitle:title withList:aListOrNil okText:okText
 
     "Created: / 13.2.2000 / 20:53:53 / cg"
     "Modified: / 1.3.2000 / 11:15:09 / cg"
@@ -58555,7 +58889,7 @@
     "filter keyboard events for some function key.
      Return true, if I have eaten the event"
 
-    ((rawKey == #BackSpace) or:[ key == #CursorLeft ]) ifTrue:[
+    ((false "rawKey == #BackSpace") or:[ key == #CursorLeft ]) ifTrue:[
 	self
 	    enqueueMessage:#backToLastClass
 	    for:self
@@ -58583,7 +58917,7 @@
     "filter keyboard events for some function key.
      Return true, if I have eaten the event"
 
-    ((rawKey == #BackSpace) or:[ key == #CursorLeft ]) ifTrue:[
+    ((false "rawKey == #BackSpace") or:[ key == #CursorLeft ]) ifTrue:[
 	self
 	    enqueueMessage:#backToLastClass
 	    for:self
@@ -58618,7 +58952,7 @@
     "filter keyboard events for some function key.
      Return true, if I have eaten the event"
 
-    ((rawKey == #BackSpace) or:[ key == #CursorLeft ]) ifTrue:[
+    ((false "rawKey == #BackSpace") or:[ key == #CursorLeft ]) ifTrue:[
 	self
 	    enqueueMessage:#backToLastClass
 	    for:self
@@ -58632,7 +58966,7 @@
 	    arguments:#().
 	^ true
     ].
-    ((key == #Cut) or:[rawKey == #Delete]) ifTrue:[
+    ((key == #Cut) or:[rawKey == #Delete or:[rawKey == #Backspace]]) ifTrue:[
 	self
 	    enqueueMessage:#classMenuRemove
 	    for:self
@@ -58730,6 +59064,13 @@
     ].
     (key == #BackSpace) ifTrue:[
 	self
+	    enqueueMessage:#selectorMenuRemoveAndSelectPrevious "/ #selectorMenuSaveRemove
+	    for:self
+	    arguments:#().
+	^ true
+    ].
+    (key == #Delete) ifTrue:[
+	self
 	    enqueueMessage:#selectorMenuRemoveAndSelectNext "/ #selectorMenuSaveRemove
 	    for:self
 	    arguments:#().
@@ -58773,7 +59114,7 @@
     "filter keyboard events for some function key.
      Return true, if I have eaten the event"
 
-    ((rawKey == #BackSpace) or:[ key == #CursorLeft ]) ifTrue:[
+    ((false "rawKey == #BackSpace") or:[ key == #CursorLeft ]) ifTrue:[
 	self
 	    enqueueMessage:#backToLastClass
 	    for:self
@@ -58796,7 +59137,7 @@
 
     |variablesToRemove|
 
-    ((key == #Cut) or:[rawKey == #Delete]) ifTrue:[
+    ((key == #Cut) or:[rawKey == #Delete or:[rawKey == #Backspace]]) ifTrue:[
 	variablesToRemove := self selectedVariables value.
 	variablesToRemove size > 0 ifTrue:[
 	    self
@@ -59201,14 +59542,210 @@
     "Modified: / 06-04-2012 / 13:30:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!NewSystemBrowser::OwnershipGraph class methodsFor:'documentation'!
+
+documentation
+" }
+
+ Replace 'Object', 'NewClass1' and
+ the empty string arguments by true values.
+
+ Install (or change) the class by 'accepting',
+ either via the menu or the keyboard (usually CMD-A).
+
+ You can also change the category simply by editing
+ the categoryString and accepting.
+
+ To be nice to others (and yourself later), do not forget to
+ add some documentation; preferably under the classes documentation
+ protocol.
+ (see the `create documentation stubs' item in the methodList menu;
+  switch from instance to class to find this menu item.)
+
+ Notice, that ST/X uses the convention to document the class using
+ comment-only class methods (however, ST80 comments are supported and
+ can be changed via the class-documentation menu).
+
+"
+! !
+
+!NewSystemBrowser::OwnershipGraph methodsFor:'accessing'!
+
+ownershipInfo
+    ^ ownershipInfo
+!
+
+ownershipInfo:something
+    ownershipInfo := something.
+! !
+
+!NewSystemBrowser::OwnershipGraph methodsFor:'list protocol'!
+
+asString
+    ^ ''
+!
+
+asStringWithoutEmphasis
+    ^ ''
+!
+
+bitsPerCharacter
+    ^ 8 "/ dummy
+!
+
+displayOn:aGC x:x y:y opaque:opaque
+    |maxNumLines xRun hGraph wCol colorsPerOwner colorsToUse
+     yLine font sepAgenda|
+
+    colorsPerOwner := OrderedDictionary new.
+    colorsToUse := self ownerColorsToUse copy.
+
+    hGraph := self graphHeight.
+    wCol := self columnWidth.
+    font := aGC font.
+
+    "/ aGC displayRectangleX:x y:y width:(self widthOn:aGC) height:hGraph.
+
+    maxNumLines := (ownershipInfo collect:[:entry | entry value size]) max.
+
+    xRun := x.
+    ownershipInfo do:[:revInfo |
+	|numOverallLines hAll rev info yBot|
+
+	rev := revInfo key.
+	info := revInfo value.
+	numOverallLines := info size.
+
+	yBot := y + hGraph.
+	hAll := 0.
+	(info valuesAndCounts copy sort:[:a :b | a value > b value]) do:[:eachAssoc |
+	    |author numLines hThis color yTop|
+
+	    author := eachAssoc key.
+	    numLines := eachAssoc value.
+	    hThis := hGraph * numLines // maxNumLines.
+	    yTop := yBot - hThis.
+	    color := colorsPerOwner at:author ifAbsentPut:[colorsToUse removeFirst].
+	    aGC paint:color.
+	    aGC fillRectangleX:xRun y:yTop width:wCol height:hThis.
+	    hAll := hAll + hThis.
+	    yBot := yTop.
+	].
+
+	"/ hAll := hGraph * numOverallLines // maxNumLines.
+	aGC paint:Color black.
+	aGC displayRectangleX:xRun y:(y + (hGraph - hAll))
+		width:wCol
+		height:hAll.
+
+	aGC displayString:rev
+		x:xRun+(font height)
+		y:(y + hGraph+5+(font widthOf:rev)) angle:-90.
+	xRun := xRun + wCol
+    ].
+
+    sepAgenda := self agendaSeparatorWidth.
+
+    yLine := y + (font ascent).
+    colorsPerOwner keysAndValuesDo:[:name :color |
+	aGC paint:color.
+	aGC fillRectangleX:(xRun+sepAgenda) y:yLine-(font ascent) width:16 height:16.
+	aGC paint:Color black.
+	aGC displayRectangleX:(xRun+sepAgenda) y:yLine-(font ascent) width:16 height:16.
+	aGC displayString:name x:(xRun+sepAgenda+16+5) y:yLine.
+	yLine := yLine + (font height + 10).
+    ].
+    aGC paint:Color black.
+!
+
+emphasis
+    ^ '' emphasis
+!
+
+hasChangeOfEmphasis
+    ^ false
+!
+
+ownerColorsToUse
+    |colorsToUse|
+
+    colorsToUse := OrderedCollection new.
+    colorsToUse add:(Color green).
+    colorsToUse add:(Color blue).
+    colorsToUse add:(Color yellow).
+    colorsToUse add:(Color red).
+    colorsToUse add:(Color cyan).
+    colorsToUse add:(Color magenta).
+    colorsToUse add:(Color brown).
+    colorsToUse add:(Color orange).
+
+    colorsToUse add:(Color green lightened).
+    colorsToUse add:(Color blue lightened).
+    colorsToUse add:(Color yellow lightened).
+    colorsToUse add:(Color red lightened).
+    colorsToUse add:(Color cyan lightened).
+    colorsToUse add:(Color magenta lightened).
+    colorsToUse add:(Color brown lightened).
+    colorsToUse add:(Color orange lightened).
+
+    colorsToUse add:(Color green darkened).
+    colorsToUse add:(Color blue darkened).
+    colorsToUse add:(Color yellow darkened).
+    colorsToUse add:(Color red darkened).
+    colorsToUse add:(Color cyan darkened).
+    colorsToUse add:(Color magenta darkened).
+    colorsToUse add:(Color brown darkened).
+    colorsToUse add:(Color orange darkened).
+
+    ^ colorsToUse
+!
+
+string
+    ^ ''
+!
+
+withoutTrailingSeparators
+    ^ ''
+! !
+
+!NewSystemBrowser::OwnershipGraph methodsFor:'queries'!
+
+agendaInfoWidth
+    ^ 200
+!
+
+agendaSeparatorWidth
+    ^ 20
+!
+
+columnWidth
+    ^ 20
+!
+
+graphHeight
+    ^ 300
+!
+
+heightOn:aGC
+    ^ self graphHeight + self revisionInfoHeight
+!
+
+revisionInfoHeight
+    ^ 100
+!
+
+widthOn:aGC
+    ^ (ownershipInfo size * self columnWidth) + 10 + self agendaInfoWidth
+! !
+
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1905 2013-06-23 10:48:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1923 2013-06-30 08:10:08 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1905 2013-06-23 10:48:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1923 2013-06-30 08:10:08 cg Exp $'
 !
 
 version_HG
@@ -59217,7 +59754,7 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__NewSystemBrowser.st,v 1.1905 2013-06-23 10:48:12 cg Exp $'
+    ^ '$Id: Tools__NewSystemBrowser.st,v 1.1923 2013-06-30 08:10:08 cg Exp $'
 ! !
 
 
--- a/Tools__TagsBrowser.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__TagsBrowser.st	Mon Jul 01 22:15:23 2013 +0100
@@ -1186,15 +1186,6 @@
       )
 ! !
 
-!TagsBrowser methodsFor:'* As yet uncategorized *'!
-
-assignFocusToTagFilterInputField    
-    (self builder componentAt:#TagFilterInputField) requestFocus.
-    "/ (self builder componentAt:#TagFilterInputField) takeFocus
-
-    "Created: / 02-08-2012 / 22:00:45 / cg"
-! !
-
 !TagsBrowser methodsFor:'accessing'!
 
 action:aOneArgBlock
@@ -1289,6 +1280,19 @@
     "Modified: / 05-05-2011 / 15:33:07 / cg"
 !
 
+dartClassesAndMethodsOnly
+    ^ tagList dartClassesAndMethodsOnly
+!
+
+dartClassesAndMethodsOnly:aBool
+    aBool ifTrue:[
+        tagList hideDartClasses:false.
+        tagList hideDartMethods:false.
+    ].
+    tagList dartClassesAndMethodsOnly:aBool.
+    self updateTagList
+!
+
 dartClassesOnly
     ^ tagList dartClassesOnly
 !
@@ -1301,6 +1305,18 @@
     self updateTagList
 !
 
+dartMethodsOnly
+    ^ tagList dartMethodsOnly
+!
+
+dartMethodsOnly:aBool
+    aBool ifTrue:[
+        tagList hideDartMethods:false.
+    ].
+    tagList dartMethodsOnly:aBool.
+    self updateTagList
+!
+
 definesOnly
     ^ tagList definesOnly
 !
@@ -2314,6 +2330,13 @@
 
 !TagsBrowser methodsFor:'startup & release'!
 
+assignFocusToTagFilterInputField    
+    (self builder componentAt:#TagFilterInputField) requestFocus.
+    "/ (self builder componentAt:#TagFilterInputField) takeFocus
+
+    "Created: / 02-08-2012 / 22:00:45 / cg"
+!
+
 cloneWith:anApplication
 "/    |browser|
 "/
@@ -2603,11 +2626,11 @@
 !TagsBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagsBrowser.st,v 1.34 2013-06-21 00:40:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagsBrowser.st,v 1.35 2013-06-30 20:06:12 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagsBrowser.st,v 1.34 2013-06-21 00:40:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagsBrowser.st,v 1.35 2013-06-30 20:06:12 cg Exp $'
 !
 
 version_HG
@@ -2616,6 +2639,6 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__TagsBrowser.st,v 1.34 2013-06-21 00:40:34 cg Exp $'
+    ^ '$Id: Tools__TagsBrowser.st,v 1.35 2013-06-30 20:06:12 cg Exp $'
 ! !
 
--- a/Tools__TestRunner2.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/Tools__TestRunner2.st	Mon Jul 01 22:15:23 2013 +0100
@@ -603,8 +603,8 @@
         name: windowSpec
         window: 
        (WindowSpec
-          label: 'Test Runner Too'
-          name: 'Test Runner Too'
+          label: 'Test Runner Tool'
+          name: 'Test Runner Tool'
           min: (Point 0 0)
           bounds: (Rectangle 0 0 717 412)
           menu: mainMenu
@@ -691,8 +691,8 @@
         name: windowSpec
         window: 
        (WindowSpec
-          label: 'Test Runner Too'
-          name: 'Test Runner Too'
+          label: 'Test Runner Tool'
+          name: 'Test Runner Tool'
           min: (Point 0 0)
           bounds: (Rectangle 0 0 717 412)
           icon: defaultIcon
@@ -1425,7 +1425,7 @@
 !TestRunner2 methodsFor:'actions - menu'!
 
 classListMenuBrowse
-    UserPreferences current systemBrowserClass 
+    UserPreferences systemBrowserClass 
         browseClasses: (self selectedTestSuite tests collect:[:each | each class] as:Set)
 
     "Created: / 30-06-2011 / 22:02:26 / cg"
@@ -1441,7 +1441,7 @@
         ].
     ].
 
-    UserPreferences current systemBrowserClass browseClasses:setOfCoveredClasses
+    UserPreferences systemBrowserClass browseClasses:setOfCoveredClasses
 
     "Created: / 30-06-2011 / 22:02:26 / cg"
 !
@@ -1503,7 +1503,7 @@
 !
 
 resultListMenuBrowse
-    UserPreferences current systemBrowserClass 
+    UserPreferences systemBrowserClass 
         openInClass: (self selectedResultHolder value test class) selector:(self selectedResultHolder value test selector).
 
     "Created: / 23-09-2011 / 18:55:50 / cg"
@@ -1846,7 +1846,7 @@
 !TestRunner2::ClassList class methodsFor:'documentation'!
 
 version
-    ^'$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.39 2013-04-04 08:15:45 cg Exp $'
+    ^'$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.41 2013-06-28 08:28:59 cg Exp $'
 ! !
 
 !TestRunner2::ClassList methodsFor:'private'!
@@ -2345,11 +2345,11 @@
 !TestRunner2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.39 2013-04-04 08:15:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.41 2013-06-28 08:28:59 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.39 2013-04-04 08:15:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.41 2013-06-28 08:28:59 cg Exp $'
 !
 
 version_HG
@@ -2358,7 +2358,7 @@
 !
 
 version_SVN
-    ^ '§Id: Tools__TestRunner2.st 7486 2009-10-26 22:06:24Z vranyj1 §'
+    ^ '$Id: Tools__TestRunner2.st,v 1.41 2013-06-28 08:28:59 cg Exp $'
 ! !
 
 
--- a/extensions.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/extensions.st	Mon Jul 01 22:15:23 2013 +0100
@@ -9,6 +9,7 @@
     "Created: / 25-07-2010 / 08:57:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (format): / 04-10-2011 / 19:47:20 / cg"
 ! !
+
 !AbstractSyntaxHighlighter class methodsFor:'api highlighting'!
 
 formatMethod:aString in:aClass using:preferencesOrNil elementsInto: elements
@@ -17,6 +18,7 @@
 
     "Created: / 25-07-2010 / 08:58:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !ArrayedCollection methodsFor:'inspecting'!
 
 inspector2TabForHexDump
@@ -30,72 +32,74 @@
     wrapper := Plug new.
     wrapper respondTo:#size with:[ myByteSize ].
     wrapper respondTo:#at: with:[:byteIdx | self byteAt:byteIdx ].
-    wrapper respondTo:#do: with:[:aBlock | 1 to:myByteSize 
-                                            do:[:i |
-                                                aBlock value:(self byteAt:i) 
-                                            ].
-                                ].
+    wrapper respondTo:#do: with:[:aBlock | 1 to:myByteSize
+					    do:[:i |
+						aBlock value:(self byteAt:i)
+					    ].
+				].
 
     baseAddress := 0.
     genDump := [
-                    |dump|
-
-                    v topView withWaitCursorDo:[
-                        dump := AbstractFileBrowser 
-                            contentsOfBytesAsHexDump:wrapper 
-                            numberOfAddressDigits:(myByteSize hexPrintString size) 
-                            addressStart:baseAddress.
-                        v list:dump expandTabs:false scanForNonStrings:false includesNonStrings:false.
-                    ].
-               ].
-
-    v := ScrollableView for:TextView. 
+		    |dump|
+
+		    v topView withWaitCursorDo:[
+			dump := AbstractFileBrowser
+			    contentsOfBytesAsHexDump:wrapper
+			    numberOfAddressDigits:(myByteSize hexPrintString size)
+			    addressStart:baseAddress.
+			v list:dump expandTabs:false scanForNonStrings:false includesNonStrings:false.
+		    ].
+	       ].
+
+    v := ScrollableView for:TextView.
     genDump value.
 
-    v scrolledView 
-        menuHolder:
-            [    
-                |m| 
-
-                m := v scrolledView editMenu.
-                m addLabel:'-' selector:nil.
-                m addLabel:'Change Base Address...' selector:#changeBase.
-                m actionAt:#changeBase 
-                    put:[ 
-                        |s b|
-
-                        s := Dialog request:'Base address (hex):' initialAnswer:(baseAddress printStringRadix:16).
-                        s notEmptyOrNil ifTrue:[
-                            b := Integer readFrom:s radix:16 onError:nil.
-                            b notNil ifTrue:[
-                                baseAddress := b. genDump value
-                            ].
-                        ].
-                    ].
-                m.
-            ];
-        menuMessage: #value.
+    v scrolledView
+	menuHolder:
+	    [
+		|m|
+
+		m := v scrolledView editMenu.
+		m addLabel:'-' selector:nil.
+		m addLabel:'Change Base Address...' selector:#changeBase.
+		m actionAt:#changeBase
+		    put:[
+			|s b|
+
+			s := Dialog request:'Base address (hex):' initialAnswer:(baseAddress printStringRadix:16).
+			s notEmptyOrNil ifTrue:[
+			    b := Integer readFrom:s radix:16 onError:nil.
+			    b notNil ifTrue:[
+				baseAddress := b. genDump value
+			    ].
+			].
+		    ].
+		m.
+	    ];
+	menuMessage: #value.
 
     ^ Tools::Inspector2Tab new
-            priority: 40;
-            label:'Hexdump';
-            view: v;
-            yourself
+	    priority: 40;
+	    label:'Hexdump';
+	    view: v;
+	    yourself
 
     "Created: / 13-02-2012 / 15:08:42 / cg"
 ! !
+
 !Behavior methodsFor:'inspecting'!
 
 inspectorExtraAttributes
     "extra (pseudo instvar) entries to be shown in an inspector."
 
     ^ Dictionary new
-        declareAllNewFrom:(super inspectorExtraAttributes ? #());
-        add:(self isMeta
-                ifFalse:[ '-meta' -> [ self theMetaclass ] ]
-                ifTrue:[ '-nonMeta' -> [ self theNonMetaclass ] ]);
-        yourself
+	declareAllNewFrom:(super inspectorExtraAttributes ? #());
+	add:(self isMeta
+		ifFalse:[ '-meta' -> [ self theMetaclass ] ]
+		ifTrue:[ '-nonMeta' -> [ self theNonMetaclass ] ]);
+	yourself
 ! !
+
 !Behavior methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
@@ -104,31 +108,33 @@
     |nm|
 
     (nm := self name) notEmptyOrNil ifTrue:[
-        ^ nm
+	^ nm
     ].
     ^ super inspectorValueStringInListFor:anInspector
 ! !
+
 !Block methodsFor:'inspecting'!
 
 inspectorExtraAttributes
     "extra (pseudo instvar) entries to be shown in an inspector."
 
     self homeMethod isNil ifTrue:[
-        ^ Dictionary new
-            declareAllNewFrom:(super inspectorExtraAttributes ? #());
-            add:'-code' -> 'no home method';
-            add:'-source' -> 'no home method';
-            yourself
+	^ Dictionary new
+	    declareAllNewFrom:(super inspectorExtraAttributes ? #());
+	    add:'-code' -> 'no home method';
+	    add:'-source' -> 'no home method';
+	    yourself
     ].
 
     ^ Dictionary new
-        declareAllNewFrom:(super inspectorExtraAttributes ? #());
-        add:'-code' -> [ String streamContents:[:s | self homeMethod decompileTo:s]];
-        add:'-source' -> [ self homeMethod source];
-        yourself
+	declareAllNewFrom:(super inspectorExtraAttributes ? #());
+	add:'-code' -> [ String streamContents:[:s | self homeMethod decompileTo:s]];
+	add:'-source' -> [ self homeMethod source];
+	yourself
 
     "Created: / 15-11-2011 / 14:24:10 / cg"
 ! !
+
 !Breakpoint methodsFor:'accessing'!
 
 icon
@@ -137,6 +143,7 @@
 
     "Created: / 11-07-2011 / 18:21:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !BreakpointDescription methodsFor:'accessing'!
 
 icon
@@ -147,12 +154,12 @@
      cryptically."
 
     condition isNil ifTrue:[
-        state == #enabled ifTrue:[^ ToolbarIconLibrary breakpointRedEnabled].
-        state == #disabled ifTrue:[^ ToolbarIconLibrary breakpointRedDisabled].
-        state == #tracing ifTrue:[^ ToolbarIconLibrary tracepointBlue].
+	state == #enabled ifTrue:[^ ToolbarIconLibrary breakpointRedEnabled].
+	state == #disabled ifTrue:[^ ToolbarIconLibrary breakpointRedDisabled].
+	state == #tracing ifTrue:[^ ToolbarIconLibrary tracepointBlue].
     ] ifFalse:[
-        state == #enabled ifTrue:[^ ToolbarIconLibrary breakpointBlueEnabled].
-        state == #disabled ifTrue:[^ ToolbarIconLibrary breakpointBlueDisabled].
+	state == #enabled ifTrue:[^ ToolbarIconLibrary breakpointBlueEnabled].
+	state == #disabled ifTrue:[^ ToolbarIconLibrary breakpointBlueDisabled].
     ].
 
     ^nil
@@ -160,6 +167,7 @@
     "Created: / 28-06-2011 / 08:29:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 27-01-2012 / 13:46:23 / cg"
 ! !
+
 !ByteArray methodsFor:'inspecting'!
 
 inspectorExtraAttributes
@@ -167,34 +175,36 @@
 
     |basePrinter|
 
-    basePrinter := 
-        [:arr :b |
-            String
-                streamContents:[:s |
-                    arr class isWords ifTrue:[
-                        arr asWordArray printOn:s base:b showRadix:true
-                    ] ifFalse:[
-                        arr class isLongs ifTrue:[
-                            arr asLongIntegerArray printOn:s base:b showRadix:true
-                        ] ifFalse:[
-                            arr asByteArray printOn:s base:b showRadix:true
-                        ]
-                    ]
-                ]
-        ].
+    basePrinter :=
+	[:arr :b |
+	    String
+		streamContents:[:s |
+		    arr class isWords ifTrue:[
+			arr asWordArray printOn:s base:b showRadix:true
+		    ] ifFalse:[
+			arr class isLongs ifTrue:[
+			    arr asLongIntegerArray printOn:s base:b showRadix:true
+			] ifFalse:[
+			    arr asByteArray printOn:s base:b showRadix:true
+			]
+		    ]
+		]
+	].
 
     ^ Dictionary new
-        declareAllNewFrom:(super inspectorExtraAttributes ? #());
-        add:'-hexstring' -> [ self hexPrintString "WithSeparator:Character space" ];
-        add:'-hexadecimal' -> [ basePrinter value:self value:16 ];
-        add:'-binary' -> [ basePrinter value:self value:2 ];
-        yourself
+	declareAllNewFrom:(super inspectorExtraAttributes ? #());
+	add:'-hexstring' -> [ self hexPrintString "WithSeparator:Character space" ];
+	add:'-hexadecimal' -> [ basePrinter value:self value:16 ];
+	add:'-binary' -> [ basePrinter value:self value:2 ];
+	yourself
 ! !
+
 !Change methodsFor:'private'!
 
-flattenOnto: aCollection 
+flattenOnto: aCollection
 	aCollection add: self
 ! !
+
 !Change methodsFor:'private'!
 
 flattenedChanges
@@ -203,6 +213,7 @@
 	self flattenOnto: changes.
 	^changes
 ! !
+
 !Change methodsFor:'accessing'!
 
 removed
@@ -211,6 +222,7 @@
 
     "Created: / 24-10-2009 / 21:10:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !Change methodsFor:'accessing'!
 
 removed: aBoolean
@@ -219,33 +231,36 @@
 
     "Created: / 24-10-2009 / 21:11:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !ChangeSet methodsFor:'utilities'!
 
 condenseChangesForRemoved
-    "remove all changes which have been removed 
+    "remove all changes which have been removed
      (marked for removal by aChange removed: true)"
 
     |changesToRemove|
 
-    changesToRemove := 
-        self select:[:aChange | 
-            aChange isCompositeChange ifTrue:[
-                aChange condenseChangesForRemoved
-            ].        
-            aChange removed
-        ].
+    changesToRemove :=
+	self select:[:aChange |
+	    aChange isCompositeChange ifTrue:[
+		aChange condenseChangesForRemoved
+	    ].
+	    aChange removed
+	].
 
     self condenseChanges:changesToRemove
 
     "Created: / 05-11-2001 / 14:21:17 / cg"
     "Modified: / 12-10-2006 / 16:51:27 / cg"
 ! !
+
 !ChangeSet methodsFor:'private'!
 
-flattenOnto: aCollection 
+flattenOnto: aCollection
 
     self do:[:change|change flattenOnto: aCollection]
 ! !
+
 !ChangeSet methodsFor:'private'!
 
 flattenedChanges
@@ -254,22 +269,24 @@
 	self flattenOnto: changes.
 	^changes
 ! !
+
 !ChangeSet methodsFor:'inspecting'!
 
 inspector2TabBrowser
 
     ^self newInspector2Tab
-        label: 'Changes';    
-        priority: 35;
-        "JV@2011-08-06: Cannot do 'UserPreferences current changeSetBrowserClass'
-         here since ChangeSetBrowser has no #on: and it is not an application model.
-         Thus, enforce Tools::ChangeSetBrowser2 here..."
-        application: ((Tools::ChangeSetBrowser2 on: self) beOneColumn; yourself)
+	label: 'Changes';
+	priority: 35;
+	"JV@2011-08-06: Cannot do 'UserPreferences current changeSetBrowserClass'
+	 here since ChangeSetBrowser has no #on: and it is not an application model.
+	 Thus, enforce Tools::ChangeSetBrowser2 here..."
+	application: ((Tools::ChangeSetBrowser2 on: self) beOneColumn; yourself)
 
     "Modified: / 25-07-2011 / 12:22:07 / sr"
     "Modified: / 06-08-2011 / 21:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 13-09-2011 / 11:55:53 / cg"
 ! !
+
 !ChangeSet methodsFor:'inspecting'!
 
 inspector2Tabs
@@ -277,6 +294,7 @@
 
     "Created: / 05-07-2011 / 13:40:19 / cg"
 ! !
+
 !Character methodsFor:'inspecting'!
 
 inspectorExtraAttributes
@@ -296,66 +314,72 @@
 
     "Created: / 22-10-2006 / 03:52:20 / cg"
 ! !
+
 !Character methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
     "returns a string to be shown in the inspector's list"
 
     (asciivalue <= 16r7f) ifTrue:[
-        ^ self storeString,(' "16r%1 %2"' bindWith:(asciivalue hexPrintString) with:asciivalue)
+	^ self storeString,(' "16r%1 %2"' bindWith:(asciivalue hexPrintString) with:asciivalue)
     ].
     ^ self storeString,(' "%1"' bindWith:asciivalue)
 ! !
+
 !CharacterArray methodsFor:'inspecting'!
 
 inspector2TabBytes
 
     ^self newInspector2Tab
-        label: 'Bytes';
-        priority: 25;
-        view: ((ScrollableView for:EditTextView) contents: 
-                (self asByteArray hexPrintStringWithSeparator:Character space); yourself)
+	label: 'Bytes';
+	priority: 25;
+	view: ((ScrollableView for:EditTextView) contents:
+		(self asByteArray hexPrintStringWithSeparator:Character space); yourself)
 
     "Created: / 17-02-2008 / 10:10:50 / janfrog"
     "Created: / 20-07-2011 / 16:36:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 21-08-2011 / 07:32:57 / cg"
 ! !
+
 !CharacterArray methodsFor:'inspecting'!
 
 inspector2TabHTML
 
     ^self newInspector2Tab
-        label: 'HTML';
-        priority: 35;
-        view: ((ScrollableView for:HTMLDocumentView) setText: self; yourself)
+	label: 'HTML';
+	priority: 35;
+	view: ((ScrollableView for:HTMLDocumentView) setText: self; yourself)
 
     "Created: / 17-02-2008 / 10:10:50 / janfrog"
     "Created: / 07-11-2011 / 12:35:15 / cg"
 ! !
+
 !CharacterArray methodsFor:'inspecting'!
 
 inspector2TabText
 
     ^self newInspector2Tab
-        label: 'String';
-        priority: 50;
-        view: ((ScrollableView for:EditTextView) contents: self; yourself)
+	label: 'String';
+	priority: 50;
+	view: ((ScrollableView for:EditTextView) contents: self; yourself)
 
     "Created: / 17-02-2008 / 10:10:50 / janfrog"
     "Modified: / 21-08-2011 / 08:02:57 / cg"
 ! !
+
 !CharacterArray methodsFor:'inspecting'!
 
 inspector2Tabs
     HTMLDocumentView notNil ifTrue:[
-        (self startsWith:'<!!DOCTYPE html') ifTrue:[
-            ^ #( inspector2TabCommon inspector2TabText inspector2TabBytes inspector2TabHTML )
-        ].
+	(self startsWith:'<!!DOCTYPE html') ifTrue:[
+	    ^ #( inspector2TabCommon inspector2TabText inspector2TabBytes inspector2TabHTML )
+	].
     ].
     ^ #( inspector2TabCommon inspector2TabText inspector2TabBytes )
 
     "Created: / 05-07-2011 / 13:40:27 / cg"
 ! !
+
 !CharacterArray methodsFor:'inspecting'!
 
 inspectorExtraAttributes
@@ -380,6 +404,7 @@
 
     "Created: / 22-10-2006 / 03:52:20 / cg"
 ! !
+
 !CharacterArray methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
@@ -387,6 +412,7 @@
 
     ^ self basicStoreString contractTo:30.
 ! !
+
 !Class methodsFor:'misc'!
 
 inspectorClass
@@ -398,6 +424,7 @@
     ].
     ^ super inspectorClass
 ! !
+
 !Collection methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
@@ -406,10 +433,11 @@
     |sz|
 
     (sz := self size) == 0 ifTrue:[
-        ^ 'empty ' , self className
+	^ 'empty ' , self className
     ].
     ^ (super inspectorValueStringInListFor:anInspector),' size=',sz printString
 ! !
+
 !Color methodsFor:'inspecting'!
 
 inspectorClass
@@ -420,6 +448,7 @@
 
     "Modified: 23.4.1996 / 13:39:50 / cg"
 ! !
+
 !Color methodsFor:'inspecting'!
 
 inspectorExtraAttributes
@@ -435,6 +464,7 @@
      Color red inspect
     "
 ! !
+
 !Color methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
@@ -442,43 +472,48 @@
 
     ^ self htmlPrintString
 ! !
+
 !CompositeChange methodsFor:'utilities'!
 
 condenseChangesForRemoved
 
     self changes condenseChangesForRemoved
 ! !
+
 !CompositeChange methodsFor:'private'!
 
 flattenOnto: aCollection
 
     changes do:[:change|change flattenOnto: aCollection]
 ! !
+
 !CompositeChange methodsFor:'accessing'!
 
 removed
 
     ^changes allSatisfy: [:e|e removed]
 ! !
+
 !CompositeChange methodsFor:'accessing'!
 
 removed: aBoolean
 
     changes do:[:e|e removed: aBoolean]
 ! !
+
 !Date methodsFor:'inspecting'!
 
 inspectorExtraAttributes
     "extra (pseudo instvar) entries to be shown in an inspector."
 
     ^ Dictionary new
-        declareAllNewFrom:(super inspectorExtraAttributes ? #());
-        add:'-dayInWeek' -> [ self dayInWeek printString , ' "', self dayOfWeekName , '"' ];
-        add:'-dayInYear' -> [ self dayInYear ];
-        add:'-daysInMonth' -> [ self daysInMonth ];
-        add:'-monthName' -> [ self monthName ];
-        add:'-leapYear' -> [ self isLeapYear ];
-        yourself
+	declareAllNewFrom:(super inspectorExtraAttributes ? #());
+	add:'-dayInWeek' -> [ self dayInWeek printString , ' "', self dayOfWeekName , '"' ];
+	add:'-dayInYear' -> [ self dayInYear ];
+	add:'-daysInMonth' -> [ self daysInMonth ];
+	add:'-monthName' -> [ self monthName ];
+	add:'-leapYear' -> [ self isLeapYear ];
+	yourself
 
     "
      Date today inspect
@@ -486,6 +521,7 @@
 
     "Created: / 20-01-2011 / 12:19:05 / cg"
 ! !
+
 !Dictionary methodsFor:'inspecting'!
 
 inspector2TabLabel
@@ -493,6 +529,7 @@
 
     "Created: / 14-07-2011 / 11:57:18 / cg"
 ! !
+
 !Dictionary methodsFor:'inspecting'!
 
 inspectorClass
@@ -501,23 +538,25 @@
 
     ^ DictionaryInspectorView
 ! !
+
 !EditTextView methodsFor:'accessing-dimensions'!
 
-absoluteXOfPosition:positionInText 
+absoluteXOfPosition:positionInText
     |accumulatedX container|
 
     accumulatedX := 0.
     container := self.
     [ container notNil ] whileTrue:[
-        accumulatedX := accumulatedX + container origin x.
-        container := container isTopView ifFalse:[
-                    container container
-                ] ifTrue:[ nil ].
+	accumulatedX := accumulatedX + container origin x.
+	container := container isTopView ifFalse:[
+		    container container
+		] ifTrue:[ nil ].
     ].
     ^ (self xOfPosition:positionInText) + accumulatedX
 
     "Created: / 16-02-2010 / 10:05:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !EditTextView methodsFor:'accessing-dimensions'!
 
 absoluteYOfCursor
@@ -526,16 +565,17 @@
     accumulatedY := 0.
     container := self.
     [ container notNil ] whileTrue:[
-        accumulatedY := accumulatedY + container origin y.
-        container := container isTopView 
-            ifFalse:[container container]
-            ifTrue:[nil].
+	accumulatedY := accumulatedY + container origin y.
+	container := container isTopView
+	    ifFalse:[container container]
+	    ifTrue:[nil].
     ].
     ^(self yOfCursor) + accumulatedY
 
     "Created: / 27-05-2005 / 07:45:53 / janfrog"
     "Modified: / 27-05-2005 / 23:03:40 / janfrog"
 ! !
+
 !EditTextView methodsFor:'accessing-dimensions'!
 
 xOfPosition: positionInText
@@ -544,11 +584,12 @@
     line := self lineOfCharacterPosition: positionInText.
     col  := positionInText - (self characterPositionOfLine:line col:1) + 1.
     ^
-        (self xOfCol:col inVisibleLine:(self listLineToVisibleLine: line))
-            - viewOrigin x.
+	(self xOfCol:col inVisibleLine:(self listLineToVisibleLine: line))
+	    - viewOrigin x.
 
     "Created: / 16-02-2010 / 10:04:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !EditTextView methodsFor:'accessing-dimensions'!
 
 yOfCursor
@@ -557,6 +598,7 @@
 
     "Created: / 27-05-2005 / 07:43:41 / janfrog"
 ! !
+
 !EditTextView methodsFor:'accessing-dimensions'!
 
 yOfPosition: positionInText
@@ -567,6 +609,7 @@
 
     "Created: / 16-02-2010 / 10:08:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !ExecutableFunction methodsFor:'printing & storing'!
 
 printStringForBrowserWithSelector:selector
@@ -574,6 +617,7 @@
 
     ^ self printStringForBrowserWithSelector:selector inClass:nil
 ! !
+
 !Form methodsFor:'inspecting'!
 
 inspectorClass
@@ -582,6 +626,7 @@
 
     ^ ImageInspectorView
 ! !
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-22x22'!
 
 bookmarks22x22
@@ -600,8 +645,8 @@
     <resource: #image>
 
     ^Icon
-        constantNamed:'GenericToolbarIconLibrary class bookmarks22x22'
-        ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+	constantNamed:'GenericToolbarIconLibrary class bookmarks22x22'
+	ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 ????????????????????????????????????????????????????????????????????????LT;??????????????????????????6BAD/??????????????
 ?????????16L''"+???????????????????????<7''95Y????????????????????????YI2[_!!C?????????????????????GXZZ&Y\0????????????I$YF
 Q$YFQUBX%)VRZ%YAO34=OR????=T#9RT$9FP#(6K"(VB_718]U0%????FC)9"X"G!!HN@_W]4\V=)YT@E????????J&Y;^''Y3\''A-ZFI_UR8A??????????<Q
@@ -611,6 +656,7 @@
 
     "Modified: / 05-05-2011 / 12:45:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-16x16'!
 
 bug16x16Icon
@@ -629,12 +675,13 @@
     <resource: #image>
 
     ^Icon
-        constantNamed:'GenericToolbarIconLibrary class bug16x16Icon'
-        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+	constantNamed:'GenericToolbarIconLibrary class bug16x16Icon'
+	ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 ???????????????????????????????????????????????????3R/??????????????????O"_???????????????????7=?#J1???????????=???=IBP$
 ?_????????????7=W5=_W5?=O/7???????>L?PLC@0LC?_????????7=/4S[7S 8TY/=?VC?????L#L.>JI3I+A%H#[?????GA3_]U*/M3_;BPRLD_????7=
 ?_B@M>DE-04>?U/??????2_=HEXYQ7:R<Q_???????4>G2$%Q9QEL?5_??????????<=?\;M??????????????????=-H????????0@a') ; colorMapFromArray:#[205 205 205 227 35 35 106 106 106 98 98 98 135 135 135 163 34 34 101 5 5 124 124 124 48 2 2 227 11 11 173 173 173 218 54 54 241 241 241 235 19 19 225 225 225 219 18 18 245 58 58 214 214 214 249 46 46 90 90 90 254 61 61 36 36 36 176 176 176 233 233 233 114 114 114 255 78 78 212 33 33 230 57 57 61 61 61 94 94 94 76 76 76 19 19 19 255 57 57 161 161 161 83 83 83 217 217 217 249 249 249 255 65 65 139 2 2 27 27 27 169 169 169 253 53 53 210 28 28 251 251 251 154 154 154 117 117 117 195 1 1 245 245 245 145 145 145 218 5 5 230 230 230 69 2 2 181 181 181 11 11 11 141 141 141 249 61 61 205 21 21 165 165 165 157 157 157 241 28 28 223 223 223 109 109 109 2 2 2 245 45 45 146 0 0 69 69 69 137 137 137 140 40 40 188 1 1 206 24 24 219 33 33 255 76 76 249 49 49 249 56 56 236 236 236 121 121 121 248 53 53 171 1 1 111 40 40 237 41 41 178 21 21 205 16 16 129 129 129 163 1 1 155 18 18 85 4 4 243 68 68 73 73 73 45 45 45 202 51 51 241 40 40 86 86 86 114 1 1 210 4 4 246 41 41 148 148 148 189 189 189 209 209 209 210 17 17 158 28 28 213 5 5 205 1 1 53 53 53 217 9 9 69 40 40 187 10 10 255 74 74 218 28 28 146 11 11 65 65 65 232 37 37 101 101 101 196 26 26 245 53 53 188 26 26 213 10 10 184 184 184 206 5 5 249 65 65 172 21 21 206 34 34 195 195 195 237 32 32 131 12 12 233 29 29 179 36 36 241 37 37 139 13 13 245 49 49 180 1 1 168 37 37 198 198 198 202 202 202 228 21 21 206 10 10 206 29 29 229 30 30 255 80 80 188 20 20 245 37 37 57 57 57 252 50 50 87 42 42 172 10 10 209 13 13 155 4 4 164 11 11 242 44 44 255 70 70 225 25 25 222 14 14 237 24 24 240 49 49 205 13 13 202 44 44 201 0 0 225 17 17 186 42 42 255 72 72 122 1 1 40 40 40 157 10 10 209 8 8 222 8 8 195 41 41 223 21 21 180 11 11 255 68 68 162 28 28 194 11 11 232 25 25 131 1 1 241 32 32 246 246 246 49 49 49 224 44 44 208 2 2 227 227 227 239 239 239 239 46 46 162 20 20 245 33 33 219 219 219 238 29 29 237 37 37 171 29 29 36 46 46 250 68 68 147 16 16 182 26 26 187 187 187 24 1 1 185 32 32 229 24 24 232 33 33 150 150 150 122 12 12 229 17 17 204 27 27 242 52 52 213 2 2 200 15 15 191 191 191 217 43 43 217 12 12 115 10 10 140 16 16 200 28 28 202 6 6 215 13 13 182 41 41 57 46 46 40 46 46 233 40 40 252 70 70 173 40 40 226 28 28 46 54 54 202 22 22 203 18 18 245 72 72 191 17 17 200 37 37 10 0 0 50 52 52 252 74 74 252 72 72 247 38 38 160 40 40 231 14 14 252 68 68 200 10 10 15 15 15 211 47 47 254 254 254 253 76 76 23 23 23 237 69 69 7 7 7 144 7 7 196 8 7 32 32 32 59 59 59 90 93 93 67 67 67 70 28 28 50 56 56 232 15 16 208 4 4 237 35 35 220 12 11 232 20 20 223 62 62 0 0 0 255 255 255 255 255 255]; mask:((ImageMask new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@L@@0@C8AO C?0O<C?>G?0??#?>C?0_?@O@@L@b') ; yourself); yourself]
 ! !
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-24x24'!
 
 bug24x24Icon
@@ -653,8 +700,8 @@
     <resource: #image>
 
     ^Icon
-        constantNamed:'GenericToolbarIconLibrary class bug24x24Icon'
-        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+	constantNamed:'GenericToolbarIconLibrary class bug24x24Icon'
+	ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 ??????????????????????????????????????????????????>6???????????????????????1???????=????????????????????????<4+????=????
 ????????????????????O"_???> ??????????????????????????7.?3;.?????????????????????????_4$?#K=,_????????????????7???=/?RP$
 IBP$?_?????=????????MX3=???=L#H2L#H2?_7?XQW.???????????=?_7=W5=_W5=_W?7=O/7?????????????#O4''@0LC@0LC@?7=????????????????
@@ -663,6 +710,7 @@
 <Q_???????????4XO!!?DJRU*Q9P%QSL5?U<-?????????3T5???=F$  EB@?L37?G3;=????????????????O_7D3,7=??????????????????????????<(
 [RO?????????????????????????????????????????????') ; colorMapFromArray:#[205 205 205 227 35 35 106 106 106 98 98 98 135 135 135 163 34 34 101 5 5 124 124 124 48 2 2 227 11 11 173 173 173 218 54 54 241 241 241 235 19 19 225 225 225 219 18 18 245 58 58 214 214 214 249 46 46 90 90 90 254 61 61 36 36 36 176 176 176 233 233 233 114 114 114 255 78 78 212 33 33 230 57 57 61 61 61 94 94 94 76 76 76 19 19 19 255 57 57 161 161 161 83 83 83 217 217 217 249 249 249 255 65 65 139 2 2 27 27 27 169 169 169 253 53 53 210 28 28 251 251 251 154 154 154 117 117 117 195 1 1 245 245 245 145 145 145 218 5 5 230 230 230 69 2 2 181 181 181 11 11 11 141 141 141 249 61 61 205 21 21 165 165 165 157 157 157 241 28 28 223 223 223 109 109 109 2 2 2 245 45 45 146 0 0 69 69 69 137 137 137 140 40 40 188 1 1 206 24 24 219 33 33 255 76 76 249 49 49 249 56 56 236 236 236 121 121 121 248 53 53 171 1 1 111 40 40 237 41 41 178 21 21 205 16 16 129 129 129 163 1 1 155 18 18 85 4 4 243 68 68 73 73 73 45 45 45 202 51 51 241 40 40 86 86 86 114 1 1 210 4 4 246 41 41 148 148 148 189 189 189 209 209 209 210 17 17 158 28 28 213 5 5 205 1 1 53 53 53 217 9 9 69 40 40 187 10 10 255 74 74 218 28 28 146 11 11 65 65 65 232 37 37 101 101 101 196 26 26 245 53 53 188 26 26 213 10 10 184 184 184 206 5 5 249 65 65 172 21 21 206 34 34 195 195 195 237 32 32 131 12 12 233 29 29 179 36 36 241 37 37 139 13 13 245 49 49 180 1 1 168 37 37 198 198 198 202 202 202 228 21 21 206 10 10 206 29 29 229 30 30 255 80 80 188 20 20 245 37 37 57 57 57 252 50 50 87 42 42 172 10 10 209 13 13 155 4 4 164 11 11 242 44 44 255 70 70 225 25 25 222 14 14 237 24 24 240 49 49 205 13 13 202 44 44 201 0 0 225 17 17 186 42 42 255 72 72 122 1 1 40 40 40 157 10 10 209 8 8 222 8 8 195 41 41 223 21 21 180 11 11 255 68 68 162 28 28 194 11 11 232 25 25 131 1 1 241 32 32 246 246 246 49 49 49 224 44 44 208 2 2 227 227 227 239 239 239 239 46 46 162 20 20 245 33 33 219 219 219 238 29 29 237 37 37 171 29 29 36 46 46 250 68 68 147 16 16 182 26 26 187 187 187 24 1 1 185 32 32 229 24 24 232 33 33 150 150 150 122 12 12 229 17 17 204 27 27 242 52 52 213 2 2 200 15 15 191 191 191 217 43 43 217 12 12 115 10 10 140 16 16 200 28 28 202 6 6 215 13 13 182 41 41 57 46 46 40 46 46 233 40 40 252 70 70 173 40 40 226 28 28 46 54 54 202 22 22 203 18 18 245 72 72 191 17 17 200 37 37 10 0 0 50 52 52 252 74 74 252 72 72 247 38 38 160 40 40 231 14 14 252 68 68 200 10 10 15 15 15 211 47 47 254 254 254 253 76 76 23 23 23 237 69 69 7 7 7 144 7 7 196 8 7 32 32 32 59 59 59 90 93 93 67 67 67 70 28 28 50 56 56 232 15 16 208 4 4 237 35 35 220 12 11 232 20 20 223 62 62 0 0 0 255 255 255 255 255 255]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@H@@HH@@FH@@FH@@CX@@G<@BO<HGO>8A??0@??@@??@G??<C??8@??@G??<G??<G??XA??0C??8CO>8@G8@@A0@@@@@') ; yourself); yourself]
 ! !
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-32x32'!
 
 bug32x32Icon
@@ -675,17 +723,17 @@
      self bug3232Icon inspect
      ImageEditor openOnClass:self andSelector:#bug3232Icon
      Icon flushCachedIcons"
-    
+
     ^ Icon constantNamed:'GenericToolbarIconLibrary class bug3232Icon'
-        ifAbsentPut:[
-            (Depth8Image new)
-                width:32;
-                height:32;
-                photometric:(#palette);
-                bitsPerSample:(#( 8 ));
-                samplesPerPixel:((1));
-                bits:(ByteArray 
-                            fromPackedString:'
+	ifAbsentPut:[
+	    (Depth8Image new)
+		width:32;
+		height:32;
+		photometric:(#palette);
+		bitsPerSample:(#( 8 ));
+		samplesPerPixel:((1));
+		bits:(ByteArray
+			    fromPackedString:'
 ??????????????????????????????????????????????????????????????????>6@/?????????????????????????????1H_????????4-????????
 ???????????????????????=?_??????O!!???????????????????????????????3W3R/?????=I????????????????????????????????38''?????:C?
 ??????????????????????????????????7.??<>;/???????????????????????????????????_7=?_7=????????????????????????????????[?7=
@@ -699,21 +747,22 @@
 ??????????<=?\SN3,7=H???????????????????????????????????JFY-H???????????????????????????????????????????????????????????
 ?????????????????????????????????????????????0@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 @@@@@@@@@@@@');
-                colorMapFromArray:#[ 205 205 205 227 35 35 106 106 106 98 98 98 135 135 135 163 34 34 101 5 5 124 124 124 48 2 2 227 11 11 173 173 173 218 54 54 241 241 241 235 19 19 225 225 225 219 18 18 245 58 58 214 214 214 249 46 46 90 90 90 254 61 61 36 36 36 176 176 176 233 233 233 114 114 114 255 78 78 212 33 33 230 57 57 61 61 61 94 94 94 76 76 76 19 19 19 255 57 57 161 161 161 83 83 83 217 217 217 249 249 249 255 65 65 139 2 2 27 27 27 169 169 169 253 53 53 210 28 28 251 251 251 154 154 154 117 117 117 195 1 1 245 245 245 145 145 145 218 5 5 230 230 230 69 2 2 181 181 181 11 11 11 141 141 141 249 61 61 205 21 21 165 165 165 157 157 157 241 28 28 223 223 223 109 109 109 2 2 2 245 45 45 146 0 0 69 69 69 137 137 137 140 40 40 188 1 1 206 24 24 219 33 33 255 76 76 249 49 49 249 56 56 236 236 236 121 121 121 248 53 53 171 1 1 111 40 40 237 41 41 178 21 21 205 16 16 129 129 129 163 1 1 155 18 18 85 4 4 243 68 68 73 73 73 45 45 45 202 51 51 241 40 40 86 86 86 114 1 1 210 4 4 246 41 41 148 148 148 189 189 189 209 209 209 210 17 17 158 28 28 213 5 5 205 1 1 53 53 53 217 9 9 69 40 40 187 10 10 255 74 74 218 28 28 146 11 11 65 65 65 232 37 37 101 101 101 196 26 26 245 53 53 188 26 26 213 10 10 184 184 184 206 5 5 249 65 65 172 21 21 206 34 34 195 195 195 237 32 32 131 12 12 233 29 29 179 36 36 241 37 37 139 13 13 245 49 49 180 1 1 168 37 37 198 198 198 202 202 202 228 21 21 206 10 10 206 29 29 229 30 30 255 80 80 188 20 20 245 37 37 57 57 57 252 50 50 87 42 42 172 10 10 209 13 13 155 4 4 164 11 11 242 44 44 255 70 70 225 25 25 222 14 14 237 24 24 240 49 49 205 13 13 202 44 44 201 0 0 225 17 17 186 42 42 255 72 72 122 1 1 40 40 40 157 10 10 209 8 8 222 8 8 195 41 41 223 21 21 180 11 11 255 68 68 162 28 28 194 11 11 232 25 25 131 1 1 241 32 32 246 246 246 49 49 49 224 44 44 208 2 2 227 227 227 239 239 239 239 46 46 162 20 20 245 33 33 219 219 219 238 29 29 237 37 37 171 29 29 36 46 46 250 68 68 147 16 16 182 26 26 187 187 187 24 1 1 185 32 32 229 24 24 232 33 33 150 150 150 122 12 12 229 17 17 204 27 27 242 52 52 213 2 2 200 15 15 191 191 191 217 43 43 217 12 12 115 10 10 140 16 16 200 28 28 202 6 6 215 13 13 182 41 41 57 46 46 40 46 46 233 40 40 252 70 70 173 40 40 226 28 28 46 54 54 202 22 22 203 18 18 245 72 72 191 17 17 200 37 37 10 0 0 50 52 52 252 74 74 252 72 72 247 38 38 160 40 40 231 14 14 252 68 68 200 10 10 15 15 15 211 47 47 254 254 254 253 76 76 23 23 23 237 69 69 7 7 7 144 7 7 196 8 7 32 32 32 59 59 59 90 93 93 67 67 67 70 28 28 50 56 56 232 15 16 208 4 4 237 35 35 220 12 11 232 20 20 223 62 62 0 0 0 255 255 255 255 255 255 ];
-                mask:((ImageMask new)
-                            width:32;
-                            height:32;
-                            photometric:(#blackIs0);
-                            bitsPerSample:(#[ 1 ]);
-                            samplesPerPixel:((1));
-                            bits:(ByteArray 
-                                        fromPackedString:'
+		colorMapFromArray:#[ 205 205 205 227 35 35 106 106 106 98 98 98 135 135 135 163 34 34 101 5 5 124 124 124 48 2 2 227 11 11 173 173 173 218 54 54 241 241 241 235 19 19 225 225 225 219 18 18 245 58 58 214 214 214 249 46 46 90 90 90 254 61 61 36 36 36 176 176 176 233 233 233 114 114 114 255 78 78 212 33 33 230 57 57 61 61 61 94 94 94 76 76 76 19 19 19 255 57 57 161 161 161 83 83 83 217 217 217 249 249 249 255 65 65 139 2 2 27 27 27 169 169 169 253 53 53 210 28 28 251 251 251 154 154 154 117 117 117 195 1 1 245 245 245 145 145 145 218 5 5 230 230 230 69 2 2 181 181 181 11 11 11 141 141 141 249 61 61 205 21 21 165 165 165 157 157 157 241 28 28 223 223 223 109 109 109 2 2 2 245 45 45 146 0 0 69 69 69 137 137 137 140 40 40 188 1 1 206 24 24 219 33 33 255 76 76 249 49 49 249 56 56 236 236 236 121 121 121 248 53 53 171 1 1 111 40 40 237 41 41 178 21 21 205 16 16 129 129 129 163 1 1 155 18 18 85 4 4 243 68 68 73 73 73 45 45 45 202 51 51 241 40 40 86 86 86 114 1 1 210 4 4 246 41 41 148 148 148 189 189 189 209 209 209 210 17 17 158 28 28 213 5 5 205 1 1 53 53 53 217 9 9 69 40 40 187 10 10 255 74 74 218 28 28 146 11 11 65 65 65 232 37 37 101 101 101 196 26 26 245 53 53 188 26 26 213 10 10 184 184 184 206 5 5 249 65 65 172 21 21 206 34 34 195 195 195 237 32 32 131 12 12 233 29 29 179 36 36 241 37 37 139 13 13 245 49 49 180 1 1 168 37 37 198 198 198 202 202 202 228 21 21 206 10 10 206 29 29 229 30 30 255 80 80 188 20 20 245 37 37 57 57 57 252 50 50 87 42 42 172 10 10 209 13 13 155 4 4 164 11 11 242 44 44 255 70 70 225 25 25 222 14 14 237 24 24 240 49 49 205 13 13 202 44 44 201 0 0 225 17 17 186 42 42 255 72 72 122 1 1 40 40 40 157 10 10 209 8 8 222 8 8 195 41 41 223 21 21 180 11 11 255 68 68 162 28 28 194 11 11 232 25 25 131 1 1 241 32 32 246 246 246 49 49 49 224 44 44 208 2 2 227 227 227 239 239 239 239 46 46 162 20 20 245 33 33 219 219 219 238 29 29 237 37 37 171 29 29 36 46 46 250 68 68 147 16 16 182 26 26 187 187 187 24 1 1 185 32 32 229 24 24 232 33 33 150 150 150 122 12 12 229 17 17 204 27 27 242 52 52 213 2 2 200 15 15 191 191 191 217 43 43 217 12 12 115 10 10 140 16 16 200 28 28 202 6 6 215 13 13 182 41 41 57 46 46 40 46 46 233 40 40 252 70 70 173 40 40 226 28 28 46 54 54 202 22 22 203 18 18 245 72 72 191 17 17 200 37 37 10 0 0 50 52 52 252 74 74 252 72 72 247 38 38 160 40 40 231 14 14 252 68 68 200 10 10 15 15 15 211 47 47 254 254 254 253 76 76 23 23 23 237 69 69 7 7 7 144 7 7 196 8 7 32 32 32 59 59 59 90 93 93 67 67 67 70 28 28 50 56 56 232 15 16 208 4 4 237 35 35 220 12 11 232 20 20 223 62 62 0 0 0 255 255 255 255 255 255 ];
+		mask:((ImageMask new)
+			    width:32;
+			    height:32;
+			    photometric:(#blackIs0);
+			    bitsPerSample:(#[ 1 ]);
+			    samplesPerPixel:((1));
+			    bits:(ByteArray
+					fromPackedString:'
 @@@@@@@@L@@@LC@@@A 0@@@\L@@@CB@@@@Y @@@G8@@@G? @AC?8H@8??O@G??? @???0@C??0@@??<@G???>A???? G??? @O??@@G??8@_???8G???>@;?
 ?7@@??<@@???0@_??>@GO?3 @A?8P@@O<@@@@<@@@@@@@@@@@@@b');
-                            yourself);
-                yourself
-        ]
+			    yourself);
+		yourself
+	]
 ! !
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-16x16'!
 
 lint16x16Icon
@@ -732,12 +781,13 @@
     <resource: #image>
 
     ^Icon
-        constantNamed:'GenericToolbarIconLibrary class lint16x16Icon'
-        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+	constantNamed:'GenericToolbarIconLibrary class lint16x16Icon'
+	ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 ??????????????????????????????????????????????????<4[_??????????????????A4W??????????????????2<A()BG??????????<A??<A1_;>
 @XS??????????3<)-;^76.Z5A0O???????<P@W!!8>-3J<0+??????0\JI1,;7^?57-[;''T????<JS0P"PN3'':-V>8L??????V5@''G57.1,!!#X-''R_O???1(R
 @RMW:Y*KY6+7*RW??????3P*ZU[;.:#!!/:7???????<A@6AV2?S:9+>5??????????< BC &?????;?Z??????????<XU_?????X<P@a') ; colorMapFromArray:#[0 1 0 0 2 0 1 4 0 3 6 2 30 1 0 6 9 5 34 2 2 10 12 8 43 4 2 13 15 12 15 17 13 77 0 0 16 18 15 35 14 12 17 19 16 67 6 1 19 20 18 75 7 10 21 23 20 86 9 4 25 27 24 111 4 7 103 7 10 96 10 12 32 29 28 29 30 28 31 33 30 153 2 0 33 35 33 35 36 34 110 16 16 173 0 1 36 38 35 41 37 36 165 4 0 155 7 7 128 15 14 39 41 39 157 12 16 51 42 42 207 0 4 43 45 42 58 41 39 141 19 15 199 4 0 210 3 0 221 1 4 48 49 47 231 0 12 211 7 8 172 19 10 172 19 18 52 54 51 53 55 53 234 5 23 59 54 53 176 24 21 56 57 55 57 59 56 204 19 22 195 22 24 103 47 48 227 16 9 60 61 59 198 25 19 216 20 21 61 63 60 119 48 45 228 20 20 63 65 62 211 30 27 68 69 67 69 71 68 212 32 34 242 25 29 72 74 71 74 76 74 191 45 50 245 31 38 76 78 75 77 79 76 79 80 78 138 66 66 248 36 40 240 41 43 83 85 82 216 50 52 241 43 50 195 58 61 86 88 85 244 46 46 87 89 86 89 91 88 214 58 58 193 65 67 92 93 91 248 51 49 109 90 87 185 68 87 194 67 80 87 95 125 250 54 57 173 74 96 202 67 84 159 78 103 253 56 52 188 72 90 87 99 135 129 89 121 99 101 98 73 104 148 255 59 60 159 83 106 175 81 94 94 102 132 187 78 98 215 71 85 255 61 67 169 84 104 251 66 66 104 106 103 90 106 147 151 92 119 200 81 93 107 108 106 140 99 131 162 94 119 255 72 76 144 100 128 96 112 153 228 80 83 159 97 120 111 113 110 191 90 111 206 87 104 113 115 112 87 118 163 115 117 114 83 122 166 179 100 117 118 120 117 199 99 101 231 91 88 138 113 147 120 122 119 196 101 119 123 125 122 115 123 167 213 100 113 119 123 162 180 109 128 127 129 126 208 108 109 115 131 173 185 115 140 158 122 154 173 119 144 131 133 130 130 130 163 178 122 124 181 119 147 106 139 178 136 138 135 120 139 175 126 138 175 204 121 132 132 139 172 113 146 186 136 143 176 144 146 143 121 149 184 153 142 173 135 150 181 148 150 147 125 153 188 130 153 182 179 140 167 150 152 149 205 136 148 181 145 146 136 159 189 155 157 154 140 163 193 159 161 158 161 163 160 143 166 196 162 164 161 148 167 192 164 166 163 165 165 187 197 159 173 167 169 166 152 171 196 191 163 180 157 172 191 169 171 168 216 159 166 171 173 170 208 163 179 187 169 190 217 162 175 174 176 173 159 178 203 186 173 174 207 167 175 163 178 198 213 166 176 179 181 178 198 176 192 169 185 204 183 185 182 216 175 184 209 177 189 212 180 192 204 183 198 208 183 193 188 190 187 180 192 206 194 196 193 215 191 201 187 199 213 204 198 197 211 196 210 199 201 198 190 202 216 191 203 217 201 202 212 202 204 201 208 203 201 219 201 210 205 207 203 217 203 217 206 208 205 213 207 206 223 205 214 203 211 220 211 213 210 211 212 222 214 216 213 221 215 227 217 219 216 219 221 218 228 218 224 217 222 225 221 223 220 231 221 227 216 225 233 220 226 228 224 226 223 221 229 238 231 233 230 228 234 236 233 235 232 235 238 234 249 251 248 255 255 255]; mask:((ImageMask new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@L@@0@C8AO0C?0O>C?>O?0??#?>C?0O?@OC@LLb') ; yourself); yourself]
 ! !
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-24x24'!
 
 lint24x24Icon
@@ -756,8 +806,8 @@
     <resource: #image>
 
     ^Icon
-        constantNamed:'GenericToolbarIconLibrary class lint24x24Icon'
-        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+	constantNamed:'GenericToolbarIconLibrary class lint24x24Icon'
+	ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 ??????????????????????????????????????????????????????????????????????????=_W?????< @???????????????????????MF7???<4????
 ????????????????????A4W???<L?????????????????????????2AG?4HY????????????????????????K0E[()@J!!????????????????0G?????@\W>
 ?/;0@XS???<Z????????JUEK??</0?3<?O3<F G??0)H??????????<GO2$A-;^7-=+,9+T]A0MU????????????D@DG^G!!<>-262/O1B/??????????????
@@ -766,6 +816,7 @@
 /:6D??????????<)@PLSXEY?2?S<>.Y-/;V-?????????1$A??<GRU)/]8JMT"_?/;>5#O??????????????H@ +NBXQ??????>:/=*L??????????????<9
 FEU_????????6OF5????????????????????????????-]K?') ; colorMapFromArray:#[0 1 0 0 2 0 1 4 0 3 6 2 30 1 0 6 9 5 34 2 2 10 12 8 43 4 2 13 15 12 15 17 13 77 0 0 16 18 15 35 14 12 17 19 16 67 6 1 19 20 18 75 7 10 21 23 20 86 9 4 25 27 24 111 4 7 103 7 10 96 10 12 32 29 28 29 30 28 31 33 30 153 2 0 33 35 33 35 36 34 110 16 16 173 0 1 36 38 35 41 37 36 165 4 0 155 7 7 128 15 14 39 41 39 157 12 16 51 42 42 207 0 4 43 45 42 58 41 39 141 19 15 199 4 0 210 3 0 221 1 4 48 49 47 231 0 12 211 7 8 172 19 10 172 19 18 52 54 51 53 55 53 234 5 23 59 54 53 176 24 21 56 57 55 57 59 56 204 19 22 195 22 24 103 47 48 227 16 9 60 61 59 198 25 19 216 20 21 61 63 60 119 48 45 228 20 20 63 65 62 211 30 27 68 69 67 69 71 68 212 32 34 242 25 29 72 74 71 74 76 74 191 45 50 245 31 38 76 78 75 77 79 76 79 80 78 138 66 66 248 36 40 240 41 43 83 85 82 216 50 52 241 43 50 195 58 61 86 88 85 244 46 46 87 89 86 89 91 88 214 58 58 193 65 67 92 93 91 248 51 49 109 90 87 185 68 87 194 67 80 87 95 125 250 54 57 173 74 96 202 67 84 159 78 103 253 56 52 188 72 90 87 99 135 129 89 121 99 101 98 73 104 148 255 59 60 159 83 106 175 81 94 94 102 132 187 78 98 215 71 85 255 61 67 169 84 104 251 66 66 104 106 103 90 106 147 151 92 119 200 81 93 107 108 106 140 99 131 162 94 119 255 72 76 144 100 128 96 112 153 228 80 83 159 97 120 111 113 110 191 90 111 206 87 104 113 115 112 87 118 163 115 117 114 83 122 166 179 100 117 118 120 117 199 99 101 231 91 88 138 113 147 120 122 119 196 101 119 123 125 122 115 123 167 213 100 113 119 123 162 180 109 128 127 129 126 208 108 109 115 131 173 185 115 140 158 122 154 173 119 144 131 133 130 130 130 163 178 122 124 181 119 147 106 139 178 136 138 135 120 139 175 126 138 175 204 121 132 132 139 172 113 146 186 136 143 176 144 146 143 121 149 184 153 142 173 135 150 181 148 150 147 125 153 188 130 153 182 179 140 167 150 152 149 205 136 148 181 145 146 136 159 189 155 157 154 140 163 193 159 161 158 161 163 160 143 166 196 162 164 161 148 167 192 164 166 163 165 165 187 197 159 173 167 169 166 152 171 196 191 163 180 157 172 191 169 171 168 216 159 166 171 173 170 208 163 179 187 169 190 217 162 175 174 176 173 159 178 203 186 173 174 207 167 175 163 178 198 213 166 176 179 181 178 198 176 192 169 185 204 183 185 182 216 175 184 209 177 189 212 180 192 204 183 198 208 183 193 188 190 187 180 192 206 194 196 193 215 191 201 187 199 213 204 198 197 211 196 210 199 201 198 190 202 216 191 203 217 201 202 212 202 204 201 208 203 201 219 201 210 205 207 203 217 203 217 206 208 205 213 207 206 223 205 214 203 211 220 211 213 210 211 212 222 214 216 213 221 215 227 217 219 216 219 221 218 228 218 224 217 222 225 221 223 220 231 221 227 216 225 233 220 226 228 224 226 223 221 229 238 231 233 230 228 234 236 233 235 232 235 238 234 249 251 248 255 255 255]; mask:((ImageMask new) width: 24; height: 24; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@LL@@FH@@FH@@CX@@G<@BG>HGO>XA??8@?? @?? G??<G??8@??0G??<G??<G??<@??8A??8CO><@G8O@A8G@@@F') ; yourself); yourself]
 ! !
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-32x32'!
 
 lint32x32Icon
@@ -784,8 +835,8 @@
     <resource: #image>
 
     ^Icon
-        constantNamed:'GenericToolbarIconLibrary class lint32x32Icon'
-        ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+	constantNamed:'GenericToolbarIconLibrary class lint32x32Icon'
+	ifAbsentPut:[(Depth8Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 ????????????????????????????????????????????????????????????????????!!O????????????????????????????=_JU???????2@4@???????
 ??????????????????????<AT_??????@Q*??????????????????????????????4H4[_????<4O????????????????????????????????0]E?????01K
 ?????????????????????????????????2AG??=BFX_?????????????????????????????????QQ$A@PDR?????????????????????????????????2<A
@@ -802,6 +853,7 @@
 @@@@@@@@D@@@NC @@A 8@@@\L@@@CC@@@@Y0@@@G8@@@C? @AA?<H@8??G@G???0@???8@G??8@@??>@C???>A???? O???0@O??0@C??<@O???8G???>@??
 ?? @???@@_??8@O???@GO?38@!!?8_@@O<C8@@>@^@@@@C@@@@@@b') ; yourself); yourself]
 ! !
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-16x16'!
 
 smalllintWarning16x16
@@ -820,8 +872,8 @@
     <resource: #image>
 
     ^Icon
-        constantNamed:'GenericToolbarIconLibrary class smalllintWarning16x16'
-        ifAbsentPut:[(Depth24Image new) width: 16; height: 16; photometric:(#rgb); bitsPerSample:(#[8 8 8]); samplesPerPixel:(3); bits:(ByteArray fromPackedString:'
+	constantNamed:'GenericToolbarIconLibrary class smalllintWarning16x16'
+	ifAbsentPut:[(Depth24Image new) width: 16; height: 16; photometric:(#rgb); bitsPerSample:(#[8 8 8]); samplesPerPixel:(3); bits:(ByteArray fromPackedString:'
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@????????????????????@@@@@@@@@@@@@@@@@@@@@@@@
 @@@@@@@@@@@@@@@@????;;5!!;J)@;J1C;J)@;;5!!????@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@????<[9&<+=#?>^5?>^5?>^5<;=#<[=&????@@@@@@@@
 @@@@@@@@@@@@@@@@@@@@????;[@??N&/?^".?N&/?^".?N&/;J<?????@@@@@@@@@@@@@@@@@@@@@@@@@@@@????;; ?>>>2?OKF?OKD?OKF>>:2;[\?????
@@ -832,6 +884,7 @@
 @@@@@@@@????????????9\^ 1(T.1(T.1(T.1(T.1(T.9\^ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@????????????????????????????@@@@@@@@
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@_@C>@_<A?0G?0_? ?>C?<G?0_?!!?>G?8O?@G<@@@b') ; yourself); yourself]
 ! !
+
 !GenericToolbarIconLibrary class methodsFor:'image specs-versions'!
 
 versionMerged24x24
@@ -850,8 +903,8 @@
     <resource: #image>
 
     ^Icon
-        constantNamed:'GenericToolbarIconLibrary class versionMerged24x24'
-        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+	constantNamed:'GenericToolbarIconLibrary class versionMerged24x24'
+	ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @!!LNDADQE!!XVF!!0_H2D$H2@ H18"H!!8AO=SZ6]''\7^C"8.[&9.#*;N?2;_W6>]HXU^''.;.;.<OS4=OS4=?_8>O#;?O;=?>\RTMOM3L3K2<3M3<?Q5=/^8^W)
 9.[1:=T]Q<N:.[&8.K?A/\GA1LSG1<+J5-#$7<8VR*:.,+N6-+&9.[2<0LC@0LC@0<#B4L$ON:J*****+:.+*;N1-[V5-;.;0LB=1+8VN*J\)JF!!)JR#*J"+
 *:6-,[V5-+&9/;@MNIBQ$)JY$)JY''):^(:N#*J"/)+J/-I4LNXNK#H.N!!)JT$)JR%).[&Y.&)*J&*YLTM6&H"H"H"H.N#(:N#9BP$IZV&*JZ&8(UMU5,\8E9
@@ -860,17 +913,19 @@
 UEQNS30GLFI,\V11\W!!,X&I"Y&I!!W%9^T5MSWS0HLH]:^&93[798[G9/\V1,X&I!!WFA\Y30EMIF,%9RK_G%9\&=/[6=1[&91[GV@]DHDJ9>6+)2P"8"A!!7=?
 _7=?_7=?\7Q.^4@CA"X-I2\''I2</JR$)JR (JB (K"4,J"T@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[28 1 19 26 0 23 36 0 35 57 0 48 55 1 50 58 0 51 61 0 54 57 3 52 56 0 54 63 0 57 64 0 58 63 0 62 67 3 66 66 0 68 69 5 67 70 6 68 70 0 72 71 0 73 57 15 60 65 17 63 72 9 70 79 0 77 70 0 74 72 0 75 61 25 59 81 2 79 74 13 71 74 1 77 76 4 79 70 15 72 66 23 68 78 7 81 75 19 76 81 12 83 61 25 67 75 21 77 78 23 79 91 5 94 114 6 111 122 0 119 124 0 121 130 0 123 118 0 120 110 25 104 119 0 122 119 17 114 120 0 123 125 20 115 129 2 127 135 0 131 137 0 134 139 0 136 125 26 118 138 1 141 137 22 130 142 9 143 138 16 142 139 31 136 142 22 145 145 26 147 147 16 155 154 0 166 159 22 161 128 73 126 148 48 147 186 0 187 155 40 156 187 0 189 196 0 193 188 0 190 188 0 191 156 31 162 189 0 192 180 0 187 157 32 163 198 0 197 164 20 172 191 4 193 200 0 200 182 3 189 156 57 155 193 9 194 202 0 202 203 0 204 196 13 195 152 66 152 194 0 199 205 0 206 164 41 168 206 0 207 197 17 195 195 0 201 207 0 208 188 16 192 196 0 202 198 20 195 207 0 209 196 0 203 197 0 204 167 45 171 199 23 196 198 0 205 208 0 211 192 23 194 200 26 196 189 0 201 199 2 206 201 29 196 203 7 208 202 31 197 192 5 203 200 0 210 173 52 176 206 13 209 201 0 211 195 11 204 199 33 198 214 18 211 204 36 198 201 0 212 208 17 210 202 0 213 197 15 205 190 33 195 203 0 214 184 47 187 210 21 211 202 39 200 208 41 201 211 24 212 200 22 207 202 25 208 214 28 214 204 28 209 198 1 216 207 47 203 207 31 211 200 45 202 185 65 187 208 33 212 198 32 208 209 35 213 210 38 214 212 40 215 213 42 216 207 55 208 202 40 211 193 73 194 214 44 217 205 42 213 216 46 218 213 28 223 206 44 214 208 47 215 220 49 221 214 62 214 221 51 222 192 87 193 210 50 217 206 83 201 215 64 215 211 51 218 224 55 224 213 53 219 217 67 217 227 58 226 218 68 218 215 56 221 218 58 223 213 80 212 220 71 220 219 60 224 229 62 229 220 61 225 231 64 230 223 74 222 201 96 202 222 63 226 224 75 223 225 76 224 218 85 217 224 65 228 226 78 224 224 67 229 218 77 222 228 80 226 229 82 227 226 70 231 230 83 228 223 81 226 211 105 211 225 92 223 233 85 230 226 93 224 224 84 228 231 75 235 227 95 225 234 87 232 219 94 223 230 98 228 228 89 232 217 106 222 234 102 232 225 100 229 226 101 230 228 104 232 213 116 219 229 105 233 231 107 235 224 114 229 199 149 203 242 102 244 216 137 220 205 135 215 237 113 241 234 128 234 238 114 242 223 126 229 226 134 228 236 130 236 225 128 231 229 131 234 240 134 239 233 117 242 230 133 236 239 128 243 236 143 238 238 145 239 238 123 247 243 133 247 238 146 240 215 161 223 241 148 243 250 144 249 235 156 239 225 155 235 237 158 241 229 163 235 249 142 255 242 161 245 247 149 252 238 154 246 246 170 245 249 151 254 249 153 255 238 170 243 230 176 238 245 161 253 247 163 255 236 181 244 245 166 255 243 172 253 245 190 253 243 184 254 246 193 255 238 193 253]; yourself]
 ! !
+
 !Image methodsFor:'inspecting'!
 
 inspector2TabImage
 
     ^self newInspector2Tab
-        label: 'Image';
-        priority: 50;
-        view: ((HVScrollableView for:ImageView) image: self; yourself)
+	label: 'Image';
+	priority: 50;
+	view: ((HVScrollableView for:ImageView) image: self; yourself)
 
     "Created: / 11-10-2011 / 17:12:01 / cg"
 ! !
+
 !Image methodsFor:'inspecting'!
 
 inspector2Tabs
@@ -878,6 +933,7 @@
 
     "Created: / 11-10-2011 / 17:11:21 / cg"
 ! !
+
 !Image methodsFor:'inspecting'!
 
 inspectorClass
@@ -891,6 +947,7 @@
 
     "Modified: 10.6.1996 / 18:23:55 / cg"
 ! !
+
 !Integer methodsFor:'inspecting'!
 
 inspectorExtraAttributes
@@ -910,35 +967,38 @@
     "Created: / 18-09-2006 / 21:22:46 / cg"
     "Modified: / 06-10-2006 / 13:57:28 / cg"
 ! !
+
 !Iterator methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
-    "returns a string to be shown in the inspector's list. 
+    "returns a string to be shown in the inspector's list.
      Redefined to avoid calling the iterator"
 
     ^ self classNameWithArticle
 ! !
+
 !LimitedPrecisionReal methodsFor:'inspecting'!
 
 inspectorExtraAttributes
     "extra (pseudo instvar) entries to be shown in an inspector."
 
     ^ Dictionary new
-        declareAllNewFrom:(super inspectorExtraAttributes ? #());
-        add:'-hex' ->
-            [
-                String
-                    streamContents:[:s |
-                        self byteSize to:1 by:-1 do:[:i |
-                            (((self basicAt:i) printStringRadix:16) paddedTo:2 with:$0)
-                                printOn:s
-                        ]
-                    ]
-            ];
-        yourself
+	declareAllNewFrom:(super inspectorExtraAttributes ? #());
+	add:'-hex' ->
+	    [
+		String
+		    streamContents:[:s |
+			self byteSize to:1 by:-1 do:[:i |
+			    (((self basicAt:i) printStringRadix:16) paddedTo:2 with:$0)
+				printOn:s
+			]
+		    ]
+	    ];
+	yourself
 
     "Created: / 20-03-2012 / 22:34:46 / cg"
 ! !
+
 !MenuView methodsFor:'accessing-behavior'!
 
 shortKeys
@@ -946,6 +1006,7 @@
 
     "Created: / 18-10-2008 / 19:16:59 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
+
 !Method methodsFor:'inspecting'!
 
 inspectorExtraAttributes
@@ -964,6 +1025,7 @@
     "Created: / 18-09-2006 / 21:34:01 / cg"
     "Modified: / 06-10-2006 / 13:57:33 / cg"
 ! !
+
 !Method methodsFor:'printing & storing'!
 
 printStringForBrowserWithSelector:selector inClass:aClass
@@ -979,77 +1041,77 @@
 
     ns := self nameSpace.
     (ns notNil and:[ns isNameSpace]) ifTrue:[
-        moreInfo := moreInfo , 
-            ((' < %1 >' bindWith: ns name) asText emphasisAllAdd:
-                userPreferences emphasisForNamespacedCode)
+	moreInfo := moreInfo ,
+	    ((' < %1 >' bindWith: ns name) asText emphasisAllAdd:
+		userPreferences emphasisForNamespacedCode)
 
     ].
 
     self isWrapped ifTrue:[
-        (MessageTracer isCounting:self) ifTrue:[
-            (MessageTracer isCountingByReceiverClass:self) ifTrue:[
-                overAllCount := (MessageTracer executionCountOfMethod:self).
-                moreInfo := moreInfo , (' (cnt: %1' bindWith:overAllCount printString allBold).
-                overAllCount ~~ 0 ifTrue:[
-                    (MessageTracer executionCountsByReceiverClassOfMethod:self) keysAndValuesDo:[:cls :cnt |
-                        |clsName percentage|
-
-                        clsName := cls name.
-                        percentage := ((cnt / overAllCount) * 100) rounded.
-                        moreInfo := moreInfo , ('; %1->%2%%' bindWith:clsName with:percentage).
-                    ].
-                ].
-                moreInfo := moreInfo , ')'.
-            ] ifFalse:[
-                (MessageTracer isCountingMemoryUsage:self) ifTrue:[
-                    moreInfo := moreInfo , (' (mem: %1 bytes avg)' bindWith:(MessageTracer memoryUsageOfMethod:self) printString allBold).
-                ] ifFalse:[
-                    moreInfo := moreInfo , (' (cnt: %1)' bindWith:(MessageTracer executionCountOfMethod:self) printString allBold).
-                ]
-            ].
-        ] ifFalse:[
-            (MessageTracer isTiming:self) ifTrue:[
-                info := MessageTracer executionTimesOfMethod:self.
-                ((n := info count) == 0) ifTrue:[
-                    moreInfo := moreInfo , (' (cnt: %1)' bindWith:n)
-                ] ifFalse:[
-                    timeRounded := [:millis |
-                        |rnd|
-                        rnd := (millis > 100)
-                                 ifTrue:[ 1 ]
-                                 ifFalse:[
-                                     (millis > 10)
-                                        ifTrue:[ 0.1 ]
-                                        ifFalse:[
-                                            (millis > 1)
-                                                ifTrue:[ 0.01 ]
-                                                ifFalse:[ 0.001 ]]].
-                        millis roundTo:rnd
-                    ].
-
-                    (n == 1 or:[ info avgTimeRounded = info minTimeRounded  ]) ifTrue:[
-                        moreInfo := moreInfo ,
-                                    (' (t: %1ms cnt: %2)'
-                                        bindWith:((timeRounded value:info avgTimeRounded) printString allBold)
-                                        with:n)
-                    ] ifFalse:[
-                        moreInfo := moreInfo ,
-                                    (' (avg: %1ms min: %2 max: %3 cnt: %4)'
-                                        bindWith:((timeRounded value:info avgTimeRounded) printString allBold)
-                                        with:((timeRounded value:info minTimeRounded) printString)
-                                        with:((timeRounded value:info maxTimeRounded) printString)
-                                        with:n)
-                    ].
-                ].
-            ] ifFalse:[
-                moreInfo := ' !!'
-            ]
-        ].
+	(MessageTracer isCounting:self) ifTrue:[
+	    (MessageTracer isCountingByReceiverClass:self) ifTrue:[
+		overAllCount := (MessageTracer executionCountOfMethod:self).
+		moreInfo := moreInfo , (' (cnt: %1' bindWith:overAllCount printString allBold).
+		overAllCount ~~ 0 ifTrue:[
+		    (MessageTracer executionCountsByReceiverClassOfMethod:self) keysAndValuesDo:[:cls :cnt |
+			|clsName percentage|
+
+			clsName := cls name.
+			percentage := ((cnt / overAllCount) * 100) rounded.
+			moreInfo := moreInfo , ('; %1->%2%%' bindWith:clsName with:percentage).
+		    ].
+		].
+		moreInfo := moreInfo , ')'.
+	    ] ifFalse:[
+		(MessageTracer isCountingMemoryUsage:self) ifTrue:[
+		    moreInfo := moreInfo , (' (mem: %1 bytes avg)' bindWith:(MessageTracer memoryUsageOfMethod:self) printString allBold).
+		] ifFalse:[
+		    moreInfo := moreInfo , (' (cnt: %1)' bindWith:(MessageTracer executionCountOfMethod:self) printString allBold).
+		]
+	    ].
+	] ifFalse:[
+	    (MessageTracer isTiming:self) ifTrue:[
+		info := MessageTracer executionTimesOfMethod:self.
+		((n := info count) == 0) ifTrue:[
+		    moreInfo := moreInfo , (' (cnt: %1)' bindWith:n)
+		] ifFalse:[
+		    timeRounded := [:millis |
+			|rnd|
+			rnd := (millis > 100)
+				 ifTrue:[ 1 ]
+				 ifFalse:[
+				     (millis > 10)
+					ifTrue:[ 0.1 ]
+					ifFalse:[
+					    (millis > 1)
+						ifTrue:[ 0.01 ]
+						ifFalse:[ 0.001 ]]].
+			millis roundTo:rnd
+		    ].
+
+		    (n == 1 or:[ info avgTimeRounded = info minTimeRounded  ]) ifTrue:[
+			moreInfo := moreInfo ,
+				    (' (t: %1ms cnt: %2)'
+					bindWith:((timeRounded value:info avgTimeRounded) printString allBold)
+					with:n)
+		    ] ifFalse:[
+			moreInfo := moreInfo ,
+				    (' (avg: %1ms min: %2 max: %3 cnt: %4)'
+					bindWith:((timeRounded value:info avgTimeRounded) printString allBold)
+					with:((timeRounded value:info minTimeRounded) printString)
+					with:((timeRounded value:info maxTimeRounded) printString)
+					with:n)
+		    ].
+		].
+	    ] ifFalse:[
+		moreInfo := ' !!'
+	    ]
+	].
     ].
     p := self privacy.
 
     p ~~ #public ifTrue:[
-        privInfo := (' (* ' , p , ' *)') allItalic.
+	privInfo := (' (* ' , p , ' *)') allItalic.
     ].
 
 "/    self isInvalid ifTrue:[
@@ -1057,40 +1119,40 @@
 "/    ].
 
     (self isLazyMethod not and:[self isUnloaded]) ifTrue:[
-        moreInfo := ' (** unloaded **)'
+	moreInfo := ' (** unloaded **)'
     ].
 
     privInfo size ~~ 0 ifTrue:[
-        moreInfo := privInfo , ' ' , moreInfo
+	moreInfo := privInfo , ' ' , moreInfo
     ].
 
     s := shownSelector := (self selectorPrintStringInBrowserFor:selector class:aClass).
 
     (cls := aClass) isNil ifTrue:[
-        cls := self containingClass
+	cls := self containingClass
     ].
 
     currentChangeSet := ChangeSet current.
     isInChangeSet := currentChangeSet includesChangeForClass:cls selector:selector.
 
     isInChangeSet ifTrue:[
-        s := s asText emphasisAllAdd:(userPreferences emphasisForChangedCode)
+	s := s asText emphasisAllAdd:(userPreferences emphasisForChangedCode)
     ].
 
     (cls isNil or:[(mthdPackage := self package) ~= cls package]) ifTrue:[
-        suppressPackage := false.
-        mthdPackage = PackageId noProjectID ifTrue:[
-            mthdPackage := '+'.
-            "/ suppressPackage := true
-        ].
-        suppressPackage ifFalse:[
-            shadowsOrNot := (self isShadowingExtension)
-                                ifTrue:[' shadowed' ]
-                                ifFalse:[ '' ].
-            p := ' [' , ((mthdPackage ? '?'), shadowsOrNot allBold) allItalic , '] '.
-            p := p asText emphasisAllAdd:(userPreferences emphasisForDifferentPackage).
-            s := s , ' ' , p
-        ].
+	suppressPackage := false.
+	mthdPackage = PackageId noProjectID ifTrue:[
+	    mthdPackage := '?'.
+	    "/ suppressPackage := true
+	].
+	suppressPackage ifFalse:[
+	    shadowsOrNot := (self isShadowingExtension)
+				ifTrue:[' shadowed' ]
+				ifFalse:[ '' ].
+	    p := ' [' , (((mthdPackage ? '?'), shadowsOrNot allBold),' ') allItalic , '] '.
+	    p := p asText emphasisAllAdd:(userPreferences emphasisForDifferentPackage).
+	    s := s , ' ' , p
+	].
     ].
 
     moreInfo size == 0 ifTrue:[^ s].
@@ -1098,7 +1160,7 @@
     s := shownSelector , moreInfo.
 
     self isInvalid ifTrue:[
-        s := s asText emphasizeAllWith:(userPreferences emphasisForObsoleteCode).
+	s := s asText emphasizeAllWith:(userPreferences emphasisForObsoleteCode).
     ].
     ^ s
 
@@ -1107,11 +1169,13 @@
     "Modified: / 05-03-2007 / 16:18:53 / cg"
     "Modified: / 20-07-2010 / 15:39:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !Method methodsFor:'printing & storing'!
 
 selectorPrintStringInBrowserFor:selector
     ^ selector
 ! !
+
 !Method methodsFor:'printing & storing'!
 
 selectorPrintStringInBrowserFor:selector class:aClass
@@ -1129,6 +1193,7 @@
 
     "Modified: / 20-07-2010 / 10:33:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !MethodDictionary methodsFor:'inspecting'!
 
 inspectorClass
@@ -1139,6 +1204,7 @@
 
     "Created: 12.6.1996 / 12:29:13 / stefan"
 ! !
+
 !NameSpace class methodsFor:'inspecting'!
 
 inspectorClass
@@ -1151,6 +1217,7 @@
 
 
 ! !
+
 !Object methodsFor:'debugging'!
 
 inspect
@@ -1162,11 +1229,11 @@
 
     |cls|
 
-    cls := (Smalltalk classNamed: #'Tools::Inspector2') 
-                ifNil:[self inspectorClass].
+    cls := (Smalltalk classNamed: #'Tools::Inspector2')
+		ifNil:[self inspectorClass].
 
     cls isNil ifTrue:[
-        ^ self basicInspect
+	^ self basicInspect
     ].
     cls openOn:self
 
@@ -1179,6 +1246,7 @@
      (Image fromFile:'bitmaps/garfield.gif') inspect
     "
 ! !
+
 !Object methodsFor:'inspecting'!
 
 inspector2TabCommon
@@ -1189,32 +1257,35 @@
     "Created: / 24-05-2011 / 14:56:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 05-07-2011 / 14:06:28 / cg"
 ! !
+
 !Object methodsFor:'inspecting'!
 
 inspector2TabForBasicInspect
     "a tab, showing the old basic inspector"
 
     ^ Tools::Inspector2Tab new
-            priority: 40;
-            label:'Basic';
-            view: (InspectorView new inspect:self);
-            yourself
+	    priority: 40;
+	    label:'Basic';
+	    view: (InspectorView new inspect:self);
+	    yourself
 
     "Created: / 05-07-2011 / 13:59:59 / cg"
 ! !
+
 !Object methodsFor:'inspecting'!
 
 inspector2TabForInspectorClass
     "a tab, showing the old inspector"
 
     ^ Tools::Inspector2Tab new
-            priority: 100;
-            label:(self inspector2TabLabel);
-            view: (self inspectorClass new inspect:self);
-            yourself
+	    priority: 100;
+	    label:(self inspector2TabLabel);
+	    view: (self inspectorClass new inspect:self);
+	    yourself
 
     "Created: / 05-07-2011 / 14:06:16 / cg"
 ! !
+
 !Object methodsFor:'inspecting'!
 
 inspector2TabLabel
@@ -1224,17 +1295,19 @@
 
     "Created: / 14-07-2011 / 11:56:23 / cg"
 ! !
+
 !Object methodsFor:'inspecting'!
 
 inspector2Tabs
     self inspectorClass ~~ Inspector ifTrue:[
-        ^ #( inspector2TabCommon inspector2TabForBasicInspect )
+	^ #( inspector2TabCommon inspector2TabForBasicInspect )
     ].
 
     ^ #( inspector2TabCommon )
 
     "Created: / 05-07-2011 / 13:39:24 / cg"
 ! !
+
 !Object methodsFor:'debugging'!
 
 inspectorExtraAttributes
@@ -1255,6 +1328,7 @@
     "Modified: / 02-09-2005 / 19:00:01 / janfrog"
     "Modified: / 04-10-2006 / 14:33:34 / cg"
 ! !
+
 !Object methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
@@ -1264,6 +1338,7 @@
 
     "Created: / 13-06-2012 / 12:50:26 / cg"
 ! !
+
 !Object methodsFor:'testing'!
 
 isTestCaseLike
@@ -1272,16 +1347,18 @@
 
     "Created: / 28-02-2011 / 21:30:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !Object methodsFor:'debugging'!
 
 newInspector2Tab
 
     "Use Smalltalk>>at: to trick the dependency detector"
 
-    ^(Smalltalk at: #'Tools::Inspector2Tab') 
-        ifNil:[self error:'Inspector2 not available!! Something is rotten...']
-        ifNotNil:[(Smalltalk at: #'Tools::Inspector2Tab') new]
+    ^(Smalltalk at: #'Tools::Inspector2Tab')
+	ifNil:[self error:'Inspector2 not available!! Something is rotten...']
+	ifNotNil:[(Smalltalk at: #'Tools::Inspector2Tab') new]
 ! !
+
 !OrderedCollection methodsFor:'inspecting'!
 
 inspectorClass
@@ -1296,6 +1373,7 @@
      #(0 8 15 3 99 2) asSortedCollection inspect
     "
 ! !
+
 !PopUpMenu methodsFor:'converting'!
 
 asMenu
@@ -1306,39 +1384,40 @@
     | menu  |
 
     menu := Menu new receiver: menuView receiver.
-    1 to: self numberOfItems do:[:i| 
-        | menuItem subMenu lbl checkHolder|
-
-        lbl := (self labels at: i).
-        (lbl includesString:'\c') ifTrue:[
-            lbl := lbl copyReplaceString:'\c' withString:''.
-            checkHolder := (menuView checkToggleAt:i) asValue.
-        ].
-
-        menuItem := MenuItem new
-                        label: lbl;
-                        itemValue: (menuView selectors at: i);
-                        enabled: (menuView isEnabled: i);
-                        shortcutKey: (menuView shortKeys at: i);
-                        yourself.
-
-        (subMenu := self subMenuAt: i) notNil ifTrue:[
-            menuItem submenu: subMenu asMenu
-        ].
-        checkHolder notNil ifTrue:[
-            checkHolder onChangeEvaluate:[ 
-                menuView receiver perform:(menuView selectors at: i) with:checkHolder value 
-            ].
-            menuItem indication:checkHolder.
-            menuItem hideMenuOnActivated:false.
-        ].
-        menu addItem: menuItem.
+    1 to: self numberOfItems do:[:i|
+	| menuItem subMenu lbl checkHolder|
+
+	lbl := (self labels at: i).
+	(lbl includesString:'\c') ifTrue:[
+	    lbl := lbl copyReplaceString:'\c' withString:''.
+	    checkHolder := (menuView checkToggleAt:i) asValue.
+	].
+
+	menuItem := MenuItem new
+			label: lbl;
+			itemValue: (menuView selectors at: i);
+			enabled: (menuView isEnabled: i);
+			shortcutKey: (menuView shortKeys at: i);
+			yourself.
+
+	(subMenu := self subMenuAt: i) notNil ifTrue:[
+	    menuItem submenu: subMenu asMenu
+	].
+	checkHolder notNil ifTrue:[
+	    checkHolder onChangeEvaluate:[
+		menuView receiver perform:(menuView selectors at: i) with:checkHolder value
+	    ].
+	    menuItem indication:checkHolder.
+	    menuItem hideMenuOnActivated:false.
+	].
+	menu addItem: menuItem.
     ].
     ^ menu.
 
     "Created: / 18-10-2008 / 19:01:32 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 09-09-2012 / 13:10:25 / cg"
 ! !
+
 !ProfileTree methodsFor:'accessing'!
 
 method
@@ -1349,6 +1428,7 @@
     "Created: / 01-12-2007 / 22:50:16 / janfrog"
     "Modified: / 07-11-2008 / 08:40:35 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
+
 !ProfileTree methodsFor:'accessing'!
 
 package
@@ -1359,6 +1439,7 @@
     "Created: / 01-12-2007 / 22:50:28 / janfrog"
     "Modified: / 07-11-2008 / 08:40:35 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
+
 !RunArray methodsFor:'user interface'!
 
 inspectorClass
@@ -1369,16 +1450,19 @@
 
     "Modified: / 30.10.1997 / 14:28:20 / cg"
 ! !
+
 !SelectionInListModelView methodsFor:'accessing'!
 
 textStartLeft
     ^ textStartLeft
 ! !
+
 !SelectionInListModelView methodsFor:'accessing'!
 
 textStartLeft:something
     textStartLeft := something.
 ! !
+
 !Set methodsFor:'inspecting'!
 
 inspectorClass
@@ -1387,6 +1471,7 @@
 
     ^ SetInspectorView
 ! !
+
 !SimpleView methodsFor:'testing'!
 
 isCodeView2
@@ -1395,6 +1480,7 @@
 
     "Created: / 20-07-2010 / 15:42:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !Smalltalk class methodsFor:'queries'!
 
 inspectorClass
@@ -1403,17 +1489,19 @@
 
     ^ DictionaryInspectorView
 ! !
+
 !StringCollection methodsFor:'inspecting'!
 
 inspector2TabText
 
     ^self newInspector2Tab
-        label: 'String';
-        priority: 25;
-        view: ((ScrollableView for:TextView) contents: self asString; yourself)
+	label: 'String';
+	priority: 25;
+	view: ((ScrollableView for:TextView) contents: self asString; yourself)
 
     "Created: / 17-02-2008 / 10:13:07 / janfrog"
 ! !
+
 !StringCollection methodsFor:'inspecting'!
 
 inspector2Tabs
@@ -1421,6 +1509,7 @@
 
     "Created: / 05-07-2011 / 13:40:43 / cg"
 ! !
+
 !Symbol methodsFor:'accessing'!
 
 formattedCode
@@ -1431,6 +1520,7 @@
 
     "Created: / 07-07-2009 / 20:03:21 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
+
 !Symbol methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
@@ -1438,19 +1528,21 @@
 
     ^ self storeString
 ! !
+
 !Text methodsFor:'inspecting'!
 
 inspector2TabText
 
     ^self newInspector2Tab
-        label: 'Text';
-        priority: 50;
-        view: ((ScrollableView for:EditTextView) contents: self; yourself)
+	label: 'Text';
+	priority: 50;
+	view: ((ScrollableView for:EditTextView) contents: self; yourself)
 
     "Created: / 17-02-2008 / 09:03:36 / janfrog"
     "Modified: / 17-02-2008 / 10:28:33 / janfrog"
     "Modified: / 21-08-2011 / 08:02:46 / cg"
 ! !
+
 !Text methodsFor:'inspecting'!
 
 inspectorExtraAttributes
@@ -1468,19 +1560,20 @@
     "Created: / 18-09-2006 / 21:25:52 / cg"
     "Modified: / 06-10-2006 / 13:57:38 / cg"
 ! !
+
 !Timestamp methodsFor:'inspecting'!
 
 inspectorExtraAttributes
     "extra (pseudo instvar) entries to be shown in an inspector."
 
     ^ Dictionary new
-        declareAllNewFrom:(super inspectorExtraAttributes ? #());
-        add:'-dayInWeek' -> [ self dayInWeek printString , ' "', self asDate dayOfWeekName , '"' ];
-        add:'-dayInYear' -> [ self dayInYear ];
-        add:'-daysInMonth' -> [ self asDate daysInMonth ];
-        add:'-monthName' -> [ self asDate monthName ];
-        add:'-leapYear' -> [ self asDate isLeapYear ];
-        yourself
+	declareAllNewFrom:(super inspectorExtraAttributes ? #());
+	add:'-dayInWeek' -> [ self dayInWeek printString , ' "', self asDate dayOfWeekName , '"' ];
+	add:'-dayInYear' -> [ self dayInYear ];
+	add:'-daysInMonth' -> [ self asDate daysInMonth ];
+	add:'-monthName' -> [ self asDate monthName ];
+	add:'-leapYear' -> [ self asDate isLeapYear ];
+	yourself
 
     "
      Timestamp now inspect
@@ -1488,6 +1581,7 @@
 
     "Created: / 20-01-2011 / 12:19:05 / cg"
 ! !
+
 !Timestamp methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
@@ -1495,6 +1589,7 @@
 
     ^ self printString
 ! !
+
 !UUID methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
@@ -1502,6 +1597,7 @@
 
     ^ self printString
 ! !
+
 !UndefinedObject methodsFor:'inspecting'!
 
 inspectorValueStringInListFor:anInspector
@@ -1509,6 +1605,7 @@
 
     ^ 'nil'
 ! !
+
 !UninterpretedBytes methodsFor:'inspecting'!
 
 inspector2Tabs
@@ -1516,12 +1613,13 @@
 
     "Created: / 27-02-2012 / 21:51:36 / cg"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 alwaysOpenNewTabWhenCtrlClick
 
     "
-        UserPreferences current alwaysOpenNewTabWhenCtrlClick 
+	UserPreferences current alwaysOpenNewTabWhenCtrlClick
     "
 
 
@@ -1530,6 +1628,7 @@
     "Created: / 19-10-2008 / 08:00:53 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 14-02-2010 / 19:37:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 alwaysOpenNewTabWhenCtrlClick: aBoolean
@@ -1538,20 +1637,25 @@
 
     "Created: / 19-10-2008 / 08:01:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-pref''d tools'!
 
 changesBrowserClassName
 
-    ^ self 
-        at: #changesBrowserClassName 
-        ifAbsent:[self changesBrowserClass name]."/Backward comparibility
+    ^ self
+	at: #changesBrowserClassName
+	ifAbsent:[self changesBrowserClass name]."/Backward comparibility
 
     "Created: / 03-04-2012 / 11:02:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 codeView2AutoIndent
-    <resource: #obsolete>
+    "When true, the CodeView2 tries to automagically put the
+     cursor to correct position when a line is inserted.
+
+     !!!!!! THIS IS NOT THE SAME AS codeView2AutoPrettyPrint !!!!!!"
 
     ^self at:#codeView2AutoIndent ifAbsent: false
 
@@ -1560,13 +1664,16 @@
      UserPreferences current codeView2AutoIndent:true 
      UserPreferences current codeView2AutoIndent:false"
 
-    "Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 07-08-2011 / 12:46:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-06-2013 / 12:48:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 codeView2AutoIndent: aBoolean
-    <resource: #obsolete>
+    "Sets the codeView2AutoIndent value
+
+     !!!!!! THIS IS NOT THE SAME AS codeView2AutoPrettyPrint !!!!!!"
 
     ^self at:#codeView2AutoIndent put: aBoolean
 
@@ -1575,35 +1682,38 @@
      UserPreferences current codeView2AutoIndent:true 
      UserPreferences current codeView2AutoIndent:false"
 
-    "Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 07-08-2011 / 12:47:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-06-2013 / 12:48:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 codeView2ShowAcceptCancel
     ^self at:#codeView2ShowAcceptCancel ifAbsent: false
 
     "
-     UserPreferences current codeView2ShowAcceptCancel 
-     UserPreferences current codeView2ShowAcceptCancel:true 
+     UserPreferences current codeView2ShowAcceptCancel
+     UserPreferences current codeView2ShowAcceptCancel:true
      UserPreferences current codeView2ShowAcceptCancel:false"
 
     "Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 10-10-2011 / 16:41:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 codeView2ShowAcceptCancel: aBoolean
     ^self at:#codeView2ShowAcceptCancel put: aBoolean
 
     "
-     UserPreferences current codeView2ShowAcceptCancel 
-     UserPreferences current codeView2ShowAcceptCancel:true 
+     UserPreferences current codeView2ShowAcceptCancel
+     UserPreferences current codeView2ShowAcceptCancel:true
      UserPreferences current codeView2ShowAcceptCancel:false"
 
     "Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 10-10-2011 / 16:40:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 confirmRefactorings
@@ -1624,6 +1734,7 @@
 
     "Created: / 04-04-2012 / 14:02:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 confirmRefactorings:aBoolean
@@ -1644,6 +1755,7 @@
 
     "Created: / 04-04-2012 / 14:02:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-pref''d tools'!
 
 fileBrowserClass
@@ -1651,18 +1763,19 @@
 
     className := self at: #fileBrowserClassName ifAbsent:[nil].
     className notNil ifTrue:[
-        class := Smalltalk at: className asSymbol.
-        class notNil ifTrue:[ ^ class ].
+	class := Smalltalk at: className asSymbol.
+	class notNil ifTrue:[ ^ class ].
     ].
 
     "/ Old code
     self useNewFileBrowser ifTrue:[
-        ^ (FileBrowserV2 ? FileBrowser)
+	^ (FileBrowserV2 ? FileBrowser)
     ].
     ^ FileBrowser
 
     "Modified: / 03-04-2012 / 10:59:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-pref''d tools'!
 
 fileBrowserClass: aClass
@@ -1670,23 +1783,25 @@
     self at: #fileBrowserClassName put: aClass name.
 
     "
-        UserPreferences current fileBrowserClass
-        UserPreferences current fileBrowserClass: FileBrowser.
-        UserPreferences current fileBrowserClass: FileBrowserV2.
+	UserPreferences current fileBrowserClass
+	UserPreferences current fileBrowserClass: FileBrowser.
+	UserPreferences current fileBrowserClass: FileBrowserV2.
     "
 
     "Created: / 03-04-2012 / 10:57:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-pref''d tools'!
 
 fileBrowserClassName
 
-    ^ self 
-        at: #fileBrowserClassName 
-        ifAbsent:[self fileBrowserClass name]."/Backward comparibility
+    ^ self
+	at: #fileBrowserClassName
+	ifAbsent:[self fileBrowserClass name]."/Backward comparibility
 
     "Created: / 03-04-2012 / 11:01:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 showBookmarkBar
@@ -1703,6 +1818,7 @@
     "Created: / 18-05-2011 / 16:48:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 03-06-2011 / 11:01:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 showBookmarkBar: aBoolean
@@ -1718,6 +1834,7 @@
 
     "Created: / 18-05-2011 / 17:28:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 showEmbeddedTestRunnerInBrowser
@@ -1733,6 +1850,7 @@
 
     "Created: / 11-03-2010 / 10:11:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 showEmbeddedTestRunnerInBrowser:aBoolean
@@ -1747,6 +1865,7 @@
 
     "Created: / 11-03-2010 / 10:11:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 showGlobalHistory
@@ -1763,6 +1882,7 @@
     "Created: / 07-07-2011 / 00:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (comment): / 26-07-2012 / 16:35:54 / cg"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 showGlobalHistory: aBoolean
@@ -1779,6 +1899,7 @@
     "Created: / 07-07-2011 / 00:02:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (comment): / 26-07-2012 / 16:35:57 / cg"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 showLocalHistory
@@ -1795,6 +1916,7 @@
     "Created: / 07-07-2011 / 00:02:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (comment): / 26-07-2012 / 16:35:31 / cg"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 showLocalHistory: aBoolean
@@ -1811,6 +1933,7 @@
     "Created: / 07-07-2011 / 00:02:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (comment): / 26-07-2012 / 16:35:41 / cg"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 showMethodTemplate
@@ -1826,6 +1949,7 @@
 
     "Created: / 12-02-2010 / 12:06:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 showMethodTemplate:aBoolean
@@ -1840,6 +1964,7 @@
 
     "Created: / 12-02-2010 / 12:05:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 sortAndIndentClassesByInheritance
@@ -1854,6 +1979,7 @@
 
     "Created: / 06-07-2011 / 19:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 sortAndIndentClassesByInheritance: aBoolean
@@ -1868,15 +1994,16 @@
 
     "Created: / 06-07-2011 / 19:09:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 sourceCodeManagementMenuLayout
 
-    "Defines the layout of source code management menus in 
+    "Defines the layout of source code management menus in
      NewSystemBrowser. Can be one of:
-        #old        - old style as of 2011-10-06
-        #compact    - only one Repository menu, SCM specific menus underneath
-        #inline     - Repository and then SCM specific menus inlined
+	#old        - old style as of 2011-10-06
+	#compact    - only one Repository menu, SCM specific menus underneath
+	#inline     - Repository and then SCM specific menus inlined
     "
 
     ^ self at:#sourceCodeManagementMenuLayout ifAbsent: #old
@@ -1890,15 +2017,16 @@
 
     "Created: / 06-10-2011 / 18:42:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 sourceCodeManagementMenuLayout: aSymbol
 
-    "Defines the layout of source code management menus in 
+    "Defines the layout of source code management menus in
      NewSystemBrowser. Can be one of:
-        #old        - old style as of 2011-10-06
-        #compact    - only one Repository menu, SCM specific menus underneath
-        #inline     - Repository and then SCM specific menus inlined
+	#old        - old style as of 2011-10-06
+	#compact    - only one Repository menu, SCM specific menus underneath
+	#inline     - Repository and then SCM specific menus inlined
     "
     self assert: (#(old compact inline) includes: aSymbol).
 
@@ -1913,18 +2041,19 @@
 
     "Created: / 06-10-2011 / 18:44:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 useCodeView2In: appSymbol
     "no longer used - will vanish.
      Now the use of the codeView2 is globally enabled/disabled by useCodeView2InTools"
 
-    ^self useCodeView2InTools "/ or:[self perform: ('useCodeView2In' , appSymbol) asSymbol]. 
+    ^self useCodeView2InTools "/ or:[self perform: ('useCodeView2In' , appSymbol) asSymbol].
 
 
     "
-    UserPreferences current useCodeView2In: #Browser 
-    UserPreferences current useCodeView2InBrowser:true 
+    UserPreferences current useCodeView2In: #Browser
+    UserPreferences current useCodeView2InBrowser:true
     UserPreferences current useCodeView2InBrowser:false
 
     UserPreferences current useCodeView2InTools:true
@@ -1934,6 +2063,7 @@
     "Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 26-07-2011 / 10:26:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 useCodeView2InBrowser
@@ -1944,13 +2074,14 @@
     ^self at:#useCodeView2InBrowser ifAbsent: false
 
     "
-     UserPreferences current useCodeView2InBrowser 
-     UserPreferences current useCodeView2InBrowser:true 
+     UserPreferences current useCodeView2InBrowser
+     UserPreferences current useCodeView2InBrowser:true
      UserPreferences current useCodeView2InBrowser:false"
 
     "Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 26-07-2011 / 10:22:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 useCodeView2InBrowser: aBoolean
@@ -1961,13 +2092,14 @@
     ^self at:#useCodeView2InBrowser put: aBoolean
 
     "
-     UserPreferences current useCodeView2InBrowser 
-     UserPreferences current useCodeView2InBrowser:true 
+     UserPreferences current useCodeView2InBrowser
+     UserPreferences current useCodeView2InBrowser:true
      UserPreferences current useCodeView2InBrowser:false"
 
     "Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 26-07-2011 / 10:21:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 useCodeView2InDebugger
@@ -1978,13 +2110,14 @@
     ^self at:#useCodeView2InDebugger ifAbsent: false
 
     "
-     UserPreferences current useCodeView2InDebugger 
-     UserPreferences current useCodeView2InDebugger:true 
+     UserPreferences current useCodeView2InDebugger
+     UserPreferences current useCodeView2InDebugger:true
      UserPreferences current useCodeView2InDebugger:false
     "
 
     "Created: / 26-07-2011 / 10:22:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 useCodeView2InDebugger: aBoolean
@@ -1995,29 +2128,31 @@
     ^self at:#useCodeView2InDebugger put: aBoolean
 
     "
-     UserPreferences current useCodeView2InDebugger 
-     UserPreferences current useCodeView2InDebugger:true 
+     UserPreferences current useCodeView2InDebugger
+     UserPreferences current useCodeView2InDebugger:true
      UserPreferences current useCodeView2InDebugger:false"
 
     "Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 26-07-2011 / 10:22:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 useCodeView2InTools
     ^self at:#useCodeView2InTools ifAbsent:true "false"
 
     "
-     UserPreferences current useCodeView2InTools 
-     UserPreferences current useCodeView2InTools:true 
+     UserPreferences current useCodeView2InTools
+     UserPreferences current useCodeView2InTools:true
      UserPreferences current useCodeView2InTools:false"
 
     "Created: / 12-02-2010 / 12:13:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
-useCodeView2InTools:aBoolean 
+useCodeView2InTools:aBoolean
     ^self at:#useCodeView2InTools put:aBoolean
 
     "
@@ -2025,6 +2160,7 @@
      UserPreferences current useCodeView2InBrowser:false"
     "Created: / 12-02-2010 / 12:14:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 useCodeView2InWorkspace
@@ -2035,13 +2171,14 @@
     ^self at:#useCodeView2InWorkspace ifAbsent: false
 
     "
-     UserPreferences current useCodeView2InWorkspace 
-     UserPreferences current useCodeView2InWorkspace:true 
+     UserPreferences current useCodeView2InWorkspace
+     UserPreferences current useCodeView2InWorkspace:true
      UserPreferences current useCodeView2InWorkspace:false
     "
 
     "Created: / 26-07-2011 / 10:23:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-code view'!
 
 useCodeView2InWorkspace: aBoolean
@@ -2052,13 +2189,14 @@
     ^self at:#useCodeView2InWorkspace put: aBoolean
 
     "
-     UserPreferences current useCodeView2InWorkspace 
-     UserPreferences current useCodeView2InWorkspace:true 
+     UserPreferences current useCodeView2InWorkspace
+     UserPreferences current useCodeView2InWorkspace:true
      UserPreferences current useCodeView2InWorkspace:false
     "
 
     "Created: / 26-07-2011 / 10:22:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 useInPlaceSearchInBrowserLists
@@ -2073,6 +2211,7 @@
 
     "Created: / 28-07-2011 / 09:34:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 useInPlaceSearchInBrowserLists: aBoolean
@@ -2087,6 +2226,7 @@
 
     "Created: / 28-07-2011 / 09:35:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 webBrowserLikeLayout
@@ -2102,6 +2242,7 @@
 
     "Created: / 07-06-2011 / 14:33:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
 webBrowserLikeLayout: aBoolean
@@ -2117,11 +2258,7 @@
 
     "Created: / 07-06-2011 / 14:31:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
-!stx_libtool class methodsFor:'documentation'!
-
-extensionsVersion_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/extensions.st,v 1.114 2013-06-20 11:18:38 cg Exp $'
-! !
+
 !stx_libtool class methodsFor:'documentation'!
 
 extensionsVersion_HG
--- a/resources/de.rs	Mon Jul 01 12:31:33 2013 +0100
+++ b/resources/de.rs	Mon Jul 01 22:15:23 2013 +0100
@@ -1,6 +1,6 @@
 #encoding utf8
 
-; $Header: /cvs/stx/stx/libtool/resources/de.rs,v 1.217 2013-06-14 11:17:05 cg Exp $
+; $Header: /cvs/stx/stx/libtool/resources/de.rs,v 1.223 2013-06-27 15:38:08 cg Exp $
 ;
 ; German Workspace (and other tools) resources
 ;
@@ -463,6 +463,7 @@
 'Rename'               'Umbenennen'
 ; Remove                    'Entfernen'
 'Remove'               'Entfernen'
+'Open Application'     'Applikation ffnen'
 
 'browse or search class'         'Klasse suchen'
 'class to find (Tab to complete or use matchPattern):' 'Name der Klasse (mit Tab vervollstndigen oder Suchmuster):'
@@ -922,6 +923,7 @@
 'Recently changed classes'  'Vor kurzem genderte Klassen'
 'Recently Changed'          'Vor kurzem gendert'
 'Recently visited'          'Vor kurzem besucht'
+'Matching classes'          'Passende Klassen'
 'Initialize Class(es)'      'Klasse(n) initialisieren'
 'Run static code analysis (lint) on the selected classes' 'Statische Codeanalyse auf selektierte Klassen durchfhren'
 'Run static code analysis (lint) on the selected classes/protocols/methods' 'Statische Codeanalyse auf selektierte Klassen/Protokolle/Methoden durchfhren'
@@ -1032,8 +1034,9 @@
 'Class(es) to find'                         'Gesuchte Klasse(n)'
 'Class to browse'                           'Klasse browsen'
 'Class(es) to browse'                       'Klasse(n) browsen'
-'(TAB to complete; matchPattern allowed)'      '(TAB zum Vervollstndigen; Muster erlaubt)'
-'(TAB for completion; matchPattern allowed)'   '(TAB zum Vervollstndigen; Muster erlaubt)'
+'(TAB to complete; matchPattern allowed)'                   '(TAB zum Vervollstndigen; Muster erlaubt)'
+'(TAB to complete; matchPattern allowed - "*" for all)'     '(TAB zum Vervollstndigen; Muster erlaubt - "*" fr alle)'
+'(TAB for completion; matchPattern allowed)'                '(TAB zum Vervollstndigen; Muster erlaubt)'
 'Matching Classes'                              'Passende Klassen'
 'Show Full Name (do not strip off Namespace)'   'Gesamten Namen anzeigen (Namensraum nicht abschneiden)'
 
@@ -1172,8 +1175,10 @@
 
 'SubclassResponsibility in SuperClass'      'SubclassResponsibility in Superklasse'
 'SubclassResponsibility here'               'SubclassResponsibility hier'
-'Templates in Subclasses'                   'Methodenskelette in Subklassen'
-'Templates in all Subclasses'                'Methodenskelette in allen Subklassen'
+'Templates in Subclasses'                       'Methodenskelette in Subklassen'
+'Templates in all Subclasses'                   'Methodenskelette in allen Subklassen'
+'SubclassResponsibility in direct Subclasses'   'SubclassResponsibility in direkten Subklassen'
+'SubclassResponsibility in all Subclasses'      'SubclassResponsibility in all Subklassen'
 'Corresponding Instance Creation in Class'  'Zugehrige Instanzierung auf Klassen-Seite'
 'Forwarding Method in Instance Protocol'    'Weiterleitende Methode auf Instanz-Seite'
 
@@ -3022,8 +3027,11 @@
 'Browse View Class'                   'Fensterklasse browsen'
 'Debug Application'                   'Anwendung debuggen'
 'Close All like This'                 'Alle dieser Art schlieen'
+'Close All like This%1'               'Alle dieser Art schlieen%1'
 'Iconify All like This'               'Alle dieser Art minimieren'
+'Iconify All like This%1'             'Alle dieser Art minimieren%1'
 'Deiconify All like This'             'Alle dieser Art zeigen'
+'Deiconify All like This%1'             'Alle dieser Art zeigen%1'
 
 'Find and Raise'                     'Auswhlen und nach vorne bringen'
 'Find and Destroy'                   'Auswhlen und schlieen'
@@ -3452,10 +3460,10 @@
 'Maximum Memory Limit'                                  'Maximales Speicherlimit'
 'Quick Allocation Lmit'                                 'Limit fr schnelle Belegung'
 'Quickly allocate more memory (suppress GC) up to this limit'   'Bis zu diesem Limit schnell belegen (GC unterdrcken)'
-'Incremental GC Allocation Trigger'                     'Belegungs-Trigger fr incrementellen GC (IGC)'
-'Start IGC whenever this amount has been allocated'     'IGC starten, sobald belegter Speicher ber diesen Wert wchst'
+'Incremental GC Allocation Trigger'                     'Belegungs-Trigger fr incr. GC (IGC)'
+'Start IGC whenever this amount has been newly allocated'     'IGC starten, sobald diese Menge neu alloziert wurde'
 'Start incremental background GC whenever this amount has been allocated'     'Inkrementellen GC im Hintergrund starten, sobald belegter Speicher ber diesen Wert wchst'
-'Incremental GC Freespace Trigger'                      'Freispeicher-Trigger fr incrementellen GC (IGC)'
+'Incremental GC Freespace Trigger'                      'Freispeicher-Trigger fr incr. GC (IGC)'
 'Start IGC whenever freespace drops below this'         'IGC starten, sobald Freispeicher unter diesen Wert fllt'
 'Start incremental background GC whenever freespace drops below this'         'Inkrementellen GC im Hintergrund starten, sobald Freispeicher unter diesen Wert fllt'
 'Incremental GC Amount'                                 'Reserve fr incrementellen GC'