[Enh]: Mementos - Only Copy Checked Original

source/Magritte-GToolkit/MATokenSelectorElement.class.st

@@ -89,7 +89,7 @@ MATokenSelectorElement >> refreshTokens [
 
 	| currentValue |
 	self tokenContainer removeChildren.
-	currentValue := self object readModelUsing: self relationDescription.
+	currentValue := self object readUsing: self relationDescription.
 	currentValue ifNotNil: [ self addTokenFor: currentValue ].
 ]
 

source/Magritte-Model/MACheckedMemento.class.st

@@ -30,7 +30,9 @@ MACheckedMemento >> original [
 { #category : #actions }
 MACheckedMemento >> reset [
 	super reset.
-	self setOriginal: self pullRaw
+	self setOriginal: (self pullRawTransforming: [ :e | e copy ]).
+
+	"Implementation note: We copy the field values because checked mementos compare this to the current object to see if it has changed elsewhere. Unless we make a copy each time, this comparison would not be possible for complex objects, because any changes to them from outside will be reflected equally in this `original` dictionary. E.g. if `original at: #person == self model person` and outside someone does `self model person age: 25`, the check above would pass even though it should fail."
 ]
 
 { #category : #initialization }

source/Magritte-Model/MAMemento.class.st

@@ -89,15 +89,20 @@ MAMemento >> pull [
 
 { #category : #private }
 MAMemento >> pullRaw [
+
+	^ self pullRawTransforming: [ :e | e ]
+]
+
+{ #category : #private }
+MAMemento >> pullRawTransforming: aBlock [
 	| result |
 	result := Dictionary new.
 	self magritteDescription do: [ :each |
-		| value |
+		| value transformedValue |
 		value := self model readUsing: each.
-		result at: each put: value copy "see implementation note" ].
+		transformedValue := aBlock value: value.
+		result at: each put: transformedValue ].
 	^ result
-
-	"Implementation note: We copy the field values because checked mementos compare the `original` pull to the current object to see if it has changed elsewhere. Unless we make a copy each time, this comparison would not be possible for complex objects, because any changes to them from outside will be reflected equally in the `original` dictionary. E.g. if `original at: #person == self model person` and outside someone does `self model person age: 25`, the check above would pass even though it should fail."
 ]
 
 { #category : #private }
@@ -109,11 +114,6 @@ MAMemento >> push: aDictionary [
 			ifTrue: [ self model write: value using: key ] ]
 ]
 
-{ #category : #private }
-MAMemento >> readModelUsing: aDescription [
-	^ self model readUsing: aDescription
-]
-
 { #category : #private }
 MAMemento >> readUsing: aDescription [
 	^ self subclassResponsibility

source/Magritte-Model/Object.extension.st

@@ -147,13 +147,6 @@ Object >> mementoClass [
 	^ MACheckedMemento
 ]
 
-{ #category : #'*Magritte-Model' }
-Object >> readModelUsing: aDescription [
-	"This makes Object and MACheckedMemento polymorphic. It is needed e.g. for Magritte forms because inspectable field values should open on the actual object, not the memento's copies. See MAMemento>>#pullRaw for more info"
-
-	^ self readUsing: aDescription
-]
-
 { #category : #'*Magritte-Model' }
 Object >> readUsing: aDescription [
 	"This hook is needed so that e.g. mementos and adaptive models can implement their own behavior. All other entry points e.g. MADescription>>#read: should come through here"