--- a/Tools__Inspector2Tab.st	Sat Feb 11 10:26:42 2017 +0100
+++ b/Tools__Inspector2Tab.st	Sat Feb 11 10:26:51 2017 +0100
@@ -14,7 +14,7 @@
 "{ NameSpace: Tools }"
 
 Object subclass:#Inspector2Tab
-	instanceVariableNames:'label view application priority viewHolder applicationHolder'
+	instanceVariableNames:'inspector label view application priority'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-Inspector2'
@@ -86,31 +86,41 @@
     ^ self new
             priority: 0;
             label:label;
-            viewHolder: makeView;
+            view: makeView;
             yourself
 
     "
      GenericToolbarIconLibrary systemBrowserIcon inspect
     "
+
+    "Modified: / 11-02-2017 / 10:17:40 / cg"
 ! !
 
 !Inspector2Tab methodsFor:'accessing'!
 
-application
-    ^ application
-
-    "Created: / 16-01-2008 / 16:51:05 / janfrog"
-!
-
-application:anApplicationModelOrBlock
-    application := anApplicationModelOrBlock.
+application:anApplicationModelOrBlockOrValueModel
+    view := [
+                ApplicationSubView new
+                    client: anApplicationModelOrBlockOrValueModel value;
+                    yourself
+            ].
 
     "Created: / 16-01-2008 / 16:51:05 / janfrog"
     "Modified: / 17-02-2008 / 08:58:34 / janfrog"
+    "Modified: / 11-02-2017 / 10:19:39 / cg"
 !
 
-applicationHolder:something
-    applicationHolder := something.
+applicationHolder:aValueModelOrBlock
+    <resource: #obsolete>
+    self application:aValueModelOrBlock.
+
+    "Modified: / 11-02-2017 / 10:20:09 / cg"
+!
+
+inspector:anInspector2
+    inspector := anInspector2
+
+    "Created: / 11-02-2017 / 10:24:29 / cg"
 !
 
 label
@@ -148,32 +158,37 @@
 
 view
     view isNil ifTrue:[
-        viewHolder notNil ifTrue:[
-            view := viewHolder value
-        ] ifFalse:[
-            applicationHolder notNil ifTrue:[
-                view := ApplicationSubView new.
-                view client: applicationHolder value.
-            ]
+        application notNil ifTrue:[
+            view := ApplicationSubView new.
+            view client: application value.
         ]
+    ] ifFalse:[
+        view isBlock ifTrue:[
+            view := view value
+        ].
     ].
+    self setupView.
     ^ view
 
     "Created: / 16-01-2008 / 16:51:05 / janfrog"
     "Modified: / 17-02-2008 / 10:38:59 / janfrog"
-    "Modified: / 13-06-2012 / 14:57:25 / cg"
     "Modified: / 24-03-2014 / 18:25:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 11-02-2017 / 10:22:09 / cg"
 !
 
-view:aView
-    view := aView.
+view:aViewOrBlockOrValueModel
+    view := aViewOrBlockOrValueModel.
 
     "Created: / 16-01-2008 / 16:51:05 / janfrog"
     "Modified: / 17-02-2008 / 08:58:46 / janfrog"
+    "Modified (format): / 11-02-2017 / 10:22:30 / cg"
 !
 
-viewHolder:something
-    viewHolder := something.
+viewHolder:aValueModelOrBlock
+    <resource: #obsolete>
+    self view: aValueModelOrBlock.
+
+    "Modified: / 11-02-2017 / 10:22:53 / cg"
 !
 
 viewOrNil
@@ -188,11 +203,13 @@
 
     (view respondsTo:#setMasterInspectorApplication:) ifTrue:[ 
         "this is for BridgeOjectInspectorView"
-        view setMasterInspectorApplication:application.
+        view setMasterInspectorApplication:inspector.
     ].
     (view respondsTo:#sortOrderHolder:) ifTrue:[ 
-        view sortOrderHolder:(application sortOrderHolder)
+        view sortOrderHolder:(inspector sortOrderHolder)
     ].
+
+    "Modified: / 11-02-2017 / 10:23:28 / cg"
 ! !
 
 !Inspector2Tab class methodsFor:'documentation'!