--- a/NewLauncher.st	Mon Oct 12 09:48:23 2009 +0200
+++ b/NewLauncher.st	Mon Oct 12 12:09:25 2009 +0200
@@ -337,9 +337,6 @@
 #demos3D
 '3D GL graphic demos.'
 
-demosOldStuff
-'Very old demos'
-
 #demos3DcubeSolid
 'A rotating solid cube.'
 
@@ -391,6 +388,9 @@
 #demosDigitalClock
 'Opens a digital clock application'
 
+#demosDrawingProtocol
+'Drawing protocol demo (for programmers)'
+
 #demosFTP
 'Opens a simple FTP interface demo.'
 
@@ -403,9 +403,6 @@
 #demosGUI
 'GUI builder demos.'
 
-#demosDrawingProtocol
-'Drawing protocol demo (for programmers)'
-
 #demosGUICalculator
 'Calculator built using the GUI builder.'
 
@@ -451,6 +448,9 @@
 #demosNews
 'Opens a simple news reader demo.'
 
+#demosOldStuff
+'Very old demos'
+
 #demosPen
 'Opens a demo for the Pen class.'
 
@@ -517,27 +517,27 @@
 #helpPrintDocumentation
 'Print various parts of the ST/X documentation.'
 
+#helpProgrammersGuide
+'Show the programmer''s guide.'
+
 #helpRFC
 'Show an RFC by number.'
 
-#helpProgrammersGuide
-'Show the programmer''s guide.'
-
 #helpSTXOnlineDocumentation
 'Show the ST/X online documentation.'
 
 #helpShowTipOfTheDay
 'Show a tip-of-the-day.'
 
+#helpSmalltalkTutorial
+'Show the Smalltalk Language Tutorial.'
+
 #helpToolsDocumentation
 'Show the tool documentation.'
 
 #helpTutorial
 'Show the ST/X Tutorial.'
 
-#helpSmalltalkTutorial
-'Show the Smalltalk Language Tutorial.'
-
 #helpWhatsNew
 'Show the latest news about the ST/X documentation.'
 
@@ -643,12 +643,18 @@
 #toolsChangesBrowserOrNavigateToRecentChange
 'Open a Changes Browser or navigate to a recent Change.'
 
+#toolsEvaluationWorkspace
+'A 3-pane EvaluationWorkspace - good for lectures and Smalltalk courses'
+
 #toolsGUIPainter
 'Open a GUI Painter for graphical user interface construction.'
 
 #toolsImageEditor
 'Open a Bitmap Image Editor.'
 
+#toolsInternationalLanguageTranslationEditor
+'Open the National Language Translation Editor'
+
 #toolsMenuEditor
 'Open a Menu Editor for building menus and toolBars.'
 
@@ -676,39 +682,36 @@
 #toolsMiscProjectsSelectProject
 'Select an existing project and reopen its windows.'
 
+#toolsMyWorkspace
+'Workspace on the "MyWorkspace.wsp" file'
+
 #toolsNewChangesBrowser
 'Open the new changes browser.'
 
+#toolsOOM
+''
+
 #toolsOldChangesBrowser
 'Open the old changes browser.'
 
 #toolsProjects
 ''
 
-#toolsInternationalLanguageTranslationEditor
-'Open the National Language Translation Editor'
-
 #toolsSUnit
 'Open the SUnit TestRunner.'
 
 #toolsSmaCC
 'Open the SmaCC Parsergenerator Tool.'
 
+#toolsSystemWorkspace
+'The SystemWorkspace with Welcome Messages'
+
 #toolsTerminal
 'Open a terminal view (aka xterm)'
 
 #toolsWorkspace
 'Open a Workspace for evaluating smalltalk expressions.'
 
-#toolsMyWorkspace
-'Workspace on the "MyWorkspace.wsp" file'
-
-#toolsSystemWorkspace
-'The SystemWorkspace with Welcome Messages'
-
-#toolsEvaluationWorkspace
-'A 3-pane EvaluationWorkspace - good for lectures and Smalltalk courses'
-
 #windows
 'Window functions.'
 
@@ -2762,6 +2765,7 @@
           )
          (MenuItem
             activeHelpKey: toolsOOM
+            enabled: oomPackageLoaded
             label: 'Code Metrics Browser'
             itemValue: startOOMBrowser
             nameKey: startOOMBrowser
@@ -2769,6 +2773,7 @@
           )
          (MenuItem
             activeHelpKey: toolsSmaCC
+            enabled: smaccPackageLoaded
             label: 'SmaCC ParserGenerator'
             itemValue: startSmaCCParserGenerator
             nameKey: startSmaCCParserGenerator
@@ -3488,6 +3493,14 @@
     ^ holder
 !
 
+oomPackageLoaded
+    "true if the oom (metrics) package is loaded"
+
+    "/ access via at: to prevent preference-detector from including oom as
+    "/ prerequisite for NewLaucher.
+    ^ (Smalltalk at:#'OOM::MetricVisualizer') isBehavior
+!
+
 packageDialogVisible
 "/    ^ true.
     ^ false
@@ -3507,6 +3520,14 @@
     ^ false
 !
 
+smaccPackageLoaded
+    "true if the oom (metrics) package is loaded"
+
+    "/ access via at: to prevent preference-detector from including oom as
+    "/ prerequisite for NewLaucher.
+    ^ (Smalltalk at:#'SmaCC::SmaccParserGenerator') isBehavior
+!
+
 smallTeamAvailable
     ^ SmallTeam notNil
 
@@ -4663,5 +4684,9 @@
 !NewLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.390 2009-09-27 09:49:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.391 2009-10-12 10:09:25 cg Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.391 2009-10-12 10:09:25 cg Exp $'
 ! !