changed: #selectorMenuMoveToProtocol
authorClaus Gittinger <cg@exept.de>
Sat, 16 Apr 2011 13:38:43 +0200
changeset 9818 125d044d2be0
parent 9817 8d933c75defc
child 9819 2edda6ff0600
changed: #selectorMenuMoveToProtocol
NewSystemBrowser.st
Tools__NewSystemBrowser.st
--- a/NewSystemBrowser.st	Thu Apr 14 11:04:57 2011 +0200
+++ b/NewSystemBrowser.st	Sat Apr 16 13:38:43 2011 +0200
@@ -14,35 +14,35 @@
 "{ NameSpace: Tools }"
 
 SystemBrowser subclass:#NewSystemBrowser
-        instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
-                bufferUsageOrder browserCanvas immediateUpdate showClassPackages
-                lastMethodCategory lastMethodMoveClass browserCanvasType
-                syntaxColoringProcessRunning syntaxColoringProcess
-                methodInfoProcess'
-        classVariableNames:'LastNewProtocols LastProtocolRenames LastCategoryRenames
-                LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
-                LastNameSpaceMove LastMethodMoveOrCopyTargetClass
-                LastSearchPatterns LastClassFilterBlockString
-                LastMethodFilterBlockString LastBreakPointConditionString
-                LastIndividualChecks LastAcceptPackage LastVariableRenames
-                LastVisitorClassName LastTemporaryVariableName BookMarks
-                FindHistory CheckForInstancesWhenRemovingClasses
-                SynchronousUpdate DoubleClickIsOpenBrowser
-                ShowMethodTemplateWhenProtocolIsSelected
-                DefaultShowMethodTemplate DefaultShowMethodInheritance
-                DefaultEmphasizeUnloadedClasses DefaultImmediateSyntaxColoring
-                DefaultImmediateExplaining DefaultSyntaxColoring
-                DefaultToolBarVisible DefaultCodeInfoVisible
-                DefaultShortNameInTabs DefaultHideUnloadedClasses
-                DefaultMarkApplications DefaultAutoFormat
-                DefaultShowMethodComplexity DefaultShowMethodTypeIcon
-                DefaultShowSpecialResourceEditors SharedMethodCategoryCache
-                LastMethodProcessingBlockString LastLoadedPackages
-                DefaultShortAllClassesInNameSpaceOrganisation LastTag
-                LastBaseVersionTag DefaultShowPseudoProtocols
-                DefaultShowMultitabMode LastRenamedOld LastRenamedNew'
-        poolDictionaries:''
-        category:'Interface-Browsers-New'
+	instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
+		bufferUsageOrder browserCanvas immediateUpdate showClassPackages
+		lastMethodCategory lastMethodMoveClass browserCanvasType
+		syntaxColoringProcessRunning syntaxColoringProcess
+		methodInfoProcess'
+	classVariableNames:'LastNewProtocols LastProtocolRenames LastCategoryRenames
+		LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
+		LastNameSpaceMove LastMethodMoveOrCopyTargetClass
+		LastSearchPatterns LastClassFilterBlockString
+		LastMethodFilterBlockString LastBreakPointConditionString
+		LastIndividualChecks LastAcceptPackage LastVariableRenames
+		LastVisitorClassName LastTemporaryVariableName BookMarks
+		FindHistory CheckForInstancesWhenRemovingClasses
+		SynchronousUpdate DoubleClickIsOpenBrowser
+		ShowMethodTemplateWhenProtocolIsSelected
+		DefaultShowMethodTemplate DefaultShowMethodInheritance
+		DefaultEmphasizeUnloadedClasses DefaultImmediateSyntaxColoring
+		DefaultImmediateExplaining DefaultSyntaxColoring
+		DefaultToolBarVisible DefaultCodeInfoVisible
+		DefaultShortNameInTabs DefaultHideUnloadedClasses
+		DefaultMarkApplications DefaultAutoFormat
+		DefaultShowMethodComplexity DefaultShowMethodTypeIcon
+		DefaultShowSpecialResourceEditors SharedMethodCategoryCache
+		LastMethodProcessingBlockString LastLoadedPackages
+		DefaultShortAllClassesInNameSpaceOrganisation LastTag
+		LastBaseVersionTag DefaultShowPseudoProtocols
+		DefaultShowMultitabMode LastRenamedOld LastRenamedNew'
+	poolDictionaries:''
+	category:'Interface-Browsers-New'
 !
 
 !NewSystemBrowser class methodsFor:'documentation'!
@@ -11415,7 +11415,6 @@
     "Created: / 18.2.2000 / 11:58:25 / cg"
 ! !
 
-
 !NewSystemBrowser class methodsFor:'menu specs-toolbar'!
 
 toolBarMenu
@@ -33304,11 +33303,12 @@
             methodSelection 
                 conform:[:eachMethod |
                     |tree|
+
                     tree := RBParser 
                              parseSearchMethod:(eachMethod source) 
                              onError: [:str :pos | nil].
 
-                    searcher executeTree:tree initialAnswer:false.   
+                    tree notNil and:[ searcher executeTree:tree initialAnswer:false ].   
                 ].
         allGettersOrSetters ifTrue:[
             someCategories add:'accessing'.
@@ -33325,7 +33325,7 @@
                              parseSearchMethod:(eachMethod source) 
                              onError: [:str :pos | nil].
 
-                    searcher executeTree:tree initialAnswer:false.   
+                    tree notNil and:[ searcher executeTree:tree initialAnswer:false ].   
                 ].
         allReturnTrueOrFalse ifTrue:[
             someCategories add:'testing'.
@@ -33387,7 +33387,7 @@
 
     self moveMethods:methodSelection toProtocol:newCategory
 
-    "Modified: / 31-03-2011 / 11:25:55 / cg"
+    "Modified: / 16-04-2011 / 13:28:50 / cg"
 !
 
 selectorMenuNewImageSpec
@@ -34848,8 +34848,6 @@
     "Modified: / 1.3.2000 / 21:03:34 / cg"
 ! !
 
-
-
 !NewSystemBrowser methodsFor:'menu actions-variables'!
 
 browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
@@ -45185,11 +45183,11 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.1525 2011-04-14 09:04:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.1526 2011-04-16 11:38:43 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.1525 2011-04-14 09:04:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.1526 2011-04-16 11:38:43 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!
--- a/Tools__NewSystemBrowser.st	Thu Apr 14 11:04:57 2011 +0200
+++ b/Tools__NewSystemBrowser.st	Sat Apr 16 13:38:43 2011 +0200
@@ -14,35 +14,35 @@
 "{ NameSpace: Tools }"
 
 SystemBrowser subclass:#NewSystemBrowser
-        instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
-                bufferUsageOrder browserCanvas immediateUpdate showClassPackages
-                lastMethodCategory lastMethodMoveClass browserCanvasType
-                syntaxColoringProcessRunning syntaxColoringProcess
-                methodInfoProcess'
-        classVariableNames:'LastNewProtocols LastProtocolRenames LastCategoryRenames
-                LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
-                LastNameSpaceMove LastMethodMoveOrCopyTargetClass
-                LastSearchPatterns LastClassFilterBlockString
-                LastMethodFilterBlockString LastBreakPointConditionString
-                LastIndividualChecks LastAcceptPackage LastVariableRenames
-                LastVisitorClassName LastTemporaryVariableName BookMarks
-                FindHistory CheckForInstancesWhenRemovingClasses
-                SynchronousUpdate DoubleClickIsOpenBrowser
-                ShowMethodTemplateWhenProtocolIsSelected
-                DefaultShowMethodTemplate DefaultShowMethodInheritance
-                DefaultEmphasizeUnloadedClasses DefaultImmediateSyntaxColoring
-                DefaultImmediateExplaining DefaultSyntaxColoring
-                DefaultToolBarVisible DefaultCodeInfoVisible
-                DefaultShortNameInTabs DefaultHideUnloadedClasses
-                DefaultMarkApplications DefaultAutoFormat
-                DefaultShowMethodComplexity DefaultShowMethodTypeIcon
-                DefaultShowSpecialResourceEditors SharedMethodCategoryCache
-                LastMethodProcessingBlockString LastLoadedPackages
-                DefaultShortAllClassesInNameSpaceOrganisation LastTag
-                LastBaseVersionTag DefaultShowPseudoProtocols
-                DefaultShowMultitabMode LastRenamedOld LastRenamedNew'
-        poolDictionaries:''
-        category:'Interface-Browsers-New'
+	instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
+		bufferUsageOrder browserCanvas immediateUpdate showClassPackages
+		lastMethodCategory lastMethodMoveClass browserCanvasType
+		syntaxColoringProcessRunning syntaxColoringProcess
+		methodInfoProcess'
+	classVariableNames:'LastNewProtocols LastProtocolRenames LastCategoryRenames
+		LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
+		LastNameSpaceMove LastMethodMoveOrCopyTargetClass
+		LastSearchPatterns LastClassFilterBlockString
+		LastMethodFilterBlockString LastBreakPointConditionString
+		LastIndividualChecks LastAcceptPackage LastVariableRenames
+		LastVisitorClassName LastTemporaryVariableName BookMarks
+		FindHistory CheckForInstancesWhenRemovingClasses
+		SynchronousUpdate DoubleClickIsOpenBrowser
+		ShowMethodTemplateWhenProtocolIsSelected
+		DefaultShowMethodTemplate DefaultShowMethodInheritance
+		DefaultEmphasizeUnloadedClasses DefaultImmediateSyntaxColoring
+		DefaultImmediateExplaining DefaultSyntaxColoring
+		DefaultToolBarVisible DefaultCodeInfoVisible
+		DefaultShortNameInTabs DefaultHideUnloadedClasses
+		DefaultMarkApplications DefaultAutoFormat
+		DefaultShowMethodComplexity DefaultShowMethodTypeIcon
+		DefaultShowSpecialResourceEditors SharedMethodCategoryCache
+		LastMethodProcessingBlockString LastLoadedPackages
+		DefaultShortAllClassesInNameSpaceOrganisation LastTag
+		LastBaseVersionTag DefaultShowPseudoProtocols
+		DefaultShowMultitabMode LastRenamedOld LastRenamedNew'
+	poolDictionaries:''
+	category:'Interface-Browsers-New'
 !
 
 !NewSystemBrowser class methodsFor:'documentation'!
@@ -11415,7 +11415,6 @@
     "Created: / 18.2.2000 / 11:58:25 / cg"
 ! !
 
-
 !NewSystemBrowser class methodsFor:'menu specs-toolbar'!
 
 toolBarMenu
@@ -33304,11 +33303,12 @@
             methodSelection 
                 conform:[:eachMethod |
                     |tree|
+
                     tree := RBParser 
                              parseSearchMethod:(eachMethod source) 
                              onError: [:str :pos | nil].
 
-                    searcher executeTree:tree initialAnswer:false.   
+                    tree notNil and:[ searcher executeTree:tree initialAnswer:false ].   
                 ].
         allGettersOrSetters ifTrue:[
             someCategories add:'accessing'.
@@ -33325,7 +33325,7 @@
                              parseSearchMethod:(eachMethod source) 
                              onError: [:str :pos | nil].
 
-                    searcher executeTree:tree initialAnswer:false.   
+                    tree notNil and:[ searcher executeTree:tree initialAnswer:false ].   
                 ].
         allReturnTrueOrFalse ifTrue:[
             someCategories add:'testing'.
@@ -33387,7 +33387,7 @@
 
     self moveMethods:methodSelection toProtocol:newCategory
 
-    "Modified: / 31-03-2011 / 11:25:55 / cg"
+    "Modified: / 16-04-2011 / 13:28:50 / cg"
 !
 
 selectorMenuNewImageSpec
@@ -34848,8 +34848,6 @@
     "Modified: / 1.3.2000 / 21:03:34 / cg"
 ! !
 
-
-
 !NewSystemBrowser methodsFor:'menu actions-variables'!
 
 browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
@@ -45185,11 +45183,11 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1525 2011-04-14 09:04:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1526 2011-04-16 11:38:43 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1525 2011-04-14 09:04:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1526 2011-04-16 11:38:43 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!