Tools__NavigatorCanvas.st
branchjv
changeset 15566 184cea584be5
parent 12431 9f0c59c742d5
parent 15441 db99d6ea85ad
child 16571 cf319f2e56d0
--- a/Tools__NavigatorCanvas.st	Sun Jan 12 23:30:25 2014 +0000
+++ b/Tools__NavigatorCanvas.st	Wed Apr 01 10:38:01 2015 +0100
@@ -46,188 +46,191 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#categoryAndClassOnlySpec
-     NavigatorCanvas new openInterface:#categoryAndClassOnlySpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#categoryAndClassOnlySpec
+     Tools::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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#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
-            )
+    #(FullSpec
+       name: categoryAndClassOnlySpec
+       window: 
+      (WindowSpec
+         label: 'Full Class Browser'
+         name: 'Full Class Browser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: classCategoryDoubleClickChannel
+                 callBack: classCategoryDoubleClicked
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: classCategoryListMenuHolder
+                 aspect: categoryPopUpMenu
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: classDoubleClickChannel
+                 callBack: classDoubleClicked
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: classHierarchyListMenuHolder
+                 aspect: hierarchyPopUpMenu
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: classHierarchyTopClass
+                 aspect: classHierarchyTopClass
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: classListMenuHolder
+                 aspect: classPopUpMenu
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: environmentHolder
+                 aspect: environmentHolder
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: hidePrivateClasses
+                 aspect: hidePrivateClasses
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: hideUnloadedClasses
+                 aspect: hideUnloadedClasses
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: immediateUpdate
+                 aspect: immediateUpdate
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: markApplicationsHolder
+                 aspect: markApplicationsHolder
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: meta
+                 aspect: meta
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: metaToggleLabelHolder
+                 aspect: metaToggleLabelHolder
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: methodVisibilityHolder
+                 aspect: methodVisibilityHolder
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: nameSpaceDoubleClickChannel
+                 callBack: nameSpaceDoubleClicked
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: nameSpaceListMenuHolder
+                 aspect: nameSpacePopUpMenu
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: organizerMode
+                 aspect: organizerMode
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: outGeneratorHolder
+                 aspect: protocolListGenerator
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: packageFilter
+                 aspect: packageFilter
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: projectDoubleClickChannel
+                 callBack: projectDoubleClicked
+               )
+               
+              (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
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: showClassPackages
+                 aspect: showClassPackages
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: showCoverageInformation
+                 aspect: showCoverageInformation
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: showMethodInheritance
+                 aspect: showMethodInheritance
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: showMethodTypeIcon
+                 aspect: showMethodTypeIcon
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: sortByNameAndInheritance
+                 aspect: sortByNameAndInheritance
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: variableDoubleClickChannel
+                 callBack: variableDoubleClicked
+               )
+             )
+             createNewApplication: true
+             createNewBuilder: true
            )
-         
-        )
-      )
-
-    "Modified: / 20-07-2011 / 14:19:31 / cg"
-    "Modified: / 13-04-2012 / 16:14:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 categoryAndSingleClassOnlySpec
@@ -238,184 +241,186 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#categoryAndSingleClassOnlySpec
-     NavigatorCanvas new openInterface:#categoryAndSingleClassOnlySpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#categoryAndSingleClassOnlySpec
+     Tools::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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#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
-            )
+    #(FullSpec
+       name: categoryAndSingleClassOnlySpec
+       window: 
+      (WindowSpec
+         label: 'Full Class Browser'
+         name: 'Full Class Browser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: classCategoryDoubleClickChannel
+                 callBack: classCategoryDoubleClicked
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: classCategoryListMenuHolder
+                 aspect: categoryPopUpMenu
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: classDoubleClickChannel
+                 callBack: classDoubleClicked
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: classHierarchyListMenuHolder
+                 aspect: hierarchyPopUpMenu
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: classHierarchyTopClass
+                 aspect: classHierarchyTopClass
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: classListMenuHolder
+                 aspect: classPopUpMenu
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: environmentHolder
+                 aspect: environmentHolder
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: hidePrivateClasses
+                 aspect: hidePrivateClasses
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: hideUnloadedClasses
+                 aspect: hideUnloadedClasses
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: immediateUpdate
+                 aspect: immediateUpdate
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: markApplicationsHolder
+                 aspect: markApplicationsHolder
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: meta
+                 aspect: meta
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: methodVisibilityHolder
+                 aspect: methodVisibilityHolder
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: nameSpaceDoubleClickChannel
+                 callBack: nameSpaceDoubleClicked
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: nameSpaceListMenuHolder
+                 aspect: nameSpacePopUpMenu
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: organizerMode
+                 aspect: organizerMode
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: outGeneratorHolder
+                 aspect: protocolListGenerator
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: packageFilter
+                 aspect: packageFilter
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: projectDoubleClickChannel
+                 callBack: projectDoubleClicked
+               ) 
+              (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
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: showClassPackages
+                 aspect: showClassPackages
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: showCoverageInformation
+                 aspect: showCoverageInformation
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: showMethodInheritance
+                 aspect: showMethodInheritance
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: showMethodTypeIcon
+                 aspect: showMethodTypeIcon
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: sortByNameAndInheritance
+                 aspect: sortByNameAndInheritance
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: variableDoubleClickChannel
+                 callBack: variableDoubleClicked
+               )
+             )
+             createNewApplication: true
+             createNewBuilder: true
            )
-         
-        )
-      )
-
-    "Modified: / 20-07-2011 / 14:19:38 / cg"
-    "Modified: / 13-04-2012 / 16:14:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 fullBrowserSpec
@@ -435,339 +440,359 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#fullBrowserSpec
-     NavigatorCanvas new openInterface:#fullBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#fullBrowserSpecPlain
+     Tools::NavigatorCanvas new openInterface:#fullBrowserSpecPlain
     "
 
     <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
+    #(FullSpec
+       name: fullBrowserSpecPlain
+       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: environmentHolder
+                       aspect: environmentHolder
+                     ) 
+                    (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: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                       callBack: variableSelectionChanged
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                       callBack: variableSelectionChanged
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-                     #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-                     #(#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)
-            )
+              
+             )
+             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"
-    "Modified: / 13-04-2012 / 16:17:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 fullBrowserSpecWithEmbeddedTestRunner
@@ -778,211 +803,222 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#fullBrowserSpec_new
-     Tools::NavigatorCanvas new openInterface:#fullBrowserSpec_new
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#fullBrowserSpecWithEmbeddedTestRunner
+     Tools::NavigatorCanvas new openInterface:#fullBrowserSpecWithEmbeddedTestRunner
     "
 
     <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
+    #(FullSpec
+       name: fullBrowserSpecWithEmbeddedTestRunner
+       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: classCategoryDoubleClickChannel
+                       callBack: classCategoryDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: classCategoryListMenuHolder
+                       aspect: categoryPopUpMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: classDoubleClickChannel
+                       callBack: classDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: classHierarchyListMenuHolder
+                       aspect: hierarchyPopUpMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: classHierarchyTopClass
+                       aspect: classHierarchyTopClass
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: classListMenuHolder
+                       aspect: classPopUpMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: hideUnloadedClasses
+                       aspect: hideUnloadedClasses
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: markApplicationsHolder
+                       aspect: markApplicationsHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: meta
+                       aspect: meta
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: metaToggleLabelHolder
+                       aspect: metaToggleLabelHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: nameSpaceDoubleClickChannel
+                       callBack: nameSpaceDoubleClicked
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: nameSpaceFilter
+                       aspect: nameSpaceFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: nameSpaceListMenuHolder
+                       aspect: nameSpacePopUpMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: organizerMode
+                       aspect: organizerMode
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: protocolListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: projectDoubleClickChannel
+                       callBack: projectDoubleClicked
+                     )
+                     
+                    (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: showClassPackages
+                       aspect: showClassPackages
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: sortByNameAndInheritance
+                       aspect: sortByNameAndInheritance
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: sortVariablesByName
+                       aspect: sortVariablesByName
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableDoubleClickChannel
+                       callBack: variableDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                       callBack: variableSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variablesMenuHolder
+                       aspect: variablesPopUpMenu
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'CategoryAndMethodList'
+                   hasHorizontalScrollBar: false
+                   hasVerticalScrollBar: false
+                   majorKey: #'Tools::NavigatorCanvas'
+                   minorKey: protocolAndMethodListSpec
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                   )
+                   createNewBuilder: false
+                 )
                 )
-                      
-                     (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)
-            )
+              
+             )
+             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
@@ -993,381 +1029,412 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleCategoryBrowserSpec
-     NavigatorCanvas new openInterface:#multipleCategoryBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#multipleCategoryBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: multipleCategoryBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'CategoryBrowser'
+         name: 'CategoryBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: doubleClickChannel
+                             callBack: classCategoryDoubleClicked
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: environmentHolder
+                             aspect: environmentHolder
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: hideUnloadedClasses
+                             aspect: hideUnloadedClasses
+                           ) 
+                          (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
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: showClassPackages
+                             aspect: showClassPackages
                            )
-                            
-                           #(#SubChannelInfoSpec
-                              #subAspect: #immediateUpdate
-                              #aspect: #immediateUpdate
-                            ) 
-                           #(#SubChannelInfoSpec
-                              #subAspect: #inGeneratorHolder
-                              #aspect: #categoryListGenerator
+                         )
+                         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
+                               snapMode: both
+                               handlePosition: left
+                               component: 
+                              (SpecCollection
+                                 collection: (
+                                  (SubCanvasSpec
+                                     name: 'ClassList'
+                                     majorKey: ClassList
+                                     subAspectHolders: 
+                                    (Array
+                                       
+                                      (SubChannelInfoSpec
+                                         subAspect: doubleClickChannel
+                                         callBack: classDoubleClicked
+                                       ) 
+                                      (SubChannelInfoSpec
+                                         subAspect: environmentHolder
+                                         aspect: environmentHolder
+                                       )
+                                       
+                                      (SubChannelInfoSpec
+                                         subAspect: hideUnloadedClasses
+                                         aspect: hideUnloadedClasses
+                                       ) 
+                                      (SubChannelInfoSpec
+                                         subAspect: immediateUpdate
+                                         aspect: immediateUpdate
+                                       )
+                                       
+                                      (SubChannelInfoSpec
+                                         subAspect: inGeneratorHolder
+                                         aspect: classListGenerator
+                                       ) 
+                                      (SubChannelInfoSpec
+                                         subAspect: markApplicationsHolder
+                                         aspect: markApplicationsHolder
+                                       )
+                                       
+                                      (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
+                                       ) 
+                                      (SubChannelInfoSpec
+                                         subAspect: showCoverageInformation
+                                         aspect: showCoverageInformation
+                                       )
+                                       
+                                      (SubChannelInfoSpec
+                                         subAspect: sortByNameAndInheritance
+                                         aspect: sortByNameAndInheritance
+                                       )
+                                     )
+                                     createNewApplication: true
+                                     createNewBuilder: true
+                                   )
+                                  (SubCanvasSpec
+                                     name: 'VariableList'
+                                     majorKey: VariableList
+                                     subAspectHolders: 
+                                    (Array
+                                       
+                                      (SubChannelInfoSpec
+                                         subAspect: classHolder
+                                         aspect: selectedClasses
+                                       ) 
+                                      (SubChannelInfoSpec
+                                         subAspect: doubleClickChannel
+                                         callBack: variableDoubleClicked
+                                       )
+                                       
+                                      (SubChannelInfoSpec
+                                         subAspect: environmentHolder
+                                         aspect: environmentHolder
+                                       ) 
+                                      (SubChannelInfoSpec
+                                         subAspect: menuHolder
+                                         aspect: variablesPopUpMenu
+                                       )
+                                       
+                                      (SubChannelInfoSpec
+                                         subAspect: selectedVariables
+                                         aspect: variableFilter
+                                       ) 
+                                      (SubChannelInfoSpec
+                                         subAspect: showClassVarsInVariableList
+                                         aspect: showClassVarsInVariableList
+                                       )
+                                       
+                                      (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
+                             )
                             )
-                            
-                           #(#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
+                          
+                         )
+                       )
+                      (SubCanvasSpec
+                         name: 'MethodCategoryList'
+                         majorKey: MethodCategoryList
+                         subAspectHolders: 
+                        (Array
+                           
+                          (SubChannelInfoSpec
+                             subAspect: doubleClickChannel
+                             callBack: protocolDoubleClicked
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: environmentHolder
+                             aspect: environmentHolder
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: filterClassVars
+                             aspect: filterClassVars
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: immediateUpdate
+                             aspect: immediateUpdate
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: inGeneratorHolder
+                             aspect: protocolListGenerator
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: menuHolder
+                             aspect: protocolMenu
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: methodVisibilityHolder
+                             aspect: methodVisibilityHolder
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: outGeneratorHolder
+                             aspect: selectorListGenerator
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: packageFilter
+                             aspect: packageFilter
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: selectedProtocols
+                             aspect: selectedProtocols
+                             callBack: protocolSelectionChanged
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: selectionChangeCondition
+                             aspect: selectionChangeConditionHolder
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: showCoverageInformation
+                             aspect: showCoverageInformation
+                           )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                           
+                          (SubChannelInfoSpec
+                             subAspect: showPseudoProtocols
+                             aspect: showPseudoProtocols
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: variableFilter
+                             aspect: variableFilter
+                           )
+                         )
+                         createNewApplication: true
+                         createNewBuilder: true
+                       )
+                      (SubCanvasSpec
+                         name: 'MethodList'
+                         majorKey: MethodList
+                         subAspectHolders: 
+                        (Array
+                           
+                          (SubChannelInfoSpec
+                             subAspect: doubleClickChannel
+                             callBack: methodDoubleClicked
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: environmentHolder
+                             aspect: environmentHolder
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: filterClassVars
+                             aspect: filterClassVars
+                           ) 
+                          (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: showCoverageInformation
+                             aspect: showCoverageInformation
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: showMethodComplexity
+                             aspect: showMethodComplexity
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: showMethodInheritance
+                             aspect: showMethodInheritance
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: showMethodTypeIcon
+                             aspect: showMethodTypeIcon
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: showSyntheticMethods
+                             aspect: showSyntheticMethods
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: variableFilter
+                             aspect: variableFilter
+                           )
+                         )
+                         createNewApplication: true
+                         createNewBuilder: true
+                       )
+                      )
+                    
+                   )
+                   handles: (Any 0.25 0.5 0.75 1.0)
+                 )
                 )
-               #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#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)
-            )
+              
+             )
+             handles: (Any 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:35:49 / cg"
-    "Modified: / 13-04-2012 / 16:17:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 multipleClassBrowserSpec
@@ -1378,322 +1445,354 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleClassBrowserSpec
-     NavigatorCanvas new openInterface:#multipleClassBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#multipleClassBrowserSpec
+     Tools::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: #variableFilter
-                                  )
-                                 #(#SubChannelInfoSpec
-                                    #subAspect: #sortVariablesByName
-                                    #aspect: #sortVariablesByName
-                                  )
-                                )
-                                #createNewApplication: true
-                                #createNewBuilder: true
-                              )
+    #(FullSpec
+       name: multipleClassBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ClassBrowser'
+         name: 'ClassBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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)
+                         showHandle: false
+                         snapMode: both
+                         handlePosition: left
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (SubCanvasSpec
+                               name: 'ClassList'
+                               majorKey: ClassList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: classDoubleClicked
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: hideUnloadedClasses
+                                   aspect: hideUnloadedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: immediateUpdate
+                                   aspect: immediateUpdate
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: inGeneratorHolder
+                                   aspect: classListGenerator
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: markApplicationsHolder
+                                   aspect: markApplicationsHolder
+                                 )
+                                 
+                                (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
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showClassPackages
+                                   aspect: showClassPackages
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: showCoverageInformation
+                                   aspect: showCoverageInformation
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: sortBy
+                                   aspect: sortBy
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortByNameAndInheritance
+                                   aspect: sortByNameAndInheritance
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            (SubCanvasSpec
+                               name: 'VariableList'
+                               majorKey: VariableList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: classHolder
+                                   aspect: selectedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: variableDoubleClicked
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: variablesPopUpMenu
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: selectedVariables
+                                   aspect: variableFilter
+                                 ) 
+                                      (SubChannelInfoSpec
+                                         subAspect: showClassVarsInVariableList
+                                         aspect: showClassVarsInVariableList
+                                       )
+                                 
+                                (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
-                        )
+                            )
+                          
+                         )
+                         handles: (Any 0.5 1.0)
                        )
-                     
-                    )
-                  )
-                 #(#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
+                      (UISubSpecification
+                         name: 'MetaToggles'
+                         layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
+                         majorKey: NavigatorModel
+                         minorKey: metaSpec
+                       )
                       )
-                    )
-                    #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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#SubChannelInfoSpec
-                        #subAspect: #showMethodTypeIcon
-                        #aspect: #showMethodTypeIcon
-                      )
-                     #(#SubChannelInfoSpec
-                        #subAspect: #selectionChangeCondition
-                        #aspect: #selectionChangeConditionHolder
-                      )
-                    )
-                    #createNewApplication: true
-                    #createNewBuilder: true
-                  )
+                    
+                   )
+                 )
+                (SubCanvasSpec
+                   name: 'MethodCategoryList'
+                   majorKey: MethodCategoryList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
                  )
-               
-              )
-              #handles: #(#Any 0.333333 0.666667 1.0)
-            )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                )
+              
+             )
+             handles: (Any 0.333333 0.666667 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:36:29 / cg"
-    "Modified: / 13-04-2012 / 16:16:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 multipleClassDiffBrowserSpec
@@ -1704,117 +1803,120 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleClassDiffBrowserSpec
-     NavigatorCanvas new openInterface:#multipleClassDiffBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#multipleClassDiffBrowserSpec
+     Tools::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
-            )
+    #(FullSpec
+       name: multipleClassDiffBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ClassBrowser'
+         name: 'ClassBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: environmentHolder
+                 aspect: environmentHolder
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: hideUnloadedClasses
+                 aspect: hideUnloadedClasses
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: immediateUpdate
+                 aspect: immediateUpdate
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: inGeneratorHolder
+                 aspect: classListGenerator
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: markApplicationsHolder
+                 aspect: markApplicationsHolder
+               )
+               
+              (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
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: showClassPackages
+                 aspect: showClassPackages
+               )
+               
+              (SubChannelInfoSpec
+                 subAspect: sortBy
+                 aspect: sortBy
+               ) 
+              (SubChannelInfoSpec
+                 subAspect: sortByNameAndInheritance
+                 aspect: sortByNameAndInheritance
+               )
+             )
+             createNewApplication: true
+             createNewBuilder: true
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:36:38 / cg"
+          (LabelSpec
+             label: 'projectInfo'
+             name: 'Label1'
+             layout: (LayoutFrame 0 0 -30 1 0 1 0 1)
+             level: -1
+             labelChannel: classesProjectInfoHolder
+             adjust: left
+           )
+          )
+        
+       )
+     )
 !
 
 multipleClassExtensionBrowserSpec
@@ -1825,358 +1927,385 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleClassExtensionBrowserSpec
-     NavigatorCanvas new openInterface:#multipleClassExtensionBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#multipleClassExtensionBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: multipleClassExtensionBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ClassBrowser'
+         name: 'ClassBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: doubleClickChannel
+                                   callBack: classDoubleClicked
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: hideUnloadedClasses
+                                   aspect: hideUnloadedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: immediateUpdate
+                                   aspect: immediateUpdate
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: inGeneratorHolder
+                                   aspect: classListGenerator
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: markApplicationsHolder
+                                   aspect: markApplicationsHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: classPopUpMenu
+                                 ) 
+                                (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
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: showClassPackages
+                                   aspect: showClassPackages
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showCoverageInformation
+                                   aspect: showCoverageInformation
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortBy
+                                   aspect: sortBy
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: sortByNameAndInheritance
+                                   aspect: sortByNameAndInheritance
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            (SubCanvasSpec
+                               name: 'ProjectList'
+                               majorKey: ProjectList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: immediateUpdate
+                                   aspect: immediateUpdate
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: inGeneratorHolder
+                                   aspect: projectListGenerator
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: projectPopUpMenu
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: selectedProjects
+                                   aspect: selectedProjects
+                                   callBack: projectSelectionChangedForFilter
+                                 ) 
+                                (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: showClassVarsInVariableList
+                                       )
+                                (SubChannelInfoSpec
+                                   subAspect: sortVariablesByName
+                                   aspect: sortVariablesByName
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            )
+                          
+                         )
+                         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: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: packageFilterOnInput
+                       aspect: packageFilter
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                       callBack: variableSelectionChanged
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                       callBack: variableSelectionChanged
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-               #(#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 "/variableFilter
-                                  )
-                                 #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#SubChannelInfoSpec
-                        #subAspect: #showMethodTypeIcon
-                        #aspect: #showMethodTypeIcon
-                      )
-                     #(#SubChannelInfoSpec
-                        #subAspect: #selectionChangeCondition
-                        #aspect: #selectionChangeConditionHolder
-                      )
-                    )
-                    #createNewApplication: true
-                    #createNewBuilder: true
-                  )
-                 )
-               
-              )
-              #handles: #(#Any 0.333333 0.666667 1.0)
-            )
+              
+             )
+             handles: (Any 0.333333 0.666667 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:36:44 / cg"
-    "Modified: / 13-04-2012 / 16:16:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 multipleFullProtocolBrowserSpec
@@ -2187,145 +2316,162 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleFullProtocolBrowserSpec
-     NavigatorCanvas new openInterface:#multipleFullProtocolBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#multipleFullProtocolBrowserSpec
+     Tools::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
-                  )
+    #(FullSpec
+       name: multipleFullProtocolBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ProtocolBrowser'
+         name: 'ProtocolBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: noAllItem
+                       aspect: noAllItem
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
                  )
-               
-              )
-              #handles: #(#Any 0.5 1.0)
-            )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (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: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: sortBy
+                       aspect: sortBy
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                )
+              
+             )
+             handles: (Any 0.5 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 20-07-2011 / 14:39:15 / cg"
+          )
+        
+       )
+     )
 !
 
 multipleNameSpaceBrowserSpec
@@ -2336,363 +2482,400 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleNameSpaceBrowserSpec
-     NavigatorCanvas new openInterface:#multipleNameSpaceBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#multipleNameSpaceBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: multipleNameSpaceBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'NameSpaceBrowser'
+         name: 'NameSpaceBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: doubleClickChannel
+                       callBack: nameSpaceDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: hideUnloadedClasses
+                       aspect: hideUnloadedClasses
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: nameSpaceListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: nameSpacePopUpMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: classListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedNamespaces
+                       aspect: selectedNamespaces
+                       callBack: nameSpaceSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showClassPackages
+                       aspect: showClassPackages
+                     )
+                   )
+                   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
+                         snapMode: both
+                         handlePosition: left
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (SubCanvasSpec
+                               name: 'ClassList'
+                               majorKey: ClassList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: classDoubleClicked
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: hideUnloadedClasses
+                                   aspect: hideUnloadedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: immediateUpdate
+                                   aspect: immediateUpdate
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: inGeneratorHolder
+                                   aspect: classListGenerator
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: markApplicationsHolder
+                                   aspect: markApplicationsHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: meta
+                                   aspect: meta
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: nameSpaceFilter
+                                   aspect: selectedNamespaces
+                                 )
+                                 
+                                (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
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showCoverageInformation
+                                   aspect: showCoverageInformation
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortByNameAndInheritance
+                                   aspect: sortByNameAndInheritance
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            (SubCanvasSpec
+                               name: 'VariableList'
+                               majorKey: VariableList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: classHolder
+                                   aspect: selectedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: variableDoubleClicked
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: variablesPopUpMenu
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: selectedVariables
+                                   aspect: variableFilter
+                                 ) 
+                                      (SubChannelInfoSpec
+                                         subAspect: showClassVarsInVariableList
+                                         aspect: showClassVarsInVariableList
+                                       )
+                                 
+                                (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
+                       )
                       )
-                      
-                     #(#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
+                    
+                   )
+                 )
+                (SubCanvasSpec
+                   name: 'MethodCategoryList'
+                   majorKey: MethodCategoryList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-               #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#SubChannelInfoSpec
-                        #subAspect: #showMethodTypeIcon
-                        #aspect: #showMethodTypeIcon
-                      )
-                     #(#SubChannelInfoSpec
-                        #subAspect: #selectionChangeCondition
-                        #aspect: #selectionChangeConditionHolder
-                      )
-                    )
-                    #createNewApplication: true
-                    #createNewBuilder: true
-                  )
-                 )
-               
-              )
-              #handles: #(#Any 0.25 0.5 0.75 1.0)
-            )
+              
+             )
+             handles: (Any 0.25 0.5 0.75 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:36:54 / cg"
-    "Modified: / 13-04-2012 / 16:16:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 multipleNameSpaceFullBrowserSpec
@@ -2703,446 +2886,469 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleNameSpaceFullBrowserSpec
-     NavigatorCanvas new openInterface:#multipleNameSpaceFullBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#multipleNameSpaceFullBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: multipleNameSpaceFullBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'NameSpaceBrowser'
+         name: 'NameSpaceBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: doubleClickChannel
+                             callBack: nameSpaceDoubleClicked
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: environmentHolder
+                             aspect: environmentHolder
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: hideUnloadedClasses
+                             aspect: hideUnloadedClasses
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: immediateUpdate
+                             aspect: immediateUpdate
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: inGeneratorHolder
+                             aspect: nameSpaceListGenerator
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: menuHolder
+                             aspect: nameSpacePopUpMenu
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: selectedNamespaces
+                             aspect: selectedNamespaces
+                             callBack: nameSpaceSelectionChanged
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: selectionChangeCondition
+                             aspect: selectionChangeConditionHolder
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: showClassPackages
+                             aspect: showClassPackages
+                           )
+                         )
+                         createNewApplication: true
+                         createNewBuilder: true
+                       )
+                      (SubCanvasSpec
+                         name: 'ClassCategoryList'
+                         majorKey: ClassCategoryList
+                         subAspectHolders: 
+                        (Array
+                           
+                          (SubChannelInfoSpec
+                             subAspect: doubleClickChannel
+                             callBack: classCategoryDoubleClicked
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: environmentHolder
+                             aspect: environmentHolder
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: forceGeneratorTrigger
+                             aspect: forceClassCategoryGeneratorTrigger
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: hideUnloadedClasses
+                             aspect: hideUnloadedClasses
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: immediateUpdate
+                             aspect: immediateUpdate
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: menuHolder
+                             aspect: categoryPopUpMenu
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: nameSpaceFilter
+                             aspect: selectedNamespaces
+                           ) 
+                          (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: #forceGeneratorTrigger
-                              #aspect: #forceClassCategoryGeneratorTrigger
+                           
+                          (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
+                         snapMode: both
+                         handlePosition: left
+                         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: showClassVarsInVariableList
+                                       )
+                                (SubChannelInfoSpec
+                                   subAspect: sortVariablesByName
+                                   aspect: sortVariablesByName
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
                             )
-
-                           #(#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)
+                       )
+                      (UISubSpecification
+                         name: 'MetaToggles'
+                         layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
+                         majorKey: NavigatorModel
+                         minorKey: metaSpec
                        )
-                     
-                    )
-                    #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
+                      )
+                    
+                   )
+                 )
+                (SubCanvasSpec
+                   name: 'MethodCategoryList'
+                   majorKey: MethodCategoryList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-               #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#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)
-            )
+              
+             )
+             handles: (Any 0.25 0.5 0.75 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:37:01 / cg"
-    "Modified: / 13-04-2012 / 16:16:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 multipleProjectBrowserSpec
@@ -3153,361 +3359,397 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleProjectBrowserSpec
-     NavigatorCanvas new openInterface:#multipleProjectBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#multipleProjectBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: multipleProjectBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ProjectBrowser'
+         name: 'ProjectBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: doubleClickChannel
+                       callBack: projectDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: hideUnloadedClasses
+                       aspect: hideUnloadedClasses
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: projectListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: projectPopUpMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: classListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProjects
+                       aspect: selectedProjects
+                       callBack: projectSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showClassPackages
+                       aspect: showClassPackages
+                     )
+                   )
+                   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
+                         snapMode: both
+                         handlePosition: left
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (SubCanvasSpec
+                               name: 'ClassList'
+                               majorKey: ClassList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: classDoubleClicked
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: hideUnloadedClasses
+                                   aspect: hideUnloadedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: immediateUpdate
+                                   aspect: immediateUpdate
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: inGeneratorHolder
+                                   aspect: classListGenerator
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: markApplicationsHolder
+                                   aspect: markApplicationsHolder
+                                 )
+                                 
+                                (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
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: showCoverageInformation
+                                   aspect: showCoverageInformation
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: sortByNameAndInheritance
+                                   aspect: sortByNameAndInheritance
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            (SubCanvasSpec
+                               name: 'VariableList'
+                               majorKey: VariableList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: classHolder
+                                   aspect: selectedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: variableDoubleClicked
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: variablesPopUpMenu
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: selectedVariables
+                                   aspect: variableFilter
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showClassVarsInVariableList
+                                   aspect: showClassVarsInVariableList
+                                 )
+                                 
+                                (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
+                       )
                       )
-                      
-                     #(#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
+                    
+                   )
+                 )
+                (SubCanvasSpec
+                   name: 'MethodCategoryList'
+                   majorKey: MethodCategoryList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                       callBack: variableSelectionChanged
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                       callBack: variableSelectionChanged
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-               #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#SubChannelInfoSpec
-                        #subAspect: #showMethodTypeIcon
-                        #aspect: #showMethodTypeIcon
-                      )
-                     #(#SubChannelInfoSpec
-                        #subAspect: #selectionChangeCondition
-                        #aspect: #selectionChangeConditionHolder
-                      )
-                    )
-                    #createNewApplication: true
-                    #createNewBuilder: true
-                  )
-                 )
-               
-              )
-              #handles: #(#Any 0.25 0.5 0.75 1.0)
-            )
+              
+             )
+             handles: (Any 0.25 0.5 0.75 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:37:12 / cg"
-    "Modified: / 13-04-2012 / 16:16:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 multipleProjectFullBrowserSpec
@@ -3518,444 +3760,476 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleProjectFullBrowserSpec
-     NavigatorCanvas new openInterface:#multipleProjectFullBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#multipleProjectFullBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: multipleProjectFullBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ProjectBrowser'
+         name: 'ProjectBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: doubleClickChannel
+                             callBack: projectDoubleClicked
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: environmentHolder
+                             aspect: environmentHolder
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: hideUnloadedClasses
+                             aspect: hideUnloadedClasses
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: immediateUpdate
+                             aspect: immediateUpdate
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: inGeneratorHolder
+                             aspect: projectListGenerator
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: menuHolder
+                             aspect: projectPopUpMenu
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: selectedProjects
+                             aspect: selectedProjects
+                             callBack: projectSelectionChanged
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: selectionChangeCondition
+                             aspect: selectionChangeConditionHolder
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: showClassPackages
+                             aspect: showClassPackages
+                           )
+                         )
+                         createNewApplication: true
+                         createNewBuilder: true
+                       )
+                      (SubCanvasSpec
+                         name: 'ClassCategoryList'
+                         majorKey: ClassCategoryList
+                         subAspectHolders: 
+                        (Array
+                           
+                          (SubChannelInfoSpec
+                             subAspect: doubleClickChannel
+                             callBack: classCategoryDoubleClicked
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: environmentHolder
+                             aspect: environmentHolder
+                           )
+                           
+                          (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: packageFilter
+                             aspect: selectedProjects
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: selectedCategories
+                             aspect: selectedCategories
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: selectionChangeCondition
+                             aspect: selectionChangeCondition
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: slaveMode
+                             aspect: categoryListSlaveMode
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: updateTrigger
+                             aspect: classCategoryListUpdateTrigger
                            )
-                           #(#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
+                         snapMode: both
+                         handlePosition: left
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (SubCanvasSpec
+                               name: 'ClassList'
+                               majorKey: ClassList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: classDoubleClicked
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: hideUnloadedClasses
+                                   aspect: hideUnloadedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: immediateUpdate
+                                   aspect: immediateUpdate
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: inGeneratorHolder
+                                   aspect: classListGenerator
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: markApplicationsHolder
+                                   aspect: markApplicationsHolder
+                                 )
+                                 
+                                (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
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showCoverageInformation
+                                   aspect: showCoverageInformation
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortByNameAndInheritance
+                                   aspect: sortByNameAndInheritance
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            (SubCanvasSpec
+                               name: 'VariableList'
+                               majorKey: VariableList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: classHolder
+                                   aspect: selectedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: variableDoubleClicked
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: variablesPopUpMenu
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: selectedVariables
+                                   aspect: variableFilter
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showClassVarsInVariableList
+                                   aspect: showClassVarsInVariableList
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortVariablesByName
+                                   aspect: sortVariablesByName
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
                             )
-                          )
-                          #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
                        )
-                     
-                    )
-                    #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
+                      )
+                    
+                   )
+                 )
+                (SubCanvasSpec
+                   name: 'MethodCategoryList'
+                   majorKey: MethodCategoryList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                       callBack: variableSelectionChanged
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                       callBack: variableSelectionChanged
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-               #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-                     #(#SubChannelInfoSpec
-                        #subAspect: #showMethodTypeIcon
-                        #aspect: #showMethodTypeIcon
-                      )
-                     #(#SubChannelInfoSpec
-                        #subAspect: #selectionChangeCondition
-                        #aspect: #selectionChangeConditionHolder
-                      )
-                    )
-                    #createNewApplication: true
-                    #createNewBuilder: true
-                  )
-                 )
-               
-              )
-              #handles: #(#Any 0.25 0.5 0.75 1.0)
-            )
+              
+             )
+             handles: (Any 0.25 0.5 0.75 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:37:24 / cg"
-    "Modified (format): / 13-04-2012 / 16:16:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 multipleProtocolBrowserSpec
@@ -3966,145 +4240,162 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#multipleProtocolBrowserSpec
-     NavigatorCanvas new openInterface:#multipleProtocolBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#multipleProtocolBrowserSpec
+     Tools::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
-                  )
+    #(FullSpec
+       name: multipleProtocolBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ProtocolBrowser'
+         name: 'ProtocolBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: noAllItem
+                       aspect: noAllItem
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
                  )
-               
-              )
-              #handles: #(#Any 0.5 1.0)
-            )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (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: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: sortBy
+                       aspect: sortBy
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                )
+              
+             )
+             handles: (Any 0.5 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 27-04-2010 / 16:43:01 / cg"
+          )
+        
+       )
+     )
 !
 
 protocolAndMethodListSpec
@@ -4122,69 +4413,92 @@
     <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
+    #(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: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel1'
+             layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+             horizontalLayout: fit
+             verticalLayout: bottomFit
+             horizontalSpace: 3
+             verticalSpace: 3
+             component: 
+            (SpecCollection
+               collection: (
+                (SubCanvasSpec
+                   name: 'ProtocolAndMethodListCanvas'
+                   hasHorizontalScrollBar: false
+                   hasVerticalScrollBar: false
+                   majorKey: #'Tools::NavigatorCanvas'
+                   minorKey: #'protocolAndMethodListSpec_Both'
+                   specHolder: organizerProtocolAndMethodListSpecHolder
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                   )
+                   createNewBuilder: false
+                   extent: (Point 498 456)
+                 )
+                (SubCanvasSpec
+                   name: 'TestRunnerEmbedded'
+                   initiallyInvisible: true
+                   visibilityChannel: testRunnerVisibleHolder
+                   hasHorizontalScrollBar: false
+                   hasVerticalScrollBar: false
+                   majorKey: #'Tools::TestRunnerEmbedded'
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: infoHolder
+                       aspect: infoLabelHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: methodGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectedClassesHolder
+                       aspect: selectedClasses
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedMethodsHolder
+                       aspect: selectedMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocolsHolder
+                       aspect: selectedProtocols
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                   extent: (Point 498 50)
+                 )
                 )
-                
-               (SubChannelInfoSpec
-                  subAspect: selectedMethodsHolder
-                  aspect: selectedMethods
-                ) 
-               (SubChannelInfoSpec
-                  subAspect: selectedProtocolsHolder
-                  aspect: selectedProtocols
-                )
-                
-               (SubChannelInfoSpec
-                  subAspect: infoHolder
-                  aspect: infoLabelHolder
-                )
-              )
-              createNewApplication: true
-              createNewBuilder: true
-            )
+              
+             )
            )
-         
-        )
-      )
+          )
+        
+       )
+     )
 !
 
 selectorBrowserSpec
@@ -4195,176 +4509,198 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#selectorBrowserSpec
-     NavigatorCanvas new openInterface:#selectorBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#selectorBrowserSpec
+     Tools::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
-                  )
+    #(FullSpec
+       name: selectorBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'SelectorBrowser'
+         name: 'SelectorBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (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: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
                  )
-               
-              )
-              #handles: #(#Any 0.333333 0.666667 1.0)
-            )
+                (SubCanvasSpec
+                   name: 'ImplementedMethodList'
+                   majorKey: ImplementingMethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: xxxDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (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
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'ImplementingClassList'
+                   majorKey: ImplementingClassList
+                   minorKey: windowSpec
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: implementingClassListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectedMethods
+                       aspect: selectedMethods
+                       callBack: methodsSelectionChanged
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                )
+              
+             )
+             handles: (Any 0.333333 0.666667 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 27-04-2010 / 16:43:16 / cg"
+          )
+        
+       )
+     )
 !
 
 singleCategoryBrowserSpec
@@ -4375,358 +4711,396 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleCategoryBrowserSpec
-     NavigatorCanvas new openInterface:#singleCategoryBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#singleCategoryBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: singleCategoryBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'CategoryBrowser'
+         name: 'CategoryBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: environmentHolder
+                             aspect: environmentHolder
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: hideUnloadedClasses
+                             aspect: hideUnloadedClasses
+                           )
+                           
+                          (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
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: showClassPackages
+                             aspect: showClassPackages
+                           )
+                         )
+                         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: 'ClassList'
+                               majorKey: ClassList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: classDoubleClicked
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: hideUnloadedClasses
+                                   aspect: hideUnloadedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: immediateUpdate
+                                   aspect: immediateUpdate
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: inGeneratorHolder
+                                   aspect: classListGenerator
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: markApplicationsHolder
+                                   aspect: markApplicationsHolder
+                                 )
+                                 
+                                (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
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showCoverageInformation
+                                   aspect: showCoverageInformation
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortByNameAndInheritance
+                                   aspect: sortByNameAndInheritance
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            (SubCanvasSpec
+                               name: 'VariableList'
+                               majorKey: VariableList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: classHolder
+                                   aspect: selectedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: variableDoubleClicked
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: variablesPopUpMenu
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: variablesMenuHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: selectedVariables
+                                   aspect: variableFilter
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: showClassVarsInVariableList
+                                   aspect: showClassVarsInVariableList
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: sortVariablesByName
+                                   aspect: sortVariablesByName
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
                             )
-                            
-                           #(#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
+                          
+                         )
+                         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: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-               #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#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)
-            )
+              
+             )
+             handles: (Any 0.333333 0.666667 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:37:34 / cg"
-    "Modified: / 13-04-2012 / 16:15:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 singleClassBrowserSpec
@@ -4737,294 +5111,319 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleClassBrowserSpec
-     NavigatorCanvas new openInterface:#singleClassBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#singleClassBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: singleClassBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ClassBrowser'
+         name: 'ClassBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: environmentHolder
+                             aspect: environmentHolder
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: hideUnloadedClasses
+                             aspect: hideUnloadedClasses
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: immediateUpdate
+                             aspect: immediateUpdate
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: inGeneratorHolder
+                             aspect: classListGenerator
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: menuHolder
+                             aspect: classPopUpMenu
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: meta
+                             aspect: meta
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: outGeneratorHolder
+                             aspect: protocolListGenerator
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: selectedClasses
+                             aspect: selectedClasses
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: showClassPackages
+                             aspect: showClassPackages
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: sortByNameAndInheritance
+                             aspect: sortByNameAndInheritance
+                           )
+                         )
+                         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: doubleClickChannel
+                                   callBack: protocolDoubleClicked
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: filterClassVars
+                                   aspect: filterClassVars
+                                 ) 
+                                (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
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: showCoverageInformation
+                                   aspect: showCoverageInformation
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showPseudoProtocols
+                                   aspect: showPseudoProtocols
+                                 )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: variableFilter
+                                   aspect: variableFilter
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            (SubCanvasSpec
+                               name: 'VariableList'
+                               majorKey: VariableList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: classHolder
+                                   aspect: selectedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: variableDoubleClicked
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: variablesPopUpMenu
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: selectedVariables
+                                   aspect: variableFilter
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showClassVarsInVariableList
+                                   aspect: showClassVarsInVariableList
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortVariablesByName
+                                   aspect: sortVariablesByName
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
                             )
-                            
-                           #(#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
+                          
+                         )
+                         handles: (Any 0.5 1.0)
+                       )
+                      (UISubSpecification
+                         name: 'MetaToggles'
+                         layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
+                         majorKey: NavigatorModel
+                         minorKey: metaSpec
+                       )
                       )
-                                 #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#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)
-            )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                )
+              
+             )
+             handles: (Any 0.5 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:37:41 / cg"
-    "Modified: / 13-04-2012 / 16:15:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 singleFullProtocolBrowserSpec
@@ -5035,134 +5434,146 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleFullProtocolBrowserSpec
-     NavigatorCanvas new openInterface:#singleFullProtocolBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#singleFullProtocolBrowserSpec
+     Tools::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
-                  )
+    #(FullSpec
+       name: singleFullProtocolBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ProtocolBrowser'
+         name: 'ProtocolBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: environmentHolder
+                       aspect: environmentHolder
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                   )
+                   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: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (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: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: sortBy
+                       aspect: sortBy
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                )
+              
+             )
            )
-         
-        )
-      )
-
-    "Modified: / 20-07-2011 / 14:40:48 / cg"
+          )
+        
+       )
+     )
 !
 
 singleNameSpaceBrowserSpec
@@ -5173,353 +5584,388 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleNameSpaceBrowserSpec
-     NavigatorCanvas new openInterface:#singleNameSpaceBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#singleNameSpaceBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: singleNameSpaceBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'NameSpaceBrowser'
+         name: 'NameSpaceBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: environmentHolder
+                             aspect: environmentHolder
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: hideUnloadedClasses
+                             aspect: hideUnloadedClasses
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: immediateUpdate
+                             aspect: immediateUpdate
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: inGeneratorHolder
+                             aspect: nameSpaceListGenerator
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: outGeneratorHolder
+                             aspect: classListGenerator
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: selectedNamespaces
+                             aspect: selectedNamespaces
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: showClassPackages
+                             aspect: showClassPackages
+                           )
+                         )
+                         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: 'ClassList'
+                               majorKey: ClassList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: classDoubleClicked
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: hideUnloadedClasses
+                                   aspect: hideUnloadedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: immediateUpdate
+                                   aspect: immediateUpdate
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: inGeneratorHolder
+                                   aspect: classListGenerator
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: markApplicationsHolder
+                                   aspect: markApplicationsHolder
+                                 )
+                                 
+                                (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
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showCoverageInformation
+                                   aspect: showCoverageInformation
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortByNameAndInheritance
+                                   aspect: sortByNameAndInheritance
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            (SubCanvasSpec
+                               name: 'VariableList'
+                               majorKey: VariableList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: classHolder
+                                   aspect: selectedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: variableDoubleClicked
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: variablesPopUpMenu
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: selectedVariables
+                                   aspect: variableFilter
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showClassVarsInVariableList
+                                   aspect: showClassVarsInVariableList
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortVariablesByName
+                                   aspect: sortVariablesByName
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
                             )
-                            
-                           #(#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
+                          
+                         )
+                         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: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-               #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#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)
-            )
+              
+             )
+             handles: (Any 0.333333 0.666667 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:37:52 / cg"
-    "Modified: / 13-04-2012 / 16:15:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 singleNameSpaceFullBrowserSpec
@@ -5530,434 +5976,461 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleNameSpaceFullBrowserSpec
-     NavigatorCanvas new openInterface:#singleNameSpaceFullBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#singleNameSpaceFullBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: singleNameSpaceFullBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'NameSpaceBrowser'
+         name: 'NameSpaceBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: environmentHolder
+                             aspect: environmentHolder
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: hideUnloadedClasses
+                             aspect: hideUnloadedClasses
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: immediateUpdate
+                             aspect: immediateUpdate
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: inGeneratorHolder
+                             aspect: nameSpaceListGenerator
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: outGeneratorHolder
+                             aspect: classListPerNameSpaceGenerator
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: selectedNamespaces
+                             aspect: selectedNamespaces
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: showClassPackages
+                             aspect: showClassPackages
+                           )
+                         )
+                         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: environmentHolder
+                             aspect: environmentHolder
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: forceGeneratorTrigger
+                             aspect: forceClassCategoryGeneratorTrigger
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: hideUnloadedClasses
+                             aspect: hideUnloadedClasses
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: immediateUpdate
+                             aspect: immediateUpdate
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: menuHolder
+                             aspect: categoryPopUpMenu
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: nameSpaceFilter
+                             aspect: selectedNamespaces
+                           ) 
+                          (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
                            )
-                           #(#SubChannelInfoSpec
-                              #subAspect: #forceGeneratorTrigger
-                              #aspect: #forceClassCategoryGeneratorTrigger
+                         )
+                         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
+                         snapMode: both
+                         handlePosition: left
+                         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: showClassVarsInVariableList
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: sortVariablesByName
+                                   aspect: sortVariablesByName
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
                             )
-
-                           #(#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
-                        )
+                          
+                         )
+                         handles: (Any 0.5 1.0)
+                       )
+                      (UISubSpecification
+                         name: 'MetaToggles'
+                         layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
+                         majorKey: NavigatorModel
+                         minorKey: metaSpec
                        )
-                     
-                    )
-                  )
-                 #(#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
+                      )
+                    
+                   )
+                 )
+                (SubCanvasSpec
+                   name: 'MethodCategoryList'
+                   majorKey: MethodCategoryList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-               #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#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)
-            )
+              
+             )
+             handles: (Any 0.25 0.5 0.75 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:37:57 / cg"
-    "Modified: / 13-04-2012 / 16:15:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 singleProjectBrowserSpec
@@ -5968,357 +6441,388 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleProjectBrowserSpec
-     NavigatorCanvas new openInterface:#singleProjectBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#singleProjectBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: singleProjectBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ProjectBrowser'
+         name: 'ProjectBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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
+                         snapMode: both
+                         handlePosition: left
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (SubCanvasSpec
+                               name: 'ClassList'
+                               majorKey: ClassList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: classDoubleClicked
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: hideUnloadedClasses
+                                   aspect: hideUnloadedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: immediateUpdate
+                                   aspect: immediateUpdate
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: inGeneratorHolder
+                                   aspect: classListGenerator
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: markApplicationsHolder
+                                   aspect: markApplicationsHolder
+                                 )
+                                 
+                                (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
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showCoverageInformation
+                                   aspect: showCoverageInformation
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortByNameAndInheritance
+                                   aspect: sortByNameAndInheritance
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            (SubCanvasSpec
+                               name: 'VariableList'
+                               majorKey: VariableList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: classHolder
+                                   aspect: selectedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: variableDoubleClicked
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: variablesPopUpMenu
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: selectedVariables
+                                   aspect: variableFilter
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showClassVarsInVariableList
+                                   aspect: showClassVarsInVariableList
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortVariablesByName
+                                   aspect: sortVariablesByName
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
                             )
-                            
-                           #(#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
+                          
+                         )
+                         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: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-               #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-                     #(#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)
-            )
+              
+             )
+             handles: (Any 0.333333 0.666667 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:38:02 / cg"
-    "Modified: / 13-04-2012 / 16:15:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 singleProjectFullBrowserSpec
@@ -6329,435 +6833,470 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleProjectFullBrowserSpec
-     NavigatorCanvas new openInterface:#singleProjectFullBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#singleProjectFullBrowserSpec
+     Tools::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
+    #(FullSpec
+       name: singleProjectFullBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ProjectBrowser'
+         name: 'ProjectBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: environmentHolder
+                             aspect: environmentHolder
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: hideUnloadedClasses
+                             aspect: hideUnloadedClasses
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: immediateUpdate
+                             aspect: immediateUpdate
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: inGeneratorHolder
+                             aspect: projectListGenerator
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: menuHolder
+                             aspect: projectPopUpMenu
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: outGeneratorHolder
+                             aspect: classListGenerator
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: selectedProjects
+                             aspect: selectedProjects
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: showClassPackages
+                             aspect: showClassPackages
+                           )
+                         )
+                         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: environmentHolder
+                             aspect: environmentHolder
+                           )
+                           
+                          (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: packageFilter
+                             aspect: selectedProjects
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: selectedCategories
+                             aspect: selectedCategories
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: selectionChangeCondition
+                             aspect: selectionChangeCondition
+                           ) 
+                          (SubChannelInfoSpec
+                             subAspect: slaveMode
+                             aspect: categoryListSlaveMode
+                           )
+                           
+                          (SubChannelInfoSpec
+                             subAspect: updateTrigger
+                             aspect: classCategoryListUpdateTrigger
                            )
-                           #(#SubChannelInfoSpec
-                              #subAspect: #forceGeneratorTrigger
-                              #aspect: #forceClassCategoryGeneratorTrigger
+                         )
+                         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
+                         snapMode: both
+                         handlePosition: left
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (SubCanvasSpec
+                               name: 'ClassList'
+                               majorKey: ClassList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: classDoubleClicked
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: hideUnloadedClasses
+                                   aspect: hideUnloadedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: immediateUpdate
+                                   aspect: immediateUpdate
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: inGeneratorHolder
+                                   aspect: classListGenerator
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: markApplicationsHolder
+                                   aspect: markApplicationsHolder
+                                 )
+                                 
+                                (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
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showCoverageInformation
+                                   aspect: showCoverageInformation
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortByNameAndInheritance
+                                   aspect: sortByNameAndInheritance
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
+                            (SubCanvasSpec
+                               name: 'VariableList'
+                               majorKey: VariableList
+                               subAspectHolders: 
+                              (Array
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: classHolder
+                                   aspect: selectedClasses
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: doubleClickChannel
+                                   callBack: variableDoubleClicked
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: environmentHolder
+                                   aspect: environmentHolder
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: menuHolder
+                                   aspect: variablesPopUpMenu
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: selectedVariables
+                                   aspect: variableFilter
+                                 ) 
+                                (SubChannelInfoSpec
+                                   subAspect: showClassVarsInVariableList
+                                   aspect: showClassVarsInVariableList
+                                 )
+                                 
+                                (SubChannelInfoSpec
+                                   subAspect: sortVariablesByName
+                                   aspect: sortVariablesByName
+                                 )
+                               )
+                               createNewApplication: true
+                               createNewBuilder: true
+                             )
                             )
-
-                           #(#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
-                        )
+                          
+                         )
+                         handles: (Any 0.5 1.0)
+                       )
+                      (UISubSpecification
+                         name: 'SubSpecification1'
+                         layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
+                         majorKey: NavigatorModel
+                         minorKey: metaSpec
                        )
-                     
-                    )
-                  )
-                 #(#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
+                      )
+                    
+                   )
+                 )
+                (SubCanvasSpec
+                   name: 'MethodCategoryList'
+                   majorKey: MethodCategoryList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: protocolDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: immediateUpdate
+                       aspect: immediateUpdate
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: inGeneratorHolder
+                       aspect: protocolListGenerator
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: menuHolder
+                       aspect: protocolMenu
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: methodVisibilityHolder
+                       aspect: methodVisibilityHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: outGeneratorHolder
+                       aspect: selectorListGenerator
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: packageFilter
+                       aspect: packageFilter
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: selectedProtocols
+                       aspect: selectedProtocols
+                       callBack: protocolSelectionChanged
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: selectionChangeCondition
+                       aspect: selectionChangeConditionHolder
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+              (SubChannelInfoSpec
+                 subAspect: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showPseudoProtocols
+                       aspect: showPseudoProtocols
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                (SubCanvasSpec
+                   name: 'MethodList'
+                   majorKey: MethodList
+                   subAspectHolders: 
+                  (Array
+                     
+                    (SubChannelInfoSpec
+                       subAspect: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: filterClassVars
+                       aspect: filterClassVars
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodComplexity
+                       aspect: showMethodComplexity
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showMethodInheritance
+                       aspect: showMethodInheritance
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showMethodTypeIcon
+                       aspect: showMethodTypeIcon
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: showSyntheticMethods
+                       aspect: showSyntheticMethods
+                     )
+                     
+                    (SubChannelInfoSpec
+                       subAspect: variableFilter
+                       aspect: variableFilter
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
                 )
-               #(#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: showSyntheticMethods
-                        aspect: showSyntheticMethods
-                      )
-
-
-                     #(#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)
-            )
+              
+             )
+             handles: (Any 0.25 0.5 0.75 1.0)
            )
-         
-        )
-      )
-
-    "Modified: / 04-07-2011 / 18:38:13 / cg"
-    "Modified: / 13-04-2012 / 16:15:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+          )
+        
+       )
+     )
 !
 
 singleProtocolBrowserSpec
@@ -6768,134 +7307,146 @@
      the UIPainter may not be able to read the specification."
 
     "
-     UIPainter new openOnClass:NavigatorCanvas andSelector:#singleProtocolBrowserSpec
-     NavigatorCanvas new openInterface:#singleProtocolBrowserSpec
+     UIPainter new openOnClass:Tools::NavigatorCanvas andSelector:#singleProtocolBrowserSpec
+     Tools::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
-                  )
+    #(FullSpec
+       name: singleProtocolBrowserSpec
+       window: 
+      (WindowSpec
+         label: 'ProtocolBrowser'
+         name: 'ProtocolBrowser'
+         min: (Point 0 0)
+         bounds: (Rectangle 0 0 462 300)
+       )
+       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: environmentHolder
+                       aspect: environmentHolder
+                     ) 
+                    (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: showCoverageInformation
+                       aspect: showCoverageInformation
+                     )
+                   )
+                   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: doubleClickChannel
+                       callBack: methodDoubleClicked
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: environmentHolder
+                       aspect: environmentHolder
+                     )
+                     
+                    (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: showSyntheticMethods
+                 aspect: showSyntheticMethods
+               ) 
+                     
+                    (SubChannelInfoSpec
+                       subAspect: showCoverageInformation
+                       aspect: showCoverageInformation
+                     ) 
+                    (SubChannelInfoSpec
+                       subAspect: sortBy
+                       aspect: sortBy
+                     )
+                   )
+                   createNewApplication: true
+                   createNewBuilder: true
+                 )
+                )
+              
+             )
            )
-         
-        )
-      )
-
-    "Modified: / 27-04-2010 / 16:44:12 / cg"
+          )
+        
+       )
+     )
 !
 
 windowSpec
@@ -6908,6 +7459,25 @@
     ^ NewSystemBrowser classResources
 ! !
 
+!NavigatorCanvas class methodsFor:'plugIn spec'!
+
+aspectSelectors
+    "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."
+
+    "Return a description of exported aspects;
+     these can be connected to aspects of an embedding application
+     (if this app is embedded in a subCanvas)."
+
+    ^ #(
+        #environmentHolder
+      ).
+
+! !
+
 !NavigatorCanvas methodsFor:'accessing'!
 
 initialOrganizerMode
@@ -6929,15 +7499,6 @@
 !NavigatorCanvas class methodsFor:'documentation'!
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/Tools_NavigatorCanvas.st,v 1.17 2011/08/07 18:41:11 vrany Exp §'
-!
-
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
-!
-
-version_SVN
-    ^ '$Id: Tools__NavigatorCanvas.st 8083 2013-01-14 11:48:37Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NavigatorCanvas.st,v 1.26 2015-02-27 00:02:09 cg Exp $'
 ! !