*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Wed, 20 Apr 2005 03:02:23 +0200
changeset 6260 9e7aa671f1b9
parent 6259 e440c14b02aa
child 6261 12b1bd86fdf3
*** empty log message ***
NewSystemBrowser.st
Tools_BrowserList.st
Tools_MethodList.st
Tools__NewSystemBrowser.st
--- a/NewSystemBrowser.st	Wed Apr 20 01:04:49 2005 +0200
+++ b/NewSystemBrowser.st	Wed Apr 20 03:02:23 2005 +0200
@@ -7315,11 +7315,27 @@
             label: '-'
           )
          (MenuItem
-            enabled: hasProjectSelectedHolder
             label: 'Documentation'
-            itemValue: projectMenuDocumentation
-            translateLabel: true
-            showBusyCursorWhilePerforming: true
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  enabled: hasProjectSelectedHolder
+                  label: 'Generate Project Documentation'
+                  itemValue: projectMenuDocumentation
+                  translateLabel: true
+                  showBusyCursorWhilePerforming: true
+                )
+               (MenuItem
+                  label: 'Metrics Summary'
+                  itemValue: projectMenuMetricsSummary
+                  translateLabel: true
+                )
+               )
+              nil
+              nil
+            )
           )
          (MenuItem
             label: '-'
@@ -7405,22 +7421,6 @@
             translateLabel: true
           )
          (MenuItem
-            label: 'Metrics'
-            translateLabel: true
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  label: 'Summary'
-                  itemValue: projectMenuMetricsSummary
-                  translateLabel: true
-                )
-               )
-              nil
-              nil
-            )
-          )
-         (MenuItem
             label: '-'
           )
          (MenuItem
@@ -36600,7 +36600,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.822 2005-04-19 23:04:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.823 2005-04-20 01:02:01 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!
--- a/Tools_BrowserList.st	Wed Apr 20 01:04:49 2005 +0200
+++ b/Tools_BrowserList.st	Wed Apr 20 03:02:23 2005 +0200
@@ -1054,50 +1054,50 @@
     sameContents := sameStrings := (newList size == browserNameList size).
 
     sameContents ifTrue:[
-	newList with:browserNameList do:[:newLine :oldLine |
-	    sameStrings ifTrue:[
-		sameStrings := ((newLine ? '')  = (oldLine ? '')).    
-	    ].
-	    sameContents ifTrue:[
-		((newLine ? '') sameStringAndEmphasisAs:(oldLine ? '')) ifFalse:[
-		    sameContents := false
-		]
-	    ].
-	]
+        newList with:browserNameList do:[:newLine :oldLine |
+            sameStrings ifTrue:[
+                sameStrings := ((newLine ? '')  = (oldLine ? '')).    
+            ].
+            sameContents ifTrue:[
+                ((newLine ? '') sameStringAndEmphasisAs:(oldLine ? '')) ifFalse:[
+                    sameContents := false
+                ]
+            ].
+        ]
     ].
 
     listView := builder componentAt:#List.
     listView isNil ifTrue:[
-	"/ called early during setup ...
-	browserNameList contents:newList.
-	^ sameContents.
+        "/ called early during setup ...
+        browserNameList contents:newList.
+        ^ sameContents.
     ].
 
     sameContents ifTrue:[
-	^ sameContents
+        ^ sameContents
     ].
     sameStrings ifTrue:[
-	newList keysAndValuesDo:[:lineNr :line |
-	    oldEntry := browserNameList at:lineNr.    
-	    (oldEntry sameStringAndEmphasisAs:line) ifFalse:[
-		browserNameList at:lineNr put:line.
-	    ]
-	].
-	^ sameContents
+        newList keysAndValuesDo:[:lineNr :line |
+            oldEntry := browserNameList at:lineNr.    
+            (oldEntry sameStringAndEmphasisAs:line) ifFalse:[
+                browserNameList at:lineNr put:line.
+            ]
+        ].
+        ^ sameContents
     ].
 
     listView := listView scrolledView.
-    listView isNil ifTrue:[self halt. ^ self].
+    listView isNil ifTrue:[^ false].
     prevMode := listView scrollWhenUpdating.
     listView scrollWhenUpdating:nil.
 
     [
-	"/ dont want to be called if selection is changed by selListView
-	sav := listView action.
-	listView action:nil.
-	browserNameList contents:newList.
+        "/ dont want to be called if selection is changed by selListView
+        sav := listView action.
+        listView action:nil.
+        browserNameList contents:newList.
     ] ensure:[
-	listView action:sav.
+        listView action:sav.
     ].
 
     listView scrollWhenUpdating:prevMode.
@@ -1240,5 +1240,5 @@
 !BrowserList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_BrowserList.st,v 1.7 2005-02-02 11:01:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_BrowserList.st,v 1.8 2005-04-20 01:02:23 cg Exp $'
 ! !
--- a/Tools_MethodList.st	Wed Apr 20 01:04:49 2005 +0200
+++ b/Tools_MethodList.st	Wed Apr 20 03:02:23 2005 +0200
@@ -341,7 +341,8 @@
                         ].
                         (variableFilter value size > 0
                         or:[oldMethod package ~= newMethod package
-                        or:[oldMethod resources ~= newMethod resources]]) ifTrue:[
+                        or:[oldMethod resources ~= newMethod resources
+                        or:[showMethodComplexity value ~~ false]]]) ifTrue:[
                             "/ only update that methods entry
                             self updateListEntryFor:newMethod.    
                             "/ sigh - must invalidate
@@ -875,7 +876,7 @@
 
     showMethodComplexity value ~~ false ifTrue:[
         metrics := Tools::MethodMetrics forMethod:aMethod.
-        complexity := metrics complexity.
+        complexity := metrics complexity ? 0.
         complexityString := complexity printString asText.
         lBr := '{'.
         rBr := '}'.
@@ -1464,5 +1465,5 @@
 !MethodList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.5 2005-04-19 23:04:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.6 2005-04-20 01:02:10 cg Exp $'
 ! !
--- a/Tools__NewSystemBrowser.st	Wed Apr 20 01:04:49 2005 +0200
+++ b/Tools__NewSystemBrowser.st	Wed Apr 20 03:02:23 2005 +0200
@@ -7315,11 +7315,27 @@
             label: '-'
           )
          (MenuItem
-            enabled: hasProjectSelectedHolder
             label: 'Documentation'
-            itemValue: projectMenuDocumentation
-            translateLabel: true
-            showBusyCursorWhilePerforming: true
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  enabled: hasProjectSelectedHolder
+                  label: 'Generate Project Documentation'
+                  itemValue: projectMenuDocumentation
+                  translateLabel: true
+                  showBusyCursorWhilePerforming: true
+                )
+               (MenuItem
+                  label: 'Metrics Summary'
+                  itemValue: projectMenuMetricsSummary
+                  translateLabel: true
+                )
+               )
+              nil
+              nil
+            )
           )
          (MenuItem
             label: '-'
@@ -7405,22 +7421,6 @@
             translateLabel: true
           )
          (MenuItem
-            label: 'Metrics'
-            translateLabel: true
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  label: 'Summary'
-                  itemValue: projectMenuMetricsSummary
-                  translateLabel: true
-                )
-               )
-              nil
-              nil
-            )
-          )
-         (MenuItem
             label: '-'
           )
          (MenuItem
@@ -36600,7 +36600,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.822 2005-04-19 23:04:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.823 2005-04-20 01:02:01 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!