fix: 🐛 avoid jvm method conflict

Xanonymous-GitHub · Jul 17, 2024 · 7494945 · 7494945
1 parent 7afa5ba
commit 7494945
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/core/src/main/kotlin/tw/xcc/gumtree/model/BasicTree.kt b/core/src/main/kotlin/tw/xcc/gumtree/model/BasicTree.kt
@@ -10,13 +10,8 @@ abstract class BasicTree<T> : Tree<T> where T : BasicTree<T> {
     protected abstract val self: T
 
     private val _parent = AtomicReference<T?>()
-    final override var parent: T?
+    final override val parent: T?
         get() = synchronized(this) { _parent.get() }
-        private set(value) {
-            synchronized(this) {
-                _parent.set(value)
-            }
-        }
 
     protected val childrenMap = AtomicReference(sortedMapOf<Int, T>())
     final override val children: List<T>
@@ -25,25 +20,25 @@ abstract class BasicTree<T> : Tree<T> where T : BasicTree<T> {
     fun addChild(child: T) {
         synchronized(this) {
             val newChildrenMap = childrenMap.get()
-            newChildrenMap[newChildrenMap.size] = child.also { it.parent = self }
+            newChildrenMap[newChildrenMap.size] = child.also { it.setParentTo(self) }
             childrenMap.set(newChildrenMap)
         }
     }
 
-    fun setChildren(children: List<T>) =
+    fun setChildrenTo(children: List<T>) =
         with(childrenMap) {
             synchronized(this) {
                 val newChildrenMap = sortedMapOf<Int, T>()
                 children.forEachIndexed { i, child ->
-                    newChildrenMap[i] = child.also { it.parent = self }
+                    newChildrenMap[i] = child.also { it.setParentTo(self) }
                 }
                 this.set(newChildrenMap)
             }
         }
 
-    fun setParent(parent: T?) {
+    fun setParentTo(parent: T?) {
         synchronized(this) {
-            this.parent = parent
+            _parent.set(parent)
         }
     }
 

diff --git a/core/src/main/kotlin/tw/xcc/gumtree/model/GumTree.kt b/core/src/main/kotlin/tw/xcc/gumtree/model/GumTree.kt
@@ -19,7 +19,7 @@ class GumTree : BasicTree<GumTree>(), Traversable<GumTree>, Comparable<GumTree>
             }
 
             val newChildrenMap = childrenMap.get()
-            newChildrenMap[pos] = child.also { it.setParent(this) }
+            newChildrenMap[pos] = child.also { it.setParentTo(this) }
             childrenMap.set(newChildrenMap)
         }
     }