feat(mps-model-adapters): full support for recreating an MPS project

The bulk sync so far could only synchronize existing models, but not create new ones.
modelix · Jan 22, 2025 · 16f4e25 · 16f4e25
1 parent 3d57f9a
commit 16f4e25
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/model-datastructure/src/commonMain/kotlin/org/modelix/model/persistent/CPNode.kt b/model-datastructure/src/commonMain/kotlin/org/modelix/model/persistent/CPNode.kt
@@ -1,5 +1,7 @@
 package org.modelix.model.persistent
 
+import org.modelix.model.api.IPropertyReference
+import org.modelix.model.api.IReferenceLinkReference
 import org.modelix.model.lazy.COWArrays.copy
 import org.modelix.model.lazy.COWArrays.insert
 import org.modelix.model.lazy.COWArrays.remove
@@ -68,12 +70,14 @@ class CPNode private constructor(
     }
 
     fun getPropertyValue(role: String?): String? {
-        val index = propertyRoles.asList().binarySearch(role)
+        if (role == null) return null
+        val index = propertyRoles.indexOfFirst { IPropertyReference.fromUnclassifiedString(it).matches(IPropertyReference.fromUnclassifiedString(role)) }
         return if (index < 0) null else propertyValues[index]
     }
 
     fun getReferenceTarget(role: String?): CPNodeRef? {
-        val index = referenceRoles.asList().binarySearch(role)
+        if (role == null) return null
+        val index = referenceRoles.indexOfFirst { IReferenceLinkReference.fromUnclassifiedString(it).matches(IReferenceLinkReference.fromUnclassifiedString(role)) }
         return if (index < 0) null else referenceTargets[index]
     }
 
@@ -108,7 +112,7 @@ class CPNode private constructor(
     }
 
     fun withPropertyValue(role: String, value: String?): CPNode {
-        var index = propertyRoles.asList().binarySearch(role)
+        var index = propertyRoles.indexOf(role)
         return if (value == null) {
             if (index < 0) {
                 this
@@ -127,15 +131,14 @@ class CPNode private constructor(
             }
         } else {
             if (index < 0) {
-                index = -(index + 1)
                 create(
                     id,
                     concept,
                     parentId,
                     roleInParent,
                     childrenIds,
-                    insert(propertyRoles, index, role),
-                    insert(propertyValues, index, value),
+                    insert(propertyRoles, propertyRoles.size, role),
+                    insert(propertyValues, propertyValues.size, value),
                     referenceRoles,
                     referenceTargets,
                 )
@@ -156,7 +159,7 @@ class CPNode private constructor(
     }
 
     fun withReferenceTarget(role: String, target: CPNodeRef?): CPNode {
-        var index = referenceRoles.asList().binarySearch(role)
+        var index = referenceRoles.indexOf(role)
         return if (target == null) {
             if (index < 0) {
                 this
@@ -169,7 +172,6 @@ class CPNode private constructor(
             }
         } else {
             if (index < 0) {
-                index = -(index + 1)
                 create(
                     id,
                     concept,
@@ -178,8 +180,8 @@ class CPNode private constructor(
                     childrenIds,
                     propertyRoles,
                     propertyValues,
-                    insert(referenceRoles, index, role),
-                    insert(referenceTargets, index, target),
+                    insert(referenceRoles, referenceRoles.size, role),
+                    insert(referenceTargets, referenceTargets.size, target),
                 )
             } else {
                 create(
@@ -190,7 +192,7 @@ class CPNode private constructor(
                     childrenIds,
                     propertyRoles,
                     propertyValues,
-                    referenceRoles,
+                    set(referenceRoles, index, referenceRoles[index]),
                     set(referenceTargets, index, target),
                 )
             }