#REFACTORING by cg expecco_18_2_0 expecco_18_2_1
authorClaus Gittinger <cg@exept.de>
Tue, 18 Dec 2018 13:50:54 +0100
changeset 18550 8de40a119c04
parent 18549 92c95959de02
child 18551 15acc9248294
#REFACTORING by cg class: Tools::NewSystemBrowser changed: #addClassesToRemoveForClass:to:removingSubclasses:withCancel:withConfirm:
Tools__NewSystemBrowser.st
--- a/Tools__NewSystemBrowser.st	Tue Dec 18 12:33:43 2018 +0100
+++ b/Tools__NewSystemBrowser.st	Tue Dec 18 13:50:54 2018 +0100
@@ -30671,7 +30671,7 @@
         "/ ask again - severe damage is to be expected ...
 
         confirmed := Dialog
-                    confirmWithCancel:'The set of classes to remove includes at least one systemClass,\without which ST/X will fail to work.\Be prepared for a crash, if you proceed.\\Really remove ?'
+                    confirmWithCancel:'The set of classes to remove includes at least one system class,\without which ST/X will fail to work.\Be prepared for a crash, if you proceed.\\Really remove ?'
                             withCRs
                     default:false.
         confirmed isNil ifTrue:[
@@ -30686,31 +30686,30 @@
 
     "/ check if any of the classes to remove has a repository container - warn about this if so
     aClass withAllSubclassesDo:[:eachClassToRemove |
-        eachClassToRemove isPrivate ifFalse:[
-            eachClassToRemove revision notNil ifTrue:[
-                (removingSubclasses or:[eachClassToRemove == aClass])
-                ifTrue:[
-                    (SourceCodeManagerUtilities sourceCodeManagerFor:eachClassToRemove) isContainerBased ifTrue:[
-                        confirmed := Dialog
-                                    confirmWithCancel:(resources
-                                            string:'Remove the source container for ''%1'' in the repository ?\\Warning: can only be undone by manually fixing the CVS repository !!'
-                                            with:eachClassToRemove name allBold) withCRs
-                                    default:false.
-                    ] ifFalse:[
-                        confirmed := false.
-                    ].
-                    confirmed isNil ifTrue:[
-                        "/ canceled
-
-                        AbortSignal raise
-                    ].
-                    confirmed ifTrue:[
-                        (SourceCodeManagerUtilities sourceCodeManagerFor:eachClassToRemove)
-                            utilities
-                                removeSourceContainerForClass:eachClassToRemove
-                                confirm:true
-                                warn:true
-                    ]
+        (eachClassToRemove isPrivate not
+          and:[ eachClassToRemove revision notNil ]
+        ) ifTrue:[
+            (removingSubclasses or:[eachClassToRemove == aClass]) ifTrue:[
+                (SourceCodeManagerUtilities sourceCodeManagerFor:eachClassToRemove) isContainerBased ifTrue:[
+                    confirmed := Dialog
+                                confirmWithCancel:(resources
+                                        string:'Remove the source container for ''%1'' in the repository ?\\Warning: can only be undone by manually fixing the CVS repository !!'
+                                        with:eachClassToRemove name allBold) withCRs
+                                default:false.
+                ] ifFalse:[
+                    confirmed := false.
+                ].
+                confirmed isNil ifTrue:[
+                    "/ canceled
+
+                    AbortSignal raise
+                ].
+                confirmed ifTrue:[
+                    (SourceCodeManagerUtilities sourceCodeManagerFor:eachClassToRemove)
+                        utilities
+                            removeSourceContainerForClass:eachClassToRemove
+                            confirm:true
+                            warn:true
                 ]
             ].
         ]
@@ -30782,6 +30781,7 @@
     "Modified: / 21-12-2011 / 20:22:34 / cg"
     "Modified: / 17-10-2013 / 00:57:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (format): / 24-08-2017 / 15:04:43 / cg"
+    "Modified: / 18-12-2018 / 13:51:07 / Claus Gittinger"
 !
 
 askForGlobalCoverageRecording