--- a/Object.st Mon Oct 14 22:55:55 1996 +0200
+++ b/Object.st Mon Oct 14 23:25:12 1996 +0200
@@ -80,12 +80,12 @@
Caveat:
- since interrests are implemented using InterrestConverter (which are simply
+ since interests are implemented using InterestConverter (which are simply
forwarding messages), these must use the nonWeak mechanism (as done in ST-80
automatically).
The reason is that there are usually no direct references to the converters,
and those would be reclaimed if stored in a weakDictionary.
- This means, that those interrests MUST be removed with #retractInterrest
+ This means, that those interests MUST be removed with #retractInterest
(which is bug-compatible to ST-80).
We rewrite things to provide a more convenient mechanism in the future ...
@@ -2498,15 +2498,15 @@
^ self
! !
-!Object methodsFor:'interrest'!
-
-addInterrest:anInterrest
+!Object methodsFor:'interest'!
+
+addInterest:anInterest
"install an interrest forwarder.
Here, we use the nonWeakDependencies."
- self addNonWeakDependent:anInterrest
-
- "Created: 19.4.1996 / 12:33:47 / cg"
+ self addNonWeakDependent:anInterest
+
+ "Created: 14.10.1996 / 22:27:34 / stefan"
!
expressInterestIn:aspect for:anObject sendBack:aSelector
@@ -2516,7 +2516,7 @@
"/ for now, use an interestConverter, which is somewhat less efficient.
"/ In the future, a more intelligent DependencyCollection class is planned for
- self addInterrest:(InterestConverter
+ self addInterest:(InterestConverter
destination:anObject
selector:aSelector
aspect:aspect)
@@ -2578,15 +2578,16 @@
"Created: 19.4.1996 / 10:26:22 / cg"
"Modified: 19.4.1996 / 12:34:08 / cg"
-!
-
-interrests
- "return a Collection of interrests - nil if there is none.
- Here, we use the nonWeakDependents for interrests."
+ "Modified: 14.10.1996 / 22:28:20 / stefan"
+!
+
+interests
+ "return a Collection of interests - nil if there is none.
+ Here, we use the nonWeakDependents for interests."
^ self nonWeakDependents
- "Created: 19.4.1996 / 12:27:56 / cg"
+ "Created: 14.10.1996 / 22:20:51 / stefan"
!
onChangeSend:aSelector to:anObject
@@ -2596,7 +2597,7 @@
"/ for now, use an interestConverter, which is somewhat less efficient.
"/ In the future, a more intelligent DependencyCollection class is planned for
- self addInterrest:(InterestConverter
+ self addInterest:(InterestConverter
destination:anObject
selector:aSelector)
@@ -2634,15 +2635,16 @@
"Created: 19.4.1996 / 10:26:38 / cg"
"Modified: 19.4.1996 / 12:34:26 / cg"
-!
-
-removeInterrest:anInterrest
- "remove an interrest forwarder.
+ "Modified: 14.10.1996 / 22:28:27 / stefan"
+!
+
+removeInterest:anInterest
+ "remove an interest forwarder.
Here, we use the nonWeakDependencies."
- self removeNonWeakDependent:anInterrest
-
- "Created: 19.4.1996 / 12:35:01 / cg"
+ self removeNonWeakDependent:anInterest
+
+ "Created: 14.10.1996 / 22:21:59 / stefan"
!
retractInterestIn:aspect for:someOne
@@ -2654,13 +2656,13 @@
|deps|
- deps := self interrests.
+ deps := self interests.
deps notNil ifTrue:[
deps do:[:dep |
(dep isMemberOf:InterestConverter) ifTrue:[
dep destination == someOne ifTrue:[
dep aspect == aspect ifTrue:[
- self removeInterrest:dep.
+ self removeInterest:dep.
^ self
]
]
@@ -2724,6 +2726,7 @@
"Created: 19.4.1996 / 10:27:11 / cg"
"Modified: 19.4.1996 / 12:29:52 / cg"
+ "Modified: 14.10.1996 / 22:21:19 / stefan"
!
retractInterestsFor:someOne
@@ -2739,7 +2742,7 @@
coll := IdentitySet new.
- deps := self interrests.
+ deps := self interests.
deps notNil ifTrue:[
deps do:[:dep |
(dep isMemberOf:InterestConverter) ifTrue:[
@@ -2751,7 +2754,7 @@
].
coll do:[:dep |
- self removeInterrest:dep.
+ self removeInterest:dep.
].
@@ -2789,6 +2792,7 @@
"Created: 19.4.1996 / 10:23:46 / cg"
"Modified: 19.4.1996 / 12:30:03 / cg"
+ "Modified: 14.10.1996 / 22:21:25 / stefan"
! !
!Object methodsFor:'interrupt handling'!
@@ -5273,6 +5277,6 @@
!Object class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.137 1996-10-11 17:09:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.138 1996-10-14 21:25:12 stefan Exp $'
! !
Object initialize!