diff --git a/src/Soil-Core/SoilIndexedDictionary.class.st b/src/Soil-Core/SoilIndexedDictionary.class.st index 02417dd9..8a90ba8f 100644 --- a/src/Soil-Core/SoilIndexedDictionary.class.st +++ b/src/Soil-Core/SoilIndexedDictionary.class.st @@ -35,7 +35,7 @@ SoilIndexedDictionary >> at: key [ SoilIndexedDictionary >> at: key ifAbsent: aBlock [ | found | found := self basicAt: key ifAbsent: [ ^ aBlock value ]. - ^ transaction proxyForObjectId: found asSoilObjectId + ^ transaction proxyForObjectId: found ] { #category : #accessing } @@ -55,7 +55,7 @@ SoilIndexedDictionary >> at: key put: anObject [ { #category : #accessing } SoilIndexedDictionary >> atIndex: anInteger [ ^ (self newIterator atIndex: anInteger) - ifNotNil: [ :objectId | transaction proxyForObjectId: objectId ] + ifNotNil: [ :objectId | transaction proxyForObjectId: objectId ] ] @@ -77,14 +77,14 @@ SoilIndexedDictionary >> do: aBlock [ { #category : #accessing } SoilIndexedDictionary >> first [ - ^ self proxyFromByteArray: self newIterator first + ^ transaction proxyForObjectId: self newIterator first ] { #category : #accessing } SoilIndexedDictionary >> first: anInteger [ ^ (self newIterator first: anInteger) collect: [ :each | - self proxyFromByteArray: each ] + transaction proxyForObjectId: each ] ] { #category : #testing } @@ -130,7 +130,7 @@ SoilIndexedDictionary >> keySize: anInteger [ { #category : #accessing } SoilIndexedDictionary >> last [ - ^ self proxyFromByteArray: self newIterator last + ^ transaction proxyForObjectId: self newIterator last ] @@ -157,7 +157,7 @@ SoilIndexedDictionary >> newIterator [ { #category : #accessing } SoilIndexedDictionary >> nextAfter: key [ - ^ self proxyFromByteArray: (self newIterator nextAfter: key) value + ^ transaction proxyForObjectId: (self newIterator nextAfter: key) value ] { #category : #private } @@ -184,12 +184,6 @@ SoilIndexedDictionary >> printOn: aStream [ aStream << ' id=' << id asString ] -{ #category : #enumerating } -SoilIndexedDictionary >> proxyFromByteArray: aByteArray [ - - ^ transaction proxyForObjectId: aByteArray asSoilObjectId -] - { #category : #removing } SoilIndexedDictionary >> removeKey: key [ ^ self @@ -212,7 +206,7 @@ SoilIndexedDictionary >> removeKey: key ifAbsent: aBlock [ { #category : #accessing } SoilIndexedDictionary >> second [ - ^ self proxyFromByteArray: (self newIterator first; next) + ^ transaction proxyForObjectId: (self newIterator first; next) ] { #category : #accessing } @@ -264,5 +258,5 @@ SoilIndexedDictionary >> soilMaterialized: aMaterializer [ { #category : #accessing } SoilIndexedDictionary >> values [ - ^ self newIterator values collect: [ :each | self proxyFromByteArray: each ] + ^ self newIterator values collect: [ :each | transaction proxyForObjectId: each ] ] diff --git a/src/Soil-Serializer/SoilMaterializer.class.st b/src/Soil-Serializer/SoilMaterializer.class.st index 0f05013f..7e7eb794 100644 --- a/src/Soil-Serializer/SoilMaterializer.class.st +++ b/src/Soil-Serializer/SoilMaterializer.class.st @@ -171,7 +171,7 @@ SoilMaterializer >> nextDictionary: aClass [ SoilMaterializer >> nextExternalReference [ | index | index := self nextLengthEncodedInteger. - ^ transaction proxyForObjectId: (externalObjectRegistry referenceAt: index) + ^ transaction proxyForObjectId: (externalObjectRegistry referenceAt: index) ] { #category : #reading }