--- a/Tools__ChangeSetBrowser2.st	Sat Jul 28 00:17:55 2012 +0200
+++ b/Tools__ChangeSetBrowser2.st	Sat Jul 28 01:25:28 2012 +0200
@@ -202,9 +202,15 @@
 open
     "Open browser and load current changefile"
 
-    super open application doOpenCurrent
+    |app|
+
+    (app := super open application) 
+        enqueueMessage:#loadCurrentChangeFile
+        for:app
+        arguments:#().
 
     "Created: / 25-01-2012 / 17:16:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 27-07-2012 / 21:24:19 / cg"
 !
 
 openOn: aChangeSet
@@ -1156,8 +1162,8 @@
                   shortcutKey: Ctrlo
                 )
                (MenuItem
-                  label: 'Open Current'
-                  itemValue: doOpenCurrent
+                  label: 'Open on Current Changes File'
+                  itemValue: doOpenCurrentChangeFile
                   translateLabel: true
                   isVisible: allowOpenHolder
                 )
@@ -1260,7 +1266,7 @@
         nil
       )
 
-    "Modified: / 27-12-2011 / 10:35:16 / cg"
+    "Modified: / 27-07-2012 / 21:17:20 / cg"
 !
 
 toolbarMenu
@@ -1602,9 +1608,11 @@
     "return/create the 'codeAspectHolder' value holder (automatically generated)"
 
     codeAspectHolder isNil ifTrue:[
-        codeAspectHolder := ValueHolder new.
+        codeAspectHolder := SyntaxHighlighter codeAspectMethod asValue.
     ].
     ^ codeAspectHolder
+
+    "Modified: / 27-07-2012 / 22:04:12 / cg"
 !
 
 imageSourceHolder
@@ -1819,14 +1827,21 @@
 
     listEntry := self theSingleSelectedChange.
     (listEntry notNil and:[(change := listEntry change) isCompositeChange not]) ifTrue:[
-        self classHolder value: listEntry changeClass.
-        changeSourceHolder setValue: change changeSource; changed: #value.
-        imageSourceHolder setValue: change imageSource; changed: #value.
-
-        codeAspectHolder value:
+        codeAspectHolder setValue:
             (change isMethodCodeChange
-                ifTrue:[#method]
-                ifFalse:[#expression]).
+                ifTrue:[SyntaxHighlighter codeAspectMethod]
+                ifFalse:[SyntaxHighlighter codeAspectExpression]).
+        self classHolder value: change changeClass.
+        changeSourceHolder setValue: change changeSource"; changed: #value".
+        change imageSource = change changeSource ifTrue:[
+            imageSourceHolder setValue: nil"; changed: #value".
+        ] ifFalse:[
+            imageSourceHolder setValue: change imageSource"; changed: #value".
+        ].
+        changeSourceHolder changed.
+        "/ imageSourceHolder changed.
+        codeAspectHolder changed.
+
         self showSource: true
     ] ifFalse:[
         self showSource: false.
@@ -1836,7 +1851,7 @@
     ].
 
     "Created: / 24-10-2009 / 19:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 25-07-2012 / 17:43:30 / cg"
+    "Modified: / 27-07-2012 / 23:42:46 / cg"
 !
 
 update: aspect with: param from: sender
@@ -1851,33 +1866,38 @@
 !ChangeSetBrowser2 methodsFor:'menu actions'!
 
 doOpen
-
     | file changeset |
+
     file := Dialog requestFileName:'Select Changeset to Load' pattern:'*.chg;*.st'.
     file isNil ifTrue:[^self].
+
     [changeset := ChangeSet fromFile: file]
         on: Error
         do: [:ex|Dialog error: 'Error when loading changeset: ',ex description. ^self].
     changesetFile := file.
     self title: file asFilename baseName asString.
-    self doOpen: changeset
+    self loadChangeSet: changeset
 
     "Modified: / 08-04-2011 / 10:11:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 27-12-2011 / 10:39:36 / cg"
+    "Modified: / 27-07-2012 / 21:21:40 / cg"
 !
 
 doOpen: aChangeSet
-
-    self changesetHolder value: aChangeSet
+    <resource: #obsolete>
+    "/ a bad name - implying opening a window...
+    self loadChangeSet: aChangeSet
 
     "Created: / 05-12-2009 / 13:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 27-07-2012 / 21:21:24 / cg"
 !
 
-doOpenCurrent
-
-    self doOpen: (ChangeSet fromFile: ObjectMemory nameForChanges)
+doOpenCurrentChangeFile
+    self withWaitCursorDo:[
+        self class openOn: (ChangeSet fromFile: ObjectMemory nameForChanges)
+    ].
 
     "Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 27-07-2012 / 21:16:42 / cg"
 !
 
 doSave
@@ -1890,17 +1910,17 @@
 !
 
 doSaveAs
-
     | file |
+
     file := Dialog requestFileName:'Select File for Save' default: (changesetFile ? 'somechanges.chg') pattern:('*.chg').
     file isNil ifTrue:[^self].
     self doSaveAs: file.
 
     "Modified: / 27-12-2011 / 10:39:52 / cg"
+    "Modified (format): / 27-07-2012 / 21:22:09 / cg"
 !
 
 doSaveAs: newFile
-
     [
         | s |
         s := newFile asFilename writeStream.
@@ -1908,6 +1928,24 @@
         changesetFile := newFile.
     ] on: Error do:
         [:ex|Dialog warn: 'Erorr saving changes: ' , ex description]
+
+    "Modified (format): / 27-07-2012 / 21:22:14 / cg"
+!
+
+loadChangeSet: aChangeSet
+    self changesetHolder value: aChangeSet
+
+    "Created: / 05-12-2009 / 13:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 27-07-2012 / 21:20:50 / cg"
+!
+
+loadCurrentChangeFile
+    self withWaitCursorDo:[
+        self loadChangeSet: (ChangeSet fromFile: ObjectMemory nameForChanges)
+    ].
+
+    "Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 27-07-2012 / 21:20:44 / cg"
 !
 
 setTargetNamespace
@@ -2661,11 +2699,12 @@
     ^BlockValue
         with: [:change|
             change isMethodCodeChange
-                ifTrue:[#method]
-                ifFalse:[#expression]
+                ifTrue:[ SyntaxHighlighter codeAspectMethod ]
+                ifFalse:[ SyntaxHighlighter codeAspectExpression ]
         ] argument: self changeHolder
 
     "Created: / 29-11-2011 / 11:21:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 27-07-2012 / 22:03:31 / cg"
 !
 
 labelAText
@@ -2758,11 +2797,11 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.38 2012-07-26 18:43:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.39 2012-07-27 23:25:28 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.38 2012-07-26 18:43:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.39 2012-07-27 23:25:28 cg Exp $'
 !
 
 version_SVN