[Refactor]: Str Reader - Extract Object Read from Kind

Logic was duplicated when visiting both elements and time. Includes some unrelated GT view enhancements

Author: seandenigris

source/Magritte-Merging/MAPatchMacro.class.st

@@ -54,20 +54,20 @@ MAPatchMacro >> diffStrings [
 	^ { lhs. rhs }
 ]
 
-{ #category : #execution }
-MAPatchMacro >> execute [
-	self operations do: #execute
-]
-
 { #category : #accessing }
-MAPatchMacro >> gtElementViewFor: aView [
+MAPatchMacro >> elementGtViewFor: aView [
 	<gtView>
 	^ aView explicit
 		title: 'Element';
 		priority: 25;
 		stencil: [ self asElement asScrollableElement ]
 ]
 
+{ #category : #execution }
+MAPatchMacro >> execute [
+	self operations do: #execute
+]
+
 { #category : #accessing }
 MAPatchMacro >> isEmptyOrNil [
 	^ self operations isEmpty
@@ -94,6 +94,16 @@ MAPatchMacro >> operationsDescription [
 		yourself
 ]
 
+{ #category : #accessing }
+MAPatchMacro >> operationsGtViewFor: aView [
+	<gtView>
+	
+	^ aView list
+		title: 'Operations';
+		priority: 35;
+		items: [ self operations ]
+]
+
 { #category : #printing }
 MAPatchMacro >> printOn: aStream [
 

source/Magritte-Merging/MAPatchOperation.class.st

@@ -56,6 +56,15 @@ MAPatchOperation >> diffStrings [
 	^ { self field label, ': ', self oldValue asString. self field label, ': ', self newValue asString }
 ]
 
+{ #category : #accessing }
+MAPatchOperation >> elementGtViewFor: aView [
+	<gtView>
+	^ aView explicit
+		title: 'Element';
+		priority: 25;
+		stencil: [ self asElement asScrollableElement ]
+]
+
 { #category : #execution }
 MAPatchOperation >> execute [
 	self isEnabled ifFalse: [ ^ self ].
@@ -73,15 +82,6 @@ MAPatchOperation >> field: anObject [
 	self cacheOldValue
 ]
 
-{ #category : #accessing }
-MAPatchOperation >> gtElementViewFor: aView [
-	<gtView>
-	^ aView explicit
-		title: 'Element';
-		priority: 25;
-		stencil: [ self asElement asScrollableElement ]
-]
-
 { #category : #comparing }
 MAPatchOperation >> hash [
 	^ ((self receiver hash bitXor: self field hash) bitXor: self oldValue hash) bitXor: self newValue hash

source/Magritte-Model/MAStringReader.class.st

@@ -34,6 +34,14 @@ MAStringReader >> nextMatchAll: aCollection on: aStream [
 	^ true
 ]
 
+{ #category : #'visiting-description' }
+MAStringReader >> objectReadFromKindOf: aDescription [
+	"This implementation can be very dangerous and might lead to a potential security hole (this is tested), since the default implementation of #readFrom: in Object evaluates the expression to find its value. Most subclasses like Number, Date, Time, ... override this implementation, but some others (like Boolean) do not."
+
+	self object: ([ aDescription kind readFrom: self stream ]
+		on: Error do: [ :err | MAReadError signal: err messageText ])
+]
+
 { #category : #visiting }
 MAStringReader >> read: aStream description: aDescription [
 	(aStream atEnd or: [ self nextMatchAll: aDescription undefined on: aStream ])
@@ -91,10 +99,8 @@ MAStringReader >> visitDurationDescription: aDescription [
 
 { #category : #'visiting-description' }
 MAStringReader >> visitElementDescription: aDescription [
-	"This implementation can be very dangerous and might lead to a potential security hole (this is tested), since the default implementation of #readFrom: in Object evaluates the expression to find its value. Most subclasses like Number, Date, Time, ... override this implementation, but some others (like Boolean) do not."
-
-	self object: ([ aDescription kind readFrom: self stream ]
-		on: Error do: [ :err | MAReadError signal: err messageText ])
+	
+	self objectReadFromKindOf: aDescription
 ]
 
 { #category : #'visiting-description' }
@@ -158,7 +164,7 @@ MAStringReader >> visitTimeDescription: aDescription [
 	string := self contents.
 	(string notEmpty and: [ string allSatisfy: [ :each | '0123456789: apm' includes: each ] ])
 		ifFalse: [ MAReadError signal ].
-	self object: (aDescription kind readFrom: string readStream)
+	self objectReadFromKindOf: aDescription
 ]
 
 { #category : #'visiting-description' }