--- a/Tools__BreakpointBrowser.st	Thu Aug 22 17:36:19 2013 +0200
+++ b/Tools__BreakpointBrowser.st	Thu Aug 22 21:04:08 2013 +0200
@@ -18,8 +18,9 @@
 		selectionIndexHolder currentSortColumn currentSortIsReverse
 		showHalts showOthers showAssertions showAssertionsInTests
 		showCodeBreakpoints showCodeBreakpointsFor showMethodBreakpoints
-		showLineBreakpoints showDebugCode codeView infoHolder
-		updateProcess showWhichHaltsHolder packageFilter classNameFilter'
+		showLineBreakpoints showDebugCode showTracepoints codeView
+		infoHolder updateProcess showWhichHaltsHolder packageFilter
+		classNameFilter'
 	classVariableNames:'MessagesAndTypes'
 	poolDictionaries:''
 	category:'Interface-Debugger'
@@ -87,6 +88,8 @@
         (#assert:message:       #assertion)
         (#todo                  #todo)
         (#todo:                 #todo)
+        (#tracePoint:           #tracepoint)
+        (#tracePoint:message:   #tracepoint)
     ).
 !
 
@@ -382,6 +385,12 @@
                   indication: showDebugCode
                 )
                (MenuItem
+                  label: 'Tracepoints'
+                  itemValue: showTracepoints:
+                  hideMenuOnActivated: false
+                  indication: showTracepoints
+                )
+               (MenuItem
                   label: 'Other Debug Messages'
                   itemValue: showOthers:
                   hideMenuOnActivated: false
@@ -1004,6 +1013,15 @@
     self updateShownBreakpointList
 !
 
+showTracepoints
+    ^ showTracepoints ? true
+!
+
+showTracepoints:aBoolean
+    showTracepoints := aBoolean.
+    self updateShownBreakpointList
+!
+
 showWhichHaltsHolder
     showWhichHaltsHolder isNil ifTrue:[
         showWhichHaltsHolder := #all asValue.
@@ -1057,6 +1075,9 @@
     self showLineBreakpoints ifFalse:[
         newList := newList reject:[:entry | entry isLineBreakpoint].
     ].
+    self showTracepoints ifFalse:[
+        newList := newList reject:[:entry | entry isTracepoint].
+    ].
     self showAssertions ifFalse:[
         newList := newList reject:[:entry | entry isAssertion].
     ] ifTrue:[
@@ -1324,7 +1345,6 @@
             "/ to fetch all message selectors. This should be done only once,
             "/ and not for every selector we look for)
             (messagesSent includesIdentical:bpSel) ifTrue:[
-
                 tree := RBParser 
                     parseMethod:mthd source
                     onError:[:aString :pos | 
@@ -1755,6 +1775,7 @@
     self showLineBreakpoints:aBoolean.
     self showMethodBreakpoints:aBoolean.
     self showOthers:aBoolean.
+    self showTracepoints:aBoolean.
 !
 
 showAllTypes
@@ -1799,6 +1820,7 @@
     self showLineBreakpoints:(self showLineBreakpoints not).
     self showMethodBreakpoints:(self showMethodBreakpoints not).
     self showOthers:(self showOthers not).
+    self showTracepoints:(self showTracepoints not).
 ! !
 
 !BreakpointBrowser::BreakpointListEntry methodsFor:'accessing'!
@@ -1942,6 +1964,10 @@
 
 isTodo
     ^ type == #todo
+!
+
+isTracepoint
+    ^ type == #tracepoint
 ! !
 
 !BreakpointBrowser::BreakpointListEntryForLineBreak methodsFor:'accessing'!
@@ -2005,6 +2031,13 @@
         selectorToSearch == #debuggingCodeFor:is: ifTrue:[
             argument := arg1.
         ].
+        selectorToSearch == #tracePoint: ifTrue:[
+            argument := arg1.
+        ].
+        selectorToSearch == #tracePoint:info: ifTrue:[
+            argument := arg1.
+            infoMessage := arg2.
+        ].
         selectorToSearch == #assert: ifTrue:[
         ].
         selectorToSearch == #assert:message: ifTrue:[
@@ -2022,11 +2055,11 @@
 !BreakpointBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.48 2013-06-21 00:18:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.49 2013-08-22 19:04:08 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.48 2013-06-21 00:18:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.49 2013-08-22 19:04:08 cg Exp $'
 ! !