Tools__InlineMessageDialog.st
branchjv
changeset 12517 3a904476a8d2
parent 12468 6504b3953a7e
parent 12462 7466535c9b47
child 12625 482496b7e155
--- a/Tools__InlineMessageDialog.st	Fri Mar 15 10:14:37 2013 +0000
+++ b/Tools__InlineMessageDialog.st	Fri Mar 22 09:21:23 2013 +0000
@@ -106,6 +106,7 @@
 "
 ! !
 
+
 !InlineMessageDialog class methodsFor:'accessing-colors'!
 
 defaultInformationBackground
@@ -122,6 +123,7 @@
     "Created: / 10-04-2012 / 19:30:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog class methodsFor:'interface specs'!
 
 messageInfoSpec
@@ -315,12 +317,14 @@
       )
 ! !
 
+
 !InlineMessageDialog class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.8 2013-02-21 16:30:02 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.7 2012-05-17 15:31:22 vrany Exp $'
 ! !
 
+
 !InlineMessageDialog methodsFor:'accessing'!
 
 backgroundColor: aColor
@@ -358,6 +362,7 @@
     "Created: / 28-10-2010 / 18:24:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog methodsFor:'accessing-presentation'!
 
 changeLayoutUponShowHide: aBoolean
@@ -372,6 +377,7 @@
     "Modified (comment): / 17-05-2012 / 13:56:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog methodsFor:'actions'!
 
 doAbort
@@ -386,18 +392,15 @@
         ] do:[
             AbortOperationRequest raise.
         ].
+    ].
+    (worker notNil and:[worker isDead not]) ifTrue:[
+        worker terminate.
+        "/ raise its prio to make it terminate quickly
         worker priority:(Processor userSchedulingPriority + 1).
-        worker terminate.
         worker := nil.
     ].
-"/    (worker notNil and:[worker isDead not]) ifTrue:[
-"/        worker terminate.
-"/        "/ raise its prio to make it terminate quickly
-"/        
-"/        worker := nil.
-"/    ].
 
-    "Modified: / 13-03-2013 / 13:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 11-04-2012 / 16:24:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doAbortIfWorking
@@ -410,16 +413,17 @@
     <resource: #uiCallback>
 
     (worker notNil and:[worker isDead not]) ifTrue:[
+        worker := nil.
+        worker terminate.
         "/ raise its prio to make it terminate quickly
-        worker priority:(Processor userSchedulingPriority + 1).
-        worker terminate.
-        worker := nil.
+        worker priority:(Processor userSchedulingPriority + 1)
     ].
     self hide.
 
-    "Modified: / 27-07-2012 / 15:42:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 11-04-2012 / 13:18:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog methodsFor:'adding & removing components'!
 
 addButton: aButton
@@ -521,6 +525,7 @@
     "Created: / 11-04-2012 / 00:51:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog methodsFor:'aspects'!
 
 backgroundColorHolder
@@ -632,6 +637,7 @@
     "Modified: / 28-10-2010 / 18:29:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog methodsFor:'change & update'!
 
 update:aspect with:parameter from:changedObject
@@ -646,6 +652,7 @@
     "Modified: / 10-04-2012 / 19:36:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog methodsFor:'hooks'!
 
 commonPostBuild
@@ -674,6 +681,7 @@
     "Created: / 10-02-2012 / 10:42:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog methodsFor:'private'!
 
 getMyView
@@ -772,6 +780,7 @@
     "Created: / 29-10-2010 / 11:48:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog methodsFor:'utilities'!
 
 reset
@@ -866,6 +875,7 @@
     "Created: / 11-04-2012 / 13:38:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog methodsFor:'utilities-obsolete'!
 
 information: message 
@@ -934,15 +944,11 @@
     "Created: / 13-02-2012 / 16:59:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !InlineMessageDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.8 2013-02-21 16:30:02 vrany Exp $'
-!
-
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.7 2012-05-17 15:31:22 vrany Exp $'
 !
 
 version_SVN