class: ChangesBrowser
authorStefan Vogel <sv@exept.de>
Fri, 21 Jun 2013 15:39:38 +0200
changeset 12973 5639ba869f9d
parent 12972 b7a2f930c5f2
child 12974 36c9066053cb
class: ChangesBrowser comment/format in: #error:position:to:from: changed: #applyChange: Allow to abort all when applying
ChangesBrowser.st
--- a/ChangesBrowser.st	Fri Jun 21 14:25:58 2013 +0200
+++ b/ChangesBrowser.st	Fri Jun 21 15:39:38 2013 +0200
@@ -1027,7 +1027,7 @@
         self changeSelection:changeNrProcessed
     ].
 
-    "if more than a singe change is applied,
+    "if more than a single change is applied,
      ask the user if he wants to abort the whole sequence of operations..."
     multipleApply == true ifTrue:[
         codeView highlightingErrorPosition:relPos to:relEndPos do:[
@@ -4431,7 +4431,7 @@
      alternativeClass shortName orgClassName nsClass aborted|
 
     aStream := self streamForChange:changeNr.
-    aStream isNil ifTrue:[^ self].
+    aStream isNil ifTrue:[^ false].
 
     className := self classNameOfChange:changeNr.
     className notNil ifTrue:[
@@ -4523,11 +4523,14 @@
                                                 ].
                                             ].
                                             className := Dialog
-                                                            request:'No class ''' , className , ''' for change. Add to which class ?'
+                                                            request:'No class ''' , className , ''' for change. Add to which class? (enter empty string to skip this change)'
                                                             initialAnswer:shortName.
 
-                                            className size == 0 ifTrue:[
-                                                ^ self
+                                            className isNil ifTrue:[
+                                                AbortAllOperationRequest raise.
+                                            ].
+                                            className isEmpty ifTrue:[
+                                                ^ false
                                             ].
                                             alternativeClass := Smalltalk classNamed:className.
                                             alternativeClass notNil ifTrue:[
@@ -6536,10 +6539,10 @@
 !ChangesBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.443 2013-06-20 22:55:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.444 2013-06-21 13:39:38 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.443 2013-06-20 22:55:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.444 2013-06-21 13:39:38 stefan Exp $'
 ! !