fix(mps-sync-plugin): model-synchronizer didn't call ISyncTargetNode.…

…isOrdered(IChildLinkReference)
modelix · Feb 28, 2025 · 1eb2ad1 · 1eb2ad1
1 parent c1eead7
commit 1eb2ad1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/ModelSynchronizer.kt b/bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/ModelSynchronizer.kt
@@ -12,7 +12,6 @@ import org.modelix.model.api.NewNodeSpec
 import org.modelix.model.api.PNodeAdapter
 import org.modelix.model.api.getOriginalOrCurrentReference
 import org.modelix.model.api.getOriginalReference
-import org.modelix.model.api.isChildRoleOrdered
 import org.modelix.model.api.isOrdered
 import org.modelix.model.api.matches
 import org.modelix.model.api.mergeWith
@@ -185,7 +184,7 @@ class ModelSynchronizer(
                 return@iterateMergedRoles
             }
 
-            val isOrdered = targetParent.isChildRoleOrdered(role)
+            val isOrdered = targetParent.isOrdered(role)
 
             sourceNodes.forEachIndexed { indexInImport, expected ->
                 val existingChildren = getFilteredTargetChildren(targetParent, role)

diff --git a/model-api/src/commonMain/kotlin/org/modelix/model/api/INode.kt b/model-api/src/commonMain/kotlin/org/modelix/model/api/INode.kt
@@ -413,16 +413,17 @@ fun INode.tryResolveProperty(role: String): IProperty? {
  */
 @Deprecated("provide a IChildLinkReference")
 fun INode.isChildRoleOrdered(role: String?): Boolean {
-    return asReadableNode().isChildRoleOrdered(IChildLinkReference.fromUnclassifiedString(role))
+    return asReadableNode().isOrdered(IChildLinkReference.fromUnclassifiedString(role))
     return if (role == null) {
         true
     } else {
         this.tryResolveChildLink(role)?.isOrdered ?: true
     }
 }
 
+@Deprecated("Use isOrdered", ReplaceWith("isOrdered(role)"))
 fun IReadableNode.isChildRoleOrdered(role: IChildLinkReference): Boolean {
-    return this.tryResolveChildLink(role)?.isOrdered ?: true
+    return isOrdered(role)
 }
 
 fun INode.resolvePropertyOrFallback(role: String): IProperty {