--- a/NewSystemBrowser.st	Tue Apr 27 14:26:22 2010 +0200
+++ b/NewSystemBrowser.st	Tue Apr 27 14:27:00 2010 +0200
@@ -5119,16 +5119,18 @@
             showBusyCursorWhilePerforming: true
           )
          (MenuItem
-            enabled: hasClassSelectedAndInstrumentingCompilerExistsHolder
+            enabled: hasClassSelectedAndInstrumentingCompilerExistsAndOOMPackageLoadedHolder
             label: 'Call Graph'
-            itemValue: debugMenuOpenCallGraph
-            translateLabel: true
-            showBusyCursorWhilePerforming: true
-          )
-         )
-        nil
-        nil
-      )
+            itemValue: debugMenuOpenCallGraphForClasses
+            translateLabel: true
+            showBusyCursorWhilePerforming: true
+          )
+         )
+        nil
+        nil
+      )
+
+    "Modified: / 27-04-2010 / 14:06:28 / cg"
 !
 
 classGenerateMenu
@@ -7558,6 +7560,46 @@
       )
 !
 
+projectDebugMenu
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+    "
+     MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#classDebugMenu
+     (Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser classDebugMenu)) startUp
+    "
+
+    <resource: #menu>
+
+    ^ 
+     #(Menu
+        (
+         (MenuItem
+            enabled: hasProjectSelectedAndInstrumentingCompilerExistsHolder
+            label: 'Recompile all Methods with Instrumentation'
+            itemValue: projectMenuRecompileInstrumented
+            translateLabel: true
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            enabled: hasProjectSelectedAndInstrumentingCompilerExistsAndOOMPackageLoadedHolder
+            label: 'Call Graph'
+            itemValue: debugMenuOpenCallGraphForProjects
+            translateLabel: true
+            showBusyCursorWhilePerforming: true
+          )
+         )
+        nil
+        nil
+      )
+
+    "Created: / 27-04-2010 / 12:41:02 / cg"
+    "Modified: / 27-04-2010 / 14:06:33 / cg"
+!
+
 projectMenu
     "This resource specification was automatically generated
      by the MenuEditor of ST/X."
@@ -7821,17 +7863,26 @@
                   itemValue: projectMenuRegenerateProjectContentsDefinitions
                   translateLabel: true
                 )
-               )
-              nil
-              nil
-            )
-          )
-         (MenuItem
-            enabled: hasSingleRealProjectSelectedHolder
-            label: 'Build Binaries for Deployment'
-            itemValue: projectMenuBuild
-            translateLabel: true
-            showBusyCursorWhilePerforming: true
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  enabled: hasSingleRealProjectSelectedHolder
+                  label: 'Build Binaries for Deployment'
+                  itemValue: projectMenuBuild
+                  translateLabel: true
+                  showBusyCursorWhilePerforming: true
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
+            label: 'Debug'
+            translateLabel: true
+            submenuChannel: projectDebugMenu
+            keepLinkedMenu: true
           )
          (MenuItem
             label: 'Special'
@@ -7873,6 +7924,8 @@
         nil
         nil
       )
+
+    "Modified: / 27-04-2010 / 12:42:43 / cg"
 !
 
 projectMenuCVS
@@ -13409,6 +13462,14 @@
     "Created: / 4.2.2000 / 22:02:53 / cg"
 !
 
+hasClassSelectedAndInstrumentingCompilerExistsAndOOMPackageLoadedHolder
+    ^ [ self hasClassSelectedAndInstrumentingCompilerExistsHolder value 
+        and:[ OOM::MetricVisualizer notNil ] 
+      ]
+
+    "Created: / 27-04-2010 / 12:33:41 / cg"
+!
+
 hasClassSelectedAndInstrumentingCompilerExistsHolder
     ^ [ self hasClassSelected and:[ self instrumentingCompilerExists] ]
 
@@ -14362,12 +14423,13 @@
 hasSharedPoolClassSelected
     ^ self hasClassSelected
       and:[self selectedClasses value
-                contains:[:cls |
+                contains:[:cls |    
                         cls isLoaded 
                         and:[cls theNonMetaclass isAbstract not
                         and:[ cls inheritsFrom:SharedPool ]]] ]
 
     "Created: / 25-10-2006 / 09:23:07 / cg"
+    "Modified: / 27-04-2010 / 13:01:57 / cg"
 !
 
 hasSharedPoolClassSelectedHolder
@@ -26387,15 +26449,35 @@
     "Modified: / 2.2.1998 / 12:39:38 / stefan"
 !
 
-debugMenuOpenCallGraph
+debugMenuOpenCallGraphForClasses
+    "open an OOM CallGraph view on the selected class(es)"
+
+    self debugMenuOpenCallGraphForClasses:(self selectedClasses value).
+
+    "Created: / 27-04-2010 / 14:07:58 / cg"
+!
+
+debugMenuOpenCallGraphForClasses:classes
     "open an OOM CallGraph view on the selected class(es)"
 
-    |classes methods callingMethods allMethods|
-
-    classes := self selectedClasses value.
+    |methods|
+
     methods := classes collectAll:[:cls | cls instAndClassMethods].
-
-    "/ classes of all callers
+    self debugMenuOpenCallGraphForMethods:methods.
+
+    "Created: / 27-04-2010 / 14:09:29 / cg"
+!
+
+debugMenuOpenCallGraphForMethods:methods
+    "open an OOM CallGraph view on the selected class(es)"
+
+    |callingMethods allMethods|
+
+    OOM::MetricVisualizer isNil ifTrue:[
+        Dialog information:'Missing class: OOM::MetricVisualizer'.
+        ^ self.
+    ].
+
     callingMethods := Set new.
     methods 
         do:[:eachMethod |
@@ -26413,7 +26495,7 @@
         "/ dont do primitives...
         caller hasPrimitiveCode ifFalse:[
             caller mclass notNil ifTrue:[
-                (InstrumentingCompiler isInstrumented:caller) ifFalse:[
+                caller isInstrumented ifFalse:[
                     InstrumentingCompiler compileMethod:caller
                 ].                                              
             ]
@@ -26426,6 +26508,16 @@
     OOM::MetricVisualizer 
         openViewerOnDiagramForMethods:allMethods 
         setupWith:[:viewer | viewer set_DynamicMethodInvocationDiagram]
+
+    "Created: / 27-04-2010 / 14:07:07 / cg"
+!
+
+debugMenuOpenCallGraphForProjects
+    "open an OOM CallGraph view on the selected project(s) classes"
+
+    self debugMenuOpenCallGraphForClasses:(self selectedProjectClasses).
+
+    "Created: / 27-04-2010 / 14:08:02 / cg"
 !
 
 debugMenuRemoveAllBreakpoints
@@ -28736,6 +28828,16 @@
     "Modified: / 09-02-2007 / 12:17:29 / cg"
 !
 
+projectMenuRecompileInstrumented
+    self selectedProjectClasses do:[:eachClass |
+        eachClass theNonMetaclass recompileUsingCompilerClass:InstrumentingCompiler.
+        eachClass theMetaclass recompileUsingCompilerClass:InstrumentingCompiler.
+    ].
+
+    "Created: / 27-04-2010 / 12:39:43 / cg"
+    "Modified: / 27-04-2010 / 14:09:13 / cg"
+!
+
 projectMenuRegenerateProjectContentsDefinitions
     |projectClasses|
 
@@ -43978,11 +44080,11 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.1450 2010-04-25 11:45:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.1451 2010-04-27 12:27:00 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.1450 2010-04-25 11:45:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.1451 2010-04-27 12:27:00 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!

--- a/Tools__NewSystemBrowser.st	Tue Apr 27 14:26:22 2010 +0200
+++ b/Tools__NewSystemBrowser.st	Tue Apr 27 14:27:00 2010 +0200
@@ -5119,16 +5119,18 @@
             showBusyCursorWhilePerforming: true
           )
          (MenuItem
-            enabled: hasClassSelectedAndInstrumentingCompilerExistsHolder
+            enabled: hasClassSelectedAndInstrumentingCompilerExistsAndOOMPackageLoadedHolder
             label: 'Call Graph'
-            itemValue: debugMenuOpenCallGraph
-            translateLabel: true
-            showBusyCursorWhilePerforming: true
-          )
-         )
-        nil
-        nil
-      )
+            itemValue: debugMenuOpenCallGraphForClasses
+            translateLabel: true
+            showBusyCursorWhilePerforming: true
+          )
+         )
+        nil
+        nil
+      )
+
+    "Modified: / 27-04-2010 / 14:06:28 / cg"
 !
 
 classGenerateMenu
@@ -7558,6 +7560,46 @@
       )
 !
 
+projectDebugMenu
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+    "
+     MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#classDebugMenu
+     (Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser classDebugMenu)) startUp
+    "
+
+    <resource: #menu>
+
+    ^ 
+     #(Menu
+        (
+         (MenuItem
+            enabled: hasProjectSelectedAndInstrumentingCompilerExistsHolder
+            label: 'Recompile all Methods with Instrumentation'
+            itemValue: projectMenuRecompileInstrumented
+            translateLabel: true
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
+            enabled: hasProjectSelectedAndInstrumentingCompilerExistsAndOOMPackageLoadedHolder
+            label: 'Call Graph'
+            itemValue: debugMenuOpenCallGraphForProjects
+            translateLabel: true
+            showBusyCursorWhilePerforming: true
+          )
+         )
+        nil
+        nil
+      )
+
+    "Created: / 27-04-2010 / 12:41:02 / cg"
+    "Modified: / 27-04-2010 / 14:06:33 / cg"
+!
+
 projectMenu
     "This resource specification was automatically generated
      by the MenuEditor of ST/X."
@@ -7821,17 +7863,26 @@
                   itemValue: projectMenuRegenerateProjectContentsDefinitions
                   translateLabel: true
                 )
-               )
-              nil
-              nil
-            )
-          )
-         (MenuItem
-            enabled: hasSingleRealProjectSelectedHolder
-            label: 'Build Binaries for Deployment'
-            itemValue: projectMenuBuild
-            translateLabel: true
-            showBusyCursorWhilePerforming: true
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  enabled: hasSingleRealProjectSelectedHolder
+                  label: 'Build Binaries for Deployment'
+                  itemValue: projectMenuBuild
+                  translateLabel: true
+                  showBusyCursorWhilePerforming: true
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
+            label: 'Debug'
+            translateLabel: true
+            submenuChannel: projectDebugMenu
+            keepLinkedMenu: true
           )
          (MenuItem
             label: 'Special'
@@ -7873,6 +7924,8 @@
         nil
         nil
       )
+
+    "Modified: / 27-04-2010 / 12:42:43 / cg"
 !
 
 projectMenuCVS
@@ -13409,6 +13462,14 @@
     "Created: / 4.2.2000 / 22:02:53 / cg"
 !
 
+hasClassSelectedAndInstrumentingCompilerExistsAndOOMPackageLoadedHolder
+    ^ [ self hasClassSelectedAndInstrumentingCompilerExistsHolder value 
+        and:[ OOM::MetricVisualizer notNil ] 
+      ]
+
+    "Created: / 27-04-2010 / 12:33:41 / cg"
+!
+
 hasClassSelectedAndInstrumentingCompilerExistsHolder
     ^ [ self hasClassSelected and:[ self instrumentingCompilerExists] ]
 
@@ -14362,12 +14423,13 @@
 hasSharedPoolClassSelected
     ^ self hasClassSelected
       and:[self selectedClasses value
-                contains:[:cls |
+                contains:[:cls |    
                         cls isLoaded 
                         and:[cls theNonMetaclass isAbstract not
                         and:[ cls inheritsFrom:SharedPool ]]] ]
 
     "Created: / 25-10-2006 / 09:23:07 / cg"
+    "Modified: / 27-04-2010 / 13:01:57 / cg"
 !
 
 hasSharedPoolClassSelectedHolder
@@ -26387,15 +26449,35 @@
     "Modified: / 2.2.1998 / 12:39:38 / stefan"
 !
 
-debugMenuOpenCallGraph
+debugMenuOpenCallGraphForClasses
+    "open an OOM CallGraph view on the selected class(es)"
+
+    self debugMenuOpenCallGraphForClasses:(self selectedClasses value).
+
+    "Created: / 27-04-2010 / 14:07:58 / cg"
+!
+
+debugMenuOpenCallGraphForClasses:classes
     "open an OOM CallGraph view on the selected class(es)"
 
-    |classes methods callingMethods allMethods|
-
-    classes := self selectedClasses value.
+    |methods|
+
     methods := classes collectAll:[:cls | cls instAndClassMethods].
-
-    "/ classes of all callers
+    self debugMenuOpenCallGraphForMethods:methods.
+
+    "Created: / 27-04-2010 / 14:09:29 / cg"
+!
+
+debugMenuOpenCallGraphForMethods:methods
+    "open an OOM CallGraph view on the selected class(es)"
+
+    |callingMethods allMethods|
+
+    OOM::MetricVisualizer isNil ifTrue:[
+        Dialog information:'Missing class: OOM::MetricVisualizer'.
+        ^ self.
+    ].
+
     callingMethods := Set new.
     methods 
         do:[:eachMethod |
@@ -26413,7 +26495,7 @@
         "/ dont do primitives...
         caller hasPrimitiveCode ifFalse:[
             caller mclass notNil ifTrue:[
-                (InstrumentingCompiler isInstrumented:caller) ifFalse:[
+                caller isInstrumented ifFalse:[
                     InstrumentingCompiler compileMethod:caller
                 ].                                              
             ]
@@ -26426,6 +26508,16 @@
     OOM::MetricVisualizer 
         openViewerOnDiagramForMethods:allMethods 
         setupWith:[:viewer | viewer set_DynamicMethodInvocationDiagram]
+
+    "Created: / 27-04-2010 / 14:07:07 / cg"
+!
+
+debugMenuOpenCallGraphForProjects
+    "open an OOM CallGraph view on the selected project(s) classes"
+
+    self debugMenuOpenCallGraphForClasses:(self selectedProjectClasses).
+
+    "Created: / 27-04-2010 / 14:08:02 / cg"
 !
 
 debugMenuRemoveAllBreakpoints
@@ -28736,6 +28828,16 @@
     "Modified: / 09-02-2007 / 12:17:29 / cg"
 !
 
+projectMenuRecompileInstrumented
+    self selectedProjectClasses do:[:eachClass |
+        eachClass theNonMetaclass recompileUsingCompilerClass:InstrumentingCompiler.
+        eachClass theMetaclass recompileUsingCompilerClass:InstrumentingCompiler.
+    ].
+
+    "Created: / 27-04-2010 / 12:39:43 / cg"
+    "Modified: / 27-04-2010 / 14:09:13 / cg"
+!
+
 projectMenuRegenerateProjectContentsDefinitions
     |projectClasses|
 
@@ -43978,11 +44080,11 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1450 2010-04-25 11:45:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1451 2010-04-27 12:27:00 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1450 2010-04-25 11:45:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1451 2010-04-27 12:27:00 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!