diff -r bf7dcbf92471 -r d3eb41797a99 Tools_NavigatorCanvas.st
--- a/Tools_NavigatorCanvas.st	Sun Aug 07 20:40:45 2011 +0200
+++ b/Tools_NavigatorCanvas.st	Sun Aug 07 20:41:11 2011 +0200
@@ -4077,156 +4077,15 @@
         component: 
        (SpecCollection
           collection: (
-           (VariableHorizontalPanelSpec
-              name: 'Lists'
+           (SubCanvasSpec
+              name: 'ProtocolAndMethodListCanvas'
               layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-              barWidth: 2
-              showHandle: false
-              component: 
-             (SpecCollection
-                collection: (
-                 (SubCanvasSpec
-                    name: 'MethodCategoryList'
-                    majorKey: MethodCategoryList
-                    subAspectHolders: 
-                   (Array
-                      
-                     #(#SubChannelInfoSpec
-                        #subAspect: #showCoverageInformation
-                        #aspect: #showCoverageInformation
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: showPseudoProtocols
-                        aspect: showPseudoProtocols
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: immediateUpdate
-                        aspect: immediateUpdate
-                      )
-                      
-                     (SubChannelInfoSpec
-                        subAspect: inGeneratorHolder
-                        aspect: protocolListGenerator
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: doubleClickChannel
-                        callBack: protocolDoubleClicked
-                      )
-                      
-                     (SubChannelInfoSpec
-                        subAspect: menuHolder
-                        aspect: protocolMenu
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: outGeneratorHolder
-                        aspect: selectorListGenerator
-                      )
-                      
-                     (SubChannelInfoSpec
-                        subAspect: 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: #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: 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: showMethodTypeIcon
-                        aspect: showMethodTypeIcon
-                      ) 
-                     (SubChannelInfoSpec
-                        subAspect: filterClassVars
-                        aspect: filterClassVars
-                      )
-                    )
-                    createNewApplication: true
-                    createNewBuilder: true
-                  )
-                 )
-               
-              )
-              handles: (Any 0.5 1.0)
+              hasHorizontalScrollBar: false
+              hasVerticalScrollBar: false
+              majorKey: #'Tools::NavigatorCanvas'
+              minorKey: #'protocolAndMethodListSpec_Both'
+              specHolder: organizerProtocolAndMethodListSpecHolder
+              createNewBuilder: false
             )
            (SubCanvasSpec
               name: 'TestRunnerEmbedded'
@@ -4255,6 +4114,7 @@
                   subAspect: selectedProtocolsHolder
                   aspect: selectedProtocols
                 )
+                
                (SubChannelInfoSpec
                   subAspect: infoHolder
                   aspect: infoLabelHolder
@@ -4267,8 +4127,6 @@
          
         )
       )
-
-    "Modified: / 20-07-2011 / 14:40:10 / cg"
 !
 
 selectorBrowserSpec
@@ -6976,5 +6834,5 @@
 !NavigatorCanvas class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigatorCanvas.st,v 1.16 2011-07-20 12:52:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigatorCanvas.st,v 1.17 2011-08-07 18:41:11 vrany Exp $'
 ! !