--- a/Tools__Inspector2Tab.st	Thu Feb 09 09:58:04 2017 +0000
+++ b/Tools__Inspector2Tab.st	Thu Feb 09 09:56:47 2017 +0000
@@ -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: / 09-02-2017 / 00:33:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !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: / 09-02-2017 / 09:23:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-applicationHolder:something
-    applicationHolder := something.
+applicationHolder:aValueModelOrBlock
+    <resource: #obsolete> "/ use #application:
+    self application: aValueModelOrBlock
+
+    "Modified: / 09-02-2017 / 09:23:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+inspector: anInspector2
+    inspector := anInspector2
+
+    "Created: / 09-02-2017 / 00:53:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 label
@@ -148,37 +158,38 @@
 
 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: / 09-02-2017 / 09:24:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-view:aViewOrBlock
-    aViewOrBlock isBlock ifTrue:[ 
-        viewHolder := aViewOrBlock
-    ] ifFalse:[
-        view := aViewOrBlock.
-    ]
+view:aViewOrBlockOrValueModel
+    view := aViewOrBlockOrValueModel.
+
 
     "Created: / 16-01-2008 / 16:51:05 / janfrog"
     "Modified: / 17-02-2008 / 08:58:46 / janfrog"
     "Modified: / 21-05-2015 / 21:31:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-viewHolder:something
-    viewHolder := something.
+viewHolder:aValueModelOrBlock
+    <resource: #obsolete> "/ use #view:
+    self view: aValueModelOrBlock
+
+    "Modified: / 09-02-2017 / 09:23:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 viewOrNil
@@ -193,11 +204,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: / 09-02-2017 / 09:24:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !Inspector2Tab class methodsFor:'documentation'!