--- a/Tools__NewSystemBrowser.st	Mon Jul 04 15:57:00 2011 +0200
+++ b/Tools__NewSystemBrowser.st	Mon Jul 04 15:57:15 2011 +0200
@@ -15542,32 +15542,75 @@
 !
 
 canGoBackAspect
-
-    | aspect |
-    aspect := self objectAttributeAt: #canGoBackAspect.
-    aspect ifNil:
-        [aspect :=
-            (AspectAdaptor forAspect:#canGoBack)                
-                subjectChannel: self navigationHistory;
-                yourself.
-        self objectAttributeAt: #canGoBackAspect put: aspect].
-    ^aspect
+    |holder|
+
+    (holder := builder bindingAt:#canGoBackAspect) isNil ifTrue:[
+        holder := (AspectAdaptor forAspect:#canGoBack)                
+                        subjectChannel: self navigationHistory;
+                        yourself.
+        builder aspectAt:#canGoBackAspect put:holder.
+    ].
+    ^ holder.
+
+"/    | aspect |
+"/    aspect := self objectAttributeAt: #canGoBackAspect.
+"/    aspect ifNil:
+"/        [aspect :=
+"/            (AspectAdaptor forAspect:#canGoBack)                
+"/                subjectChannel: self navigationHistory;
+"/                yourself.
+"/        self objectAttributeAt: #canGoBackAspect put: aspect].
+"/    ^aspect
+
+    "Modified: / 21-07-2009 / 22:39:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Created: / 01-09-2009 / 22:38:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+canGoBackInGlobalHistoryAspect
+    |holder|
+
+    (holder := builder bindingAt:#canGoBackInGlobalHistoryAspect) isNil ifTrue:[
+        holder := (AspectAdaptor forAspect:#canGoBack)                
+                        subjectChannel: self class classHistory;
+                        yourself.
+        builder aspectAt:#canGoBackInGlobalHistoryAspect put:holder.
+    ].
+    ^ holder.
+
+"/    | aspect |
+"/    aspect := self objectAttributeAt: #canGoBackAspect.
+"/    aspect ifNil:
+"/        [aspect :=
+"/            (AspectAdaptor forAspect:#canGoBack)                
+"/                subjectChannel: self navigationHistory;
+"/                yourself.
+"/        self objectAttributeAt: #canGoBackAspect put: aspect].
+"/    ^aspect
 
     "Modified: / 21-07-2009 / 22:39:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Created: / 01-09-2009 / 22:38:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 canGoForwardAspect
-
-    | aspect |
-    aspect := self objectAttributeAt: #canGoForwardAspect.
-    aspect ifNil:
-        [aspect :=
-            (AspectAdaptor forAspect:#canGoForward)                
-                subjectChannel: self navigationHistory;
-                yourself.
-        self objectAttributeAt: #canGoForwardAspect put: aspect].
-    ^aspect
+    |holder|
+
+    (holder := builder bindingAt:#canGoForwardAspect) isNil ifTrue:[
+        holder := (AspectAdaptor forAspect:#canGoForward)                
+                        subjectChannel: self navigationHistory;
+                        yourself.
+        builder aspectAt:#canGoForwardAspect put:holder.
+    ].
+    ^ holder.
+
+"/    | aspect |
+"/    aspect := self objectAttributeAt: #canGoForwardAspect.
+"/    aspect ifNil:
+"/        [aspect :=
+"/            (AspectAdaptor forAspect:#canGoForward)                
+"/                subjectChannel: self navigationHistory;
+"/                yourself.
+"/        self objectAttributeAt: #canGoForwardAspect put: aspect].
+"/    ^aspect
 
     "Modified: / 21-07-2009 / 22:39:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Created: / 01-09-2009 / 22:39:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -48999,7 +49042,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1539 2011-07-03 22:31:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1540 2011-07-04 13:57:15 cg Exp $'
 !
 
 version_SVN