added:
authorClaus Gittinger <cg@exept.de>
Tue, 13 Sep 2011 12:09:41 +0200
changeset 10703 37e71c475038
parent 10702 90cc3aeccac5
child 10704 015027d5c1a2
added: #includeExtensions #includeExtensions: changed: #mainMenu #updateLists
VersionDiffBrowser.st
--- a/VersionDiffBrowser.st	Tue Sep 13 12:01:33 2011 +0200
+++ b/VersionDiffBrowser.st	Tue Sep 13 12:09:41 2011 +0200
@@ -290,6 +290,7 @@
     "Do not manually edit this!! If it is corrupted,
      the MenuEditor may not be able to read the specification."
 
+
     "
      MenuEditor new openOnClass:VersionDiffBrowser andSelector:#mainMenu
      (Menu new fromLiteralArrayEncoding:(VersionDiffBrowser mainMenu)) startUp
@@ -331,10 +332,11 @@
            (Menu
               (
                (MenuItem
+                  enabled: canIncludeExtensionsHolder
                   label: 'Include Extensions'
+                  itemValue: includeExtensions:
                   translateLabel: true
                   indication: includeExtensionsHolder
-                  enabled: canIncludeExtensionsHolder
                 )
                )
               nil
@@ -1164,6 +1166,18 @@
     "Modified: / 06-10-2006 / 14:30:42 / cg"
 !
 
+includeExtensions
+    ^ self ignoreExtensions not
+
+    "Created: / 13-09-2011 / 11:48:51 / cg"
+!
+
+includeExtensions:aBoolean
+    self ignoreExtensions:aBoolean not
+
+    "Created: / 13-09-2011 / 11:48:41 / cg"
+!
+
 includeExtensionsHolder
     "only compare base-methods or include extensions ?"
 
@@ -1356,11 +1370,14 @@
 update:something with:parameter from:changedObject
     (changedObject == classHolder 
     or:[changedObject == versionAHolder
-    or:[changedObject == versionBHolder]]) ifTrue:[
+    or:[changedObject == versionBHolder
+    or:[changedObject == includeExtensionsHolder]]]) ifTrue:[ 
         self setupForClass:(classHolder value) versionA:(versionAHolder value) versionB:(versionBHolder value)
 .        ^ self
     ].
     super update:something with:parameter from:changedObject
+
+    "Modified: / 13-09-2011 / 11:50:35 / cg"
 ! !
 
 !VersionDiffBrowser methodsFor:'initialization & release'!
@@ -1738,7 +1755,7 @@
 updateLists
     |classChangeSet listOnlyInA listOnlyInB listChanged 
      printStringGenerator sortBlockForChangeLists filteredList
-     isExtensionChange numIgnoredExtensions|
+     isIgnoredChange numIgnoredExtensions|
 
     classChangeSet := self classChangeSet.
 
@@ -1747,28 +1764,26 @@
 
     numIgnoredExtensions := 0.
 
-    isExtensionChange := 
+    isIgnoredChange := 
         [:change |
             |packageOfMethodInChange packageOfMethodInImage changeMethod ignored|
 
             ignored := false.
             change isMethodCodeChange ifTrue:[
-                self ignoreExtensions ifTrue:[
-                    packageOfMethodInChange := change package.
-                    (packageOfMethodInChange notNil
-                      and:[ packageOfMethodInChange ~= PackageId noProjectID
-                      and:[ packageOfMethodInChange ~= change changeClass package ]]) ifTrue:[ 
-                        ignored := true 
-                    ].
+                packageOfMethodInChange := change package.
+                (packageOfMethodInChange notNil
+                  and:[ packageOfMethodInChange ~= PackageId noProjectID
+                  and:[ packageOfMethodInChange ~= change changeClass package ]]) ifTrue:[ 
+                    ignored := true 
+                ].
 
-                    changeMethod := change changeMethod.
-                    changeMethod notNil ifTrue:[
-                        packageOfMethodInImage := changeMethod package.
-                        (packageOfMethodInImage notNil
-                          and:[ packageOfMethodInImage ~= PackageId noProjectID
-                          and:[ packageOfMethodInImage ~= changeMethod mclass package ]]) ifTrue:[
-                            ignored := true
-                        ].
+                changeMethod := change changeMethod.
+                changeMethod notNil ifTrue:[
+                    packageOfMethodInImage := changeMethod package.
+                    (true "packageOfMethodInImage notNil"
+                      and:[ packageOfMethodInImage ~= PackageId noProjectID
+                      and:[ packageOfMethodInImage ~= changeMethod mclass package ]]) ifTrue:[
+                        ignored := true
                     ].
                 ].
                 numIgnoredExtensions := numIgnoredExtensions + (ignored ifTrue:[1] ifFalse:[0]).
@@ -1781,8 +1796,8 @@
     classChangeSet notNil ifTrue:[
         "/ classChangeSet methodsOnlyInA sort:sortBlockForChangeLists.
         filteredList := classChangeSet methodsOnlyInA.
-        includeExtensionsHolder value ifFalse:[
-            filteredList := filteredList reject:isExtensionChange.
+        self includeExtensions ifFalse:[
+            filteredList := filteredList reject:isIgnoredChange.
         ].
         listOnlyInA addAll: (filteredList collect:printStringGenerator).
     ].
@@ -1792,8 +1807,8 @@
     classChangeSet notNil ifTrue:[
         "/ classChangeSet methodsOnlyInB sort:sortBlockForChangeLists.
         filteredList := classChangeSet methodsOnlyInB.
-        includeExtensionsHolder value ifFalse:[
-            filteredList := filteredList reject:isExtensionChange.
+        self includeExtensions ifFalse:[
+            filteredList := filteredList reject:isIgnoredChange.
         ].
         listOnlyInB addAll: (filteredList collect:printStringGenerator).
     ].
@@ -1803,8 +1818,8 @@
     classChangeSet notNil ifTrue:[
         "/ classChangeSet methodsChanged sort:[:a :b | sortBlockForChangeLists value:a first value:b first].
         filteredList := classChangeSet methodsChanged.
-        includeExtensionsHolder value ifFalse:[
-            filteredList := filteredList reject:[:entry | isExtensionChange value:entry first].
+        self includeExtensions ifFalse:[
+            filteredList := filteredList reject:[:entry | isIgnoredChange value:entry first].
         ].
         listChanged addAll: (filteredList collect:[:entry| printStringGenerator value:(entry first)]).
     ].
@@ -1822,7 +1837,7 @@
         infoHolder value:nil
     ].
 
-    "Modified: / 12-09-2011 / 13:21:44 / cg"
+    "Modified: / 13-09-2011 / 12:08:06 / cg"
 ! !
 
 !VersionDiffBrowser methodsFor:'setup'!
@@ -2268,9 +2283,9 @@
 !VersionDiffBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.98 2011-09-12 11:25:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.99 2011-09-13 10:09:41 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.98 2011-09-12 11:25:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.99 2011-09-13 10:09:41 cg Exp $'
 ! !