Split materialize diagram method

repository/OpenPonk-Core/OPStonDiagramSerializer.class.st

@@ -24,6 +24,15 @@ OPStonDiagramSerializer class >> minImportVersion [
 	^ 1
 ]
 
+{ #category : 'serialize/materialize' }
+OPStonDiagramSerializer >> elementsByIdsOf: aModel [
+
+	| innerElements allElements |
+	innerElements := OPNavigatorAdapters new allChildrenFor: aModel.
+	allElements := innerElements asArray copyWith: aModel.
+	^ (allElements collect: [ :each | each uuid -> each ]) asDictionary
+]
+
 { #category : 'accessing' }
 OPStonDiagramSerializer >> formatName [
 	^ 'ston'
@@ -32,21 +41,9 @@ OPStonDiagramSerializer >> formatName [
 { #category : 'serialize/materialize' }
 OPStonDiagramSerializer >> materializeDiagramOf: aModel from: aStream [
 
-	| diagram adapters innerElements elementsById |
+	| diagram |
 	diagram := STON fromStream: aStream.
-	adapters := OPNavigatorAdapters new.
-	innerElements := adapters allChildrenFor: aModel.
-	elementsById := Dictionary new: innerElements size + 1.
-	elementsById at: aModel uuid put: aModel.
-	innerElements do: [ :each |
-		"elementsById
-			at: each uuid
-			ifPresent: [ :existing |
-				self error:
-					'There are two elements with same ID ' , each uuid asString
-					, ': ' , existing asString , ' and: ' , each asString ]
-			ifAbsentPut: each" ].
-	diagram resolveAllModelElements: elementsById.
+	diagram resolveAllModelElements: (self elementsByIdsOf: aModel).
 	^ diagram
 ]