VersionDiffBrowser.st
changeset 11853 fe611dbb05ca
parent 11596 a82461d12ced
child 11855 52fd36ba842f
--- a/VersionDiffBrowser.st	Wed Oct 17 21:04:28 2012 +0200
+++ b/VersionDiffBrowser.st	Wed Oct 17 21:42:41 2012 +0200
@@ -304,14 +304,12 @@
         (
          (MenuItem
             label: 'File'
-            translateLabel: true
             submenu: 
            (Menu
               (
                (MenuItem
                   label: 'Create PatchFile...'
                   itemValue: createPatchFile
-                  translateLabel: true
                 )
                (MenuItem
                   label: '-'
@@ -319,7 +317,20 @@
                (MenuItem
                   label: 'Exit'
                   itemValue: closeRequest
-                  translateLabel: true
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
+            label: 'Class'
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  label: 'Remove from Changeset'
+                  itemValue: removeClassFromChangeSet
                 )
                )
               nil
@@ -328,7 +339,6 @@
           )
          (MenuItem
             label: 'View'
-            translateLabel: true
             submenu: 
            (Menu
               (
@@ -336,13 +346,11 @@
                   enabled: canIncludeExtensionsHolder
                   label: 'Include Extensions'
                   itemValue: includeExtensions:
-                  translateLabel: true
                   indication: includeExtensionsHolder
                 )
                (MenuItem
                   label: 'Include Category Changes'
                   itemValue: includeCategoryChanges:
-                  translateLabel: true
                   indication: includeCategoryChangesHolder
                 )
                )
@@ -352,7 +360,6 @@
           )
          (MenuItem
             label: 'Help'
-            translateLabel: true
             startGroup: conditionalRight
             submenu: 
            (Menu
@@ -360,7 +367,6 @@
                (MenuItem
                   label: 'Documentation'
                   itemValue: openDocumentation
-                  translateLabel: true
                 )
                (MenuItem
                   label: '-'
@@ -368,7 +374,6 @@
                (MenuItem
                   label: 'About this Application...'
                   itemValue: openAboutThisApplication
-                  translateLabel: true
                 )
                )
               nil
@@ -1065,6 +1070,31 @@
     "Modified: / 17-07-2012 / 18:31:32 / cg"
 !
 
+removeClassFromChangeSet
+    |cls ok changedClasses|
+
+    classChangeSet notNil ifTrue:[
+        "/ only do if we compare a single class
+        (cls := classChangeSet classBeingCompared) notNil ifTrue:[
+            ok := classChangeSet diffSet isEmptyOrNil.
+            ok ifFalse:[
+                changedClasses := classChangeSet diffSet changedClasses.
+                (changedClasses size == 1
+                and:[ changedClasses anElement == cls ]) ifTrue:[
+                    (methodsChangedFiltered isEmptyOrNil
+                    and:[ methodsOnlyInAFiltered isEmptyOrNil
+                    and:[ methodsOnlyInBFiltered isEmptyOrNil ]]) ifTrue:[
+                        ok := true.
+                    ]
+                ]
+            ].
+            ok ifTrue:[
+                ChangeSet current condenseChangesForClass:cls
+            ].
+        ].
+    ].
+!
+
 removeSelectedChangeInBFromImage
     |change cls sel op|
 
@@ -2346,9 +2376,9 @@
 !VersionDiffBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.106 2012-07-17 16:54:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.107 2012-10-17 19:42:41 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.106 2012-07-17 16:54:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.107 2012-10-17 19:42:41 cg Exp $'
 ! !