Merge pull request #350 from seandenigris/clean_validator-visitor-visit

[Clean]: Validation Error Catching should be in Validator Visitor
magritte-metamodel · Feb 29, 2024 · d62e8e8 · d62e8e8
2 parents 192ecbc + d418ca8
commit d62e8e8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/source/Magritte-Model/MAValidatorVisitor.class.st b/source/Magritte-Model/MAValidatorVisitor.class.st
@@ -48,9 +48,24 @@ MAValidatorVisitor >> validate: anObject using: aDescription [
 MAValidatorVisitor >> visit: aDescription [
 	"Only visit objects that are visible and that can be changed."
 
+	| errors |
 	(aDescription isVisible and: [ aDescription isReadOnly not ])
-		ifTrue: [ super visit: aDescription ].
-
+		ifFalse: [ ^ self ].
+
+	errors := OrderedCollection new.
+	[ 
+		super visit: aDescription
+	]
+		on: MAValidationError
+		do: [ :err | 
+			errors add: err. 
+			err resume ].
+
+	errors isEmpty ifFalse: [
+		MAMultipleErrors
+			description: aDescription 
+			errors: errors
+			signal: aDescription label ]
 ]
 
 { #category : #'visiting-descriptions' }

diff --git a/source/Magritte-Model/MAVisitor.class.st b/source/Magritte-Model/MAVisitor.class.st
@@ -36,21 +36,8 @@ MAVisitor class >> buildVisitorHierarchyForClass: aClass selector: aBlock classi
 { #category : #visiting }
 MAVisitor >> visit: anObject [
 	"Visit ==anObject== with the receiving visitor."
-	| errors |
-	errors := OrderedCollection new.
-	[
-		anObject acceptMagritte: self.
-	]
-		on: MAValidationError
-		do: [ :err | 
-			errors add: err. 
-			err resume ].
-
-	errors isEmpty ifFalse: [
-		MAMultipleErrors
-			description: anObject 
-			errors: errors
-			signal: anObject label ]
+
+	anObject acceptMagritte: self.
 ]
 
 { #category : #visiting }