--- a/DebugView.st Mon Jun 02 12:12:56 2008 +0200
+++ b/DebugView.st Mon Jun 02 12:49:36 2008 +0200
@@ -35,7 +35,7 @@
!
Object subclass:#IgnoredHalt
- instanceVariableNames:'method lineNumber ignoreEndTime ignoreCount'
+ instanceVariableNames:'methodHolder method lineNumber ignoreEndTime ignoreCount'
classVariableNames:''
poolDictionaries:''
privateIn:DebugView
@@ -673,7 +673,6 @@
translateLabel: true
indication: allowBreakPointsInDebugger
)
-
(MenuItem
label: 'Ignore'
translateLabel: true
@@ -681,27 +680,27 @@
(Menu
(
(MenuItem
- enabled: isStoppedAtHaltOrBreakPoint
+ enabled: isStoppedAtHaltOrBreakPoint
label: 'For Some Time...'
itemValue: openIgnoreHaltUntilTimeElapsedDialog
translateLabel: true
+ isVisible: false
)
(MenuItem
- enabled: isStoppedAtHaltOrBreakPoint
+ enabled: isStoppedAtHaltOrBreakPoint
label: 'For the Next N Times...'
itemValue: openIgnoreHaltNTimesDialog
translateLabel: true
)
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasHaltsToIgnore
- label: 'Stop Ignoring All'
- itemValue: stopIgnoringHalts
- translateLabel: true
- )
-
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasHaltsToIgnore
+ label: 'Stop Ignoring All'
+ itemValue: stopIgnoringHalts
+ translateLabel: true
+ )
)
nil
nil
@@ -1106,7 +1105,8 @@
].
].
IgnoredHalts do:[:ign |
- (ign isForMethod:haltingMethod line:lineNrInHaltingMethod) ifTrue:[
+ (ign method isNil
+ or:[ ign isForMethod:haltingMethod line:lineNrInHaltingMethod ]) ifTrue:[
IgnoredHalts remove:ign ifAbsent:[].
].
].
@@ -6222,11 +6222,11 @@
!
method
- ^ method
+ ^ methodHolder at:1
!
method:methodArg lineNumber:lineNumberArg
- method := methodArg.
+ methodHolder := WeakArray with:methodArg.
lineNumber := lineNumberArg.
! !
@@ -6244,7 +6244,7 @@
isForMethod:aMethod line:line
line = lineNumber ifFalse:[^ false].
- method == aMethod ifFalse:[^ false].
+ (methodHolder at:1) == aMethod ifFalse:[^ false].
^ true
!
@@ -6262,7 +6262,7 @@
isHaltIgnoredInMethod:aMethod line:line
line = lineNumber ifFalse:[^ false].
- method == aMethod ifFalse:[^ false].
+ (methodHolder at:1) == aMethod ifFalse:[^ false].
^ self isHaltIgnored
! !
@@ -6270,7 +6270,7 @@
!DebugView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.435 2008-06-02 10:12:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.436 2008-06-02 10:49:36 cg Exp $'
! !
DebugView initialize!