--- a/Tools__Inspector2.st	Wed Jul 18 10:57:46 2012 +0100
+++ b/Tools__Inspector2.st	Wed Jul 18 18:00:57 2012 +0100
@@ -1053,11 +1053,11 @@
 !Inspector2::NavigationState class methodsFor:'documentation'!
 
 version
-    ^'$Id: Tools__Inspector2.st 7985 2012-04-21 08:36:31Z vranyj1 $'
+    ^'$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.31 2012/06/13 12:58:53 cg Exp $'
 !
 
 version_SVN
-    ^'$Id: Tools__Inspector2.st 7985 2012-04-21 08:36:31Z vranyj1 $'
+    ^'$Id: Tools__Inspector2.st 8018 2012-07-18 17:00:57Z vranyj1 $'
 ! !
 
 !Inspector2::NavigationState methodsFor:'accessing'!
@@ -1163,45 +1163,52 @@
         ] do:[
             displayString := theObject printString contractAtEndTo:15.
         ].
-        displayString := displayString , ' [', theObject class name , ']'
+        displayString := displayString , ' [', (theObject class name ? '???')  , ']'
     ].
     ^ displayString
 
     "Created: / 21-02-2008 / 19:53:07 / janfrog"
-    "Modified: / 17-02-2012 / 14:12:49 / cg"
+    "Modified: / 13-06-2012 / 14:40:34 / cg"
 ! !
 
 !Inspector2::NavigationState methodsFor:'initialization'!
 
 initializeClassBrowserTab
-    | browser spec cls canvas|
+    | browser spec cls canvas makeView view|
 
     cls := theObject class theNonMetaclass.
 
     "/ spec := #singleClassBrowserSpec.
     spec := #multipleClassBrowserSpec.
 
-    browser := Tools::NewSystemBrowser new.
-    browser createBuilder.
-    browser navigationState canvasType:spec.
-    browser browserCanvasType:spec.
-    canvas := browser browserCanvas value.
-    canvas builder:(browser builder).
-    browser navigationState canvas:canvas.
-    "/ browser switchToClassHierarchyView.
-    "/ browser showInheritedMethods.
-    browser classListGenerator value:(cls withAllSuperclasses).
-    browser sortByNameAndInheritance value:true.
-    browser selectClass: cls.
+    makeView := [
+        view isNil ifTrue:[
+            browser := Tools::NewSystemBrowser new.
+            browser createBuilder.
+            browser navigationState canvasType:spec.
+            browser browserCanvasType:spec.
+            canvas := browser browserCanvas value.
+            canvas builder:(browser builder).
+            browser navigationState canvas:canvas.
+            "/ browser switchToClassHierarchyView.
+            "/ browser showInheritedMethods.
+            browser classListGenerator value:(cls withAllSuperclasses).
+            browser sortByNameAndInheritance value:true.
+            browser selectClass: cls.
+
+            view := ApplicationSubView new client: browser spec: spec.
+        ].
+        view
+    ].
 
     tabs add:
         (Tools::Inspector2Tab new
             priority: 0;
             label:'Class';
-            view: (ApplicationSubView new client: browser spec: spec))
+            viewHolder: makeView)
 
     "Created: / 22-07-2011 / 18:48:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 05-03-2012 / 14:07:09 / cg"
+    "Modified: / 13-06-2012 / 14:58:01 / cg"
 !
 
 initializeCommonTabs
@@ -1265,11 +1272,11 @@
 !Inspector2 class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__Inspector2.st 7985 2012-04-21 08:36:31Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.31 2012/06/13 12:58:53 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.30 2012/03/06 14:44:17 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.31 2012/06/13 12:58:53 cg Exp §'
 !
 
 version_CVS_jvrany
@@ -1277,7 +1284,7 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__Inspector2.st 7985 2012-04-21 08:36:31Z vranyj1 $'
+    ^ '$Id: Tools__Inspector2.st 8018 2012-07-18 17:00:57Z vranyj1 $'
 ! !
 
 Inspector2 initialize!