Refactoring of NavigatorModel's environment.
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 25 Feb 2014 11:43:16 +0100
changeset 14040 3a6d81d27264
parent 14039 82567b14e97b
child 14041 746ae38847dc
Refactoring of NavigatorModel's environment. The environment is taken from an environmentHolder (if provided) or defaults to Smalltalk (if holder is not provided)
Tools_BrowserList.st
--- a/Tools_BrowserList.st	Tue Feb 25 11:43:10 2014 +0100
+++ b/Tools_BrowserList.st	Tue Feb 25 11:43:16 2014 +0100
@@ -185,20 +185,6 @@
 
 !BrowserList methodsFor:'accessing'!
 
-environment:env
-    | prevenv |
-
-    self assert:(env isNil or:[env isNameSpace or:[env == Smalltalk]]).
-
-    prevenv := environment.
-    environment := env.
-    environment ~~ prevenv ifTrue:[
-        self enqueueMessage: #updateList for: self arguments: #()
-    ]
-
-    "Created: / 03-09-2013 / 18:32:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 nameFilter:something
     nameFilter := something.
 ! !
@@ -622,70 +608,70 @@
 
     "/ if any of my subclasses want those, they should look for them.
     changedObject == environment ifTrue:[
-	(something == #Language or:[something == #LanguageTerritory]) ifTrue:[
-	    ^ self
-	].
-	something == #organization ifTrue:[
-	    ^ self
-	].
-	something == #classDefinition ifTrue:[
-	    ^ self
-	].
-	something == #classVariables ifTrue:[
-	    ^ self
-	].
-	something == #methodTrap ifTrue:[
-	    ^ self
-	].
-	something == #methodInClassRemoved ifTrue:[
-	    ^ self.
-	].
-	something == #methodDictionary ifTrue:[
-	    ^ self 
-	].
-	something == #newClass ifTrue:[
-	    ^ self 
-	].
+        (something == #Language or:[something == #LanguageTerritory]) ifTrue:[
+            ^ self
+        ].
+        something == #organization ifTrue:[
+            ^ self
+        ].
+        something == #classDefinition ifTrue:[
+            ^ self
+        ].
+        something == #classVariables ifTrue:[
+            ^ self
+        ].
+        something == #methodTrap ifTrue:[
+            ^ self
+        ].
+        something == #methodInClassRemoved ifTrue:[
+            ^ self.
+        ].
+        something == #methodDictionary ifTrue:[
+            ^ self 
+        ].
+        something == #newClass ifTrue:[
+            ^ self 
+        ].
     ].
 
     changedObject == slaveMode ifTrue:[
-	slaveMode value ~~ true ifTrue:[
-	    listValid ~~ true ifTrue:[
-		self updateList.
-	    ].
-	    self updateOutputGenerator.
-	].
-	^ self.
+        slaveMode value ~~ true ifTrue:[
+            listValid ~~ true ifTrue:[
+                self updateList.
+            ].
+            self updateOutputGenerator.
+        ].
+        ^ self.
     ].
 
     changedObject == selectionHolder ifTrue:[
-	listValid ifFalse:[
-	    self updateList.
-	].
-	^ self selectionChanged
+        listValid ifFalse:[
+            self updateList.
+        ].
+        ^ self selectionChanged
     ].
 
     changedObject == forceGeneratorTrigger ifTrue:[
-	self updateOutputGenerator.
-	^ self.
+        self updateOutputGenerator.
+        ^ self.
     ].
 
     changedObject == hideUnloadedClasses ifTrue:[
-	self invalidateList.
-	slaveMode value ~~ true ifTrue:[
-	    self updateOutputGenerator.
-	].
-	^ self.
+        self invalidateList.
+        slaveMode value ~~ true ifTrue:[
+            self updateOutputGenerator.
+        ].
+        ^ self.
     ].
 
     changedObject == updateTrigger ifTrue:[
-	self enqueueDelayedUpdateList.
-	^ self 
+        self enqueueDelayedUpdateList.
+        ^ self 
     ].
 
     changedObject == inGeneratorHolder ifTrue:[
-	self invalidateList.
-	^ self 
+        self invalidateList.
+        ^ self 
     ].
 
 "/    changedObject == outGeneratorHolder ifTrue:[
@@ -694,23 +680,24 @@
 "/    ].
 
     changedObject == packageFilter ifTrue:[
-	self invalidateList.
-	^ self 
+        self invalidateList.
+        ^ self 
     ].
     changedObject == nameSpaceFilter ifTrue:[
-	self invalidateList.
-	^ self 
+        self invalidateList.
+        ^ self 
     ].
 
     changedObject == organizerMode ifTrue:[
-	^ self
+        ^ self
     ].
 
     self invalidateList.
     ^ self
 
-    "Created: / 5.2.2000 / 13:42:06 / cg"
-    "Modified: / 18.8.2000 / 14:19:24 / cg"
+    "Created: / 05-02-2000 / 13:42:06 / cg"
+    "Modified: / 18-08-2000 / 14:19:24 / cg"
+    "Modified (format): / 25-02-2014 / 10:02:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 enqueueDelayedUpdateList
@@ -743,6 +730,13 @@
     self enqueueMessage:#updateOutputGenerator for:self arguments:#()
 !
 
+environmentChanged
+    super environmentChanged.
+    self updateList.
+
+    "Created: / 24-02-2014 / 10:20:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 forceReselect
     |selectionHolder prevSelection|
 
@@ -832,6 +826,12 @@
 !
 
 update:something with:aParameter from:changedObject
+
+    changedObject == environmentHolder ifTrue:[
+        self environmentChanged.
+        ^ self.
+    ].  
+
     (NewSystemBrowser synchronousUpdate == true
     or:[ immediateUpdate value == true ])
     ifTrue:[
@@ -857,8 +857,9 @@
     ].
     self enqueueDelayedUpdate:something with:aParameter from:changedObject.
 
-    "Created: / 5.2.2000 / 13:42:07 / cg"
-    "Modified: / 13.11.2001 / 11:30:19 / cg"
+    "Created: / 05-02-2000 / 13:42:07 / cg"
+    "Modified: / 13-11-2001 / 11:30:19 / cg"
+    "Modified: / 25-02-2014 / 09:05:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 updateListInBackground
@@ -1892,10 +1893,10 @@
 !BrowserList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_BrowserList.st,v 1.61 2014-02-22 12:42:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_BrowserList.st,v 1.62 2014-02-25 10:43:16 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_BrowserList.st,v 1.61 2014-02-22 12:42:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_BrowserList.st,v 1.62 2014-02-25 10:43:16 vrany Exp $'
 ! !