--- a/Tools__BreakpointBrowser.st Sat Nov 03 17:16:49 2012 +0100
+++ b/Tools__BreakpointBrowser.st Sat Nov 03 17:31:18 2012 +0100
@@ -17,8 +17,9 @@
instanceVariableNames:'updatingLabelShown breakpointList shownCopyOfBreakpointList
selectionIndexHolder currentSortColumn currentSortIsReverse
showHalts showOthers showAssertions showCodeBreakpoints
- showCodeBreakpointsFor showMethodBreakpoints showDebugCode
- codeView infoHolder updateProcess showWhichHaltsHolder'
+ showCodeBreakpointsFor showMethodBreakpoints showLineBreakpoints
+ showDebugCode codeView infoHolder updateProcess
+ showWhichHaltsHolder'
classVariableNames:'MessagesAndTypes'
poolDictionaries:''
category:'Interface-Smalltalk-Breakpoints'
@@ -242,6 +243,7 @@
"Do not manually edit this!! If it is corrupted,
the MenuEditor may not be able to read the specification."
+
"
MenuEditor new openOnClass:Tools::BreakpointBrowser andSelector:#mainMenu
(Menu new fromLiteralArrayEncoding:(Tools::BreakpointBrowser mainMenu)) startUp
@@ -254,14 +256,12 @@
(
(MenuItem
label: 'File'
- translateLabel: true
submenu:
(Menu
(
(MenuItem
label: 'Exit'
itemValue: closeRequest
- translateLabel: true
)
)
nil
@@ -270,7 +270,6 @@
)
(MenuItem
label: 'Selection'
- translateLabel: true
submenu:
(Menu
(
@@ -278,7 +277,6 @@
enabled: hasSelectionHolder
label: 'Browse'
itemValue: browseSelectedItem
- translateLabel: true
)
)
nil
@@ -287,14 +285,12 @@
)
(MenuItem
label: 'View'
- translateLabel: true
submenu:
(Menu
(
(MenuItem
label: 'Update List'
itemValue: updateList
- translateLabel: true
)
(MenuItem
label: '-'
@@ -302,42 +298,36 @@
(MenuItem
label: 'Assertions'
itemValue: showAssertions:
- translateLabel: true
hideMenuOnActivated: false
indication: showAssertions
)
(MenuItem
label: 'Halts'
itemValue: showHalts:
- translateLabel: true
hideMenuOnActivated: false
indication: showHalts
)
(MenuItem
enabled: showHalts
label: ' '
- translateLabel: true
submenu:
(Menu
(
(MenuItem
label: 'All Halts'
nameKey: AllHalts
- translateLabel: true
choice: showWhichHaltsHolder
choiceValue: all
)
(MenuItem
label: 'Enabled Halts'
nameKey: EnabledHalts
- translateLabel: true
choice: showWhichHaltsHolder
choiceValue: enabled
)
(MenuItem
label: 'Ignored Halts'
nameKey: IgnoredHalts
- translateLabel: true
choice: showWhichHaltsHolder
choiceValue: ignored
)
@@ -347,29 +337,25 @@
)
)
(MenuItem
- label: 'Code Breakpoints'
+ label: 'Coded Breakpoints'
itemValue: showCodeBreakpoints:
- translateLabel: true
hideMenuOnActivated: false
indication: showCodeBreakpoints
)
(MenuItem
enabled: showCodeBreakpoints
label: ' '
- translateLabel: true
submenuChannel: codeBreakpointMenu
)
(MenuItem
label: 'Debug Code'
itemValue: showDebugCode:
- translateLabel: true
hideMenuOnActivated: false
indication: showDebugCode
)
(MenuItem
label: 'Other Debug Messages'
itemValue: showOthers:
- translateLabel: true
hideMenuOnActivated: false
indication: showOthers
)
@@ -379,10 +365,15 @@
(MenuItem
label: 'Method Breakpoints'
itemValue: showMethodBreakpoints:
- translateLabel: true
hideMenuOnActivated: false
indication: showMethodBreakpoints
)
+ (MenuItem
+ label: 'Line Breakpoints'
+ itemValue: showLineBreakpoints:
+ hideMenuOnActivated: false
+ indication: showLineBreakpoints
+ )
)
nil
nil
@@ -390,21 +381,18 @@
)
(MenuItem
label: 'Enable'
- translateLabel: true
submenu:
(Menu
(
(MenuItem
label: 'Assertions'
itemValue: enableAssertions:
- translateLabel: true
hideMenuOnActivated: false
indication: enableAssertions
)
(MenuItem
label: 'Halts'
itemValue: enableHalts:
- translateLabel: true
hideMenuOnActivated: false
indication: enableHalts
)
@@ -413,7 +401,6 @@
)
(MenuItem
label: 'Code Breakpoints'
- translateLabel: true
submenuChannel: enabledCodeBreakpointMenu
)
)
@@ -423,7 +410,6 @@
)
(MenuItem
label: 'Help'
- translateLabel: true
startGroup: right
submenu:
(Menu
@@ -431,7 +417,6 @@
(MenuItem
label: 'Documentation'
itemValue: openDocumentation
- translateLabel: true
)
(MenuItem
label: '-'
@@ -439,7 +424,6 @@
(MenuItem
label: 'About this Application...'
itemValue: openAboutThisApplication
- translateLabel: true
)
)
nil
@@ -903,6 +887,15 @@
self updateShownBreakpointList
!
+showLineBreakpoints
+ ^ showLineBreakpoints ? true
+!
+
+showLineBreakpoints:aBoolean
+ showLineBreakpoints := aBoolean.
+ self updateShownBreakpointList
+!
+
showMethodBreakpoints
^ showMethodBreakpoints ? true
!
@@ -964,6 +957,9 @@
self showMethodBreakpoints ifFalse:[
newList := newList reject:[:entry | entry isMethodBreakpoint].
].
+ self showLineBreakpoints ifFalse:[
+ newList := newList reject:[:entry | entry isLineBreakpoint].
+ ].
self showAssertions ifFalse:[
newList := newList reject:[:entry | entry isAssertion].
].
@@ -1208,10 +1204,11 @@
aBlock value:entry
].
- (mthd literalsDetect:[:lit |messageSelectors includes:lit] ifNone:nil) notNil ifTrue:[
- messagesSent isNil ifTrue:[
- messagesSent := mthd messagesSent.
- ].
+ (mthd literalsDetect:[:lit |
+ (messageSelectors includes:lit)
+ or:[lit class == Breakpoint]
+ ] ifNone:nil) notNil ifTrue:[
+ messagesSent := mthd messagesSent.
messages pairsDo:[:bpSel :type|
|tree extractor|
@@ -1271,6 +1268,21 @@
]
].
].
+
+ mthd literalsDo:[:lit |
+ lit class == Breakpoint ifTrue:[
+ entry := BreakpointListEntry new.
+ entry
+ type:#line
+ arg:nil
+ className:cls name
+ selector:sel
+ lineNumber:(lit line)
+ info:nil
+ enabled:true.
+ aBlock value:entry
+ ]
+ ].
].
! !
@@ -1696,6 +1708,10 @@
^ type == #halt
!
+isLineBreakpoint
+ ^ type == #line
+!
+
isMethodBreakpoint
^ type == #wrap
!
@@ -1767,11 +1783,11 @@
!BreakpointBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.29 2012-09-09 18:49:45 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.30 2012-11-03 16:31:18 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.29 2012-09-09 18:49:45 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.30 2012-11-03 16:31:18 cg Exp $'
! !
BreakpointBrowser initialize!