Tools__Inspector2.st
branchjv
changeset 17459 9f54cb54204c
parent 17219 46a5890e4c57
child 18225 ef87e31d3308
--- a/Tools__Inspector2.st	Thu Feb 09 09:58:04 2017 +0000
+++ b/Tools__Inspector2.st	Thu Feb 09 09:56:47 2017 +0000
@@ -24,7 +24,7 @@
 !
 
 Model subclass:#NavigationState
-	instanceVariableNames:'application theObject index tabs selectionIndex displayString'
+	instanceVariableNames:'inspector theObject index tabs selectionIndex displayString'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:Inspector2
@@ -1305,7 +1305,7 @@
     | current new |
 
     new := NavigationState for: anObject.
-    new application:self.
+    new inspector:self.
     current := self currentState.
     (current notNil "and:[anObject isKindOf: current theObject class]") ifTrue:[ 
         | currentTabLabel newSelectionIndex |
@@ -1324,7 +1324,7 @@
     ^ new
 
     "Created: / 04-02-2015 / 15:27:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 13-02-2015 / 20:44:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-02-2017 / 09:27:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 setDoItActionForLanguage: language
@@ -1353,7 +1353,6 @@
     "Modified: / 10-03-2015 / 09:46:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !Inspector2::NavigationState class methodsFor:'creating classes'!
 
 for:anObject 
@@ -1378,12 +1377,9 @@
 
 !Inspector2::NavigationState methodsFor:'accessing'!
 
-application
-    ^ application
-!
-
 application:anInspectorApp
-    application := anInspectorApp.
+    <resource: #obsolete>
+    inspector := anInspectorApp.
 !
 
 index
@@ -1394,6 +1390,18 @@
     index := something.
 !
 
+inspector
+    ^ inspector
+
+    "Created: / 09-02-2017 / 09:27:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+inspector:anInspectorApp
+    inspector := anInspectorApp.
+
+    "Created: / 09-02-2017 / 09:27:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 selectionIndex
     selectionIndex isNil ifTrue:[^1].
     selectionIndex < 1 ifTrue:[^1].
@@ -1488,6 +1496,7 @@
             "kludge for ProtoObject, which does neither implement this selector
              nor #perform:"
             tab := Tools::Inspector2Tab new
+            		inspector: inspector;
                         priority: 90;
                         label:'Basic';
                         view: (InspectorView new inspect:theObject);
@@ -1500,7 +1509,7 @@
         "/ ex reject.
         Logger error:'inspector setup: %1' with:ex description.    
         tab := Tools::Inspector2Tab new
-            application:application;
+            inspector: inspector;
             label:selector;
             text:(ex description, Character cr, Character cr,
                   ex suspendedContext fullPrintAllString)
@@ -1508,9 +1517,7 @@
 
     (tab isKindOf:Tools::Inspector2Tab) ifTrue:[
         tabs add: tab.
-        tab 
-            application:application;
-            setupView.
+        tab inspector: inspector.            
     ]
 
     "Created: / 03-02-2015 / 11:03:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"