hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:27c2f7b1baa4
+:0766dc3e8079
 	instanceVariableNames:'updatingLabelShown breakpointList shownCopyOfBreakpointList
 		selectionIndexHolder currentSortColumn currentSortIsReverse
 		showHalts showOthers showAssertions showAssertionsInTests
 		showCodeBreakpoints showCodeBreakpointsFor showMethodBreakpoints
 		showLineBreakpoints showDebugCode codeView infoHolder
-		updateProcess showWhichHaltsHolder'
+		updateProcess showWhichHaltsHolder packageFilter classNameFilter'
 	classVariableNames:'MessagesAndTypes'
 	poolDictionaries:''
-	category:'Interface-Smalltalk-Breakpoints'
+	category:'Interface-Debugger'
 !
 Object subclass:#BreakpointListEntry
 	instanceVariableNames:'type ignoredInfo arg className selector lineNumber info enabled'
 	classVariableNames:''
 nil
 nil
 )
 )
 (MenuItem
+label: 'Filter'
+submenu:
+(Menu
+(
+(MenuItem
+label: 'Package Filter...'
+itemValue: openPackageFilterDialog
+)
+(MenuItem
+label: 'Class Filter...'
+itemValue: openClassFilterDialog
+)
+)
+nil
+nil
+)
+)
+(MenuItem
 label: 'Enable'
 submenu:
 (Menu
 (
 (MenuItem
 labelActionArgument: 'selector'
 width: 200
 model: selector
 canSelect: false
 )
-"/      (DataSetColumnSpec
+(DataSetColumnSpec
-"/         label: 'Line'
+label: 'Ign'
-"/         labelAlignment: left
+labelButtonType: Button
-"/         activeHelpKey: ''
+columnAlignment: center
-"/         activeHelpKeyForLabel: ''
+width: 50
-"/         labelButtonType: Button
+model: isIgnored
-"/         labelActionSelector: sortBy:
+menuFromApplication: false
-"/         labelActionArgument: 'lineNumber'
+)
-"/         width: 35
-"/         model: lineNumber
-"/         canSelect: false
-"/       )
 (DataSetColumnSpec
 label: 'Info'
 labelAlignment: left
 activeHelpKey: ''
 activeHelpKeyForLabel: ''
 labelActionArgument: 'info'
 model: info
 canSelect: false
 )
 )
 !
 tableColumns_v1
 "This resource specification was automatically generated
 by the DataSetBuilder of ST/X."
 |newList showWhichHalt|
 newList := breakpointList.
+classNameFilter notEmptyOrNil ifTrue:[
+newList := newList select:[:entry | entry relatedToClass:classNameFilter].
+].
+packageFilter notEmptyOrNil ifTrue:[
+newList := newList select:[:entry | entry relatedToPackage:packageFilter].
+].
 self showOthers ifFalse:[
 newList := newList reject:[:entry | entry isOther].
 ].
 self showDebugCode ifFalse:[
 newList := newList reject:[:entry | entry isDebugCode].
 self assert:(3 > 4)
 !
 aMethodWith_assert2
-"only here for demonstration purposes - should be found in the list"
+"only here for demonstration purposes - should be found in the breakpoint browser''s list"
 self assert:(3 > 4) message:'well - that ought to work'
 !
 aMethodWith_breakPoint
-"only here for demonstration purposes - should be found in the list"
+"only here for demonstration purposes - should be found in the breakpoint browser''s list"
 self breakPoint:#cg
 !
 aMethodWith_breakPoint2
-"only here for demonstration purposes - should be found in the list"
+"only here for demonstration purposes - should be found in the breakpoint browser''s list"
 self breakPoint:#cg info:'hello there'
 !
 aMethodWith_debugCode
-"only here for demonstration purposes - should be found in the list"
+"only here for demonstration purposes - should be found in the breakpoint browser''s list"
 self
 debuggingCodeFor:#cg
 is:[
 self bla.
 Transcript show:'some debug prints here'
 ].
 !
 aMethodWith_halt
-"only here for demonstration purposes - should be found in the list"
+"only here for demonstration purposes - should be found in the breakpoint browser''s list"
 self halt
 "after the first halt, in the debugger, ignore this halt for some time and see what
 the breakpoint browser shows...
 ].
 "
 !
 aMethodWith_halt2
-"only here for demonstration purposes - should be found in the list"
+"only here for demonstration purposes - should be found in the breakpoint browser''s list"
 self halt:'some message'
 !
 aMethodWith_todo
-"only here for demonstration purposes - should be found in the list"
+"only here for demonstration purposes - should be found in the breakpoint browser''s list"
 self todo
 ! !
 !BreakpointBrowser methodsFor:'user actions'!
 "Created: / 22-10-2006 / 01:49:13 / cg"
 "Modified: / 18-02-2007 / 12:56:30 / cg"
 !
+openClassFilterDialog
+|nameOrPattern|
+nameOrPattern := Dialog
+requestClassName:'Only show breakpoints for class(es) matching (empty to show all):'
+initialAnswer:(classNameFilter ? '*').
+nameOrPattern isNil ifTrue:[^ self].    "/ cancel
+(nameOrPattern isEmpty or:[nameOrPattern = '*']) ifTrue:[
+classNameFilter := nil.
+] ifFalse:[
+classNameFilter := nameOrPattern.
+].
+self updateShownBreakpointList
+!
 openDocumentation
 HTMLDocumentView openFullOnDocumentationFile:'tools/misc/TOP.html#BREAKPOINTLIST'.
+!
+openPackageFilterDialog
+|nameOrPattern|
+nameOrPattern := Dialog
+request:'Only show breakpoints for code in package(s) matching (empty to show all):'
+list:(Smalltalk allProjectIDs)
+initialAnswer:(packageFilter ? '*').
+nameOrPattern isNil ifTrue:[^ self].    "/ cancel
+(nameOrPattern isEmpty or:[nameOrPattern = '*']) ifTrue:[
+packageFilter := nil.
+] ifFalse:[
+packageFilter := nameOrPattern.
+].
+self updateShownBreakpointList
 !
 resort
 |sortBlock sortBlock1|
 info
 ^ ignoredInfo ? info
 !
+isIgnored
+type == #halt ifTrue:[
+(Debugger haltIgnoreInformationFor:self method atLineNr:lineNumber)
+notNil ifTrue:[^ 'Yes'].
+].
+^ ''
+!
 lineNumber
 ^ lineNumber
 !
 selector
 !
 method
 ^ (Smalltalk classNamed:className) compiledMethodAt:selector.
+! !
+!BreakpointBrowser::BreakpointListEntry methodsFor:'queries'!
+relatedToClass:aClassNamePattern
+className isNil ifTrue:[^ true].
+(aClassNamePattern includesMatchCharacters) ifTrue:[
+^ aClassNamePattern match: className
+].
+^ className startsWith:aClassNamePattern
+!
+relatedToPackage:aPackagePattern
+|package|
+package := self method package.
+(aPackagePattern includesMatchCharacters) ifTrue:[
+^ aPackagePattern match: package
+].
+^ package startsWith:aPackagePattern
 ! !
 !BreakpointBrowser::BreakpointListEntry methodsFor:'testing'!
 isAssertion
 ! !
 !BreakpointBrowser class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.40 2013-03-26 00:43:36 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.41 2013-03-28 15:00:28 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.40 2013-03-26 00:43:36 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.41 2013-03-28 15:00:28 cg Exp $'
 ! !
 BreakpointBrowser initialize!

changeset 12561	0766dc3e8079
parent 12526	dc89c5a91cfc
child 12563	a59337482755