chris/YAEP
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix cleanup

Browse Source
This commit is contained in:
Christian Basler
2024-07-24 23:03:11 +02:00
parent 75a0789fb4
commit e673b3cb4d
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
domain/src/main/kotlin/ch/dissem/yaep/domain/GameCell.kt
View File

@@ -6,14 +6,14 @@ class GameCell<C : ItemClass<C>>(
options: Collection<Item<C>>
) {
val selectionChangedListeners = mutableListOf<(Item<C>?) -> Unit>()
val removedListeners = mutableListOf<(Collection<Item<C>>) -> Unit>()
val optionsRemovedListeners = mutableListOf<(Collection<Item<C>>) -> Unit>()
var selection: Item<C>? = selection
set(value) {
field = value
selectionChangedListeners.forEach { listener -> listener(value) }
}
val options = ObservableSet(options.toMutableSet()) { removedListeners.forEach { listener -> listener(it) } }
val options = ObservableSet(options.toMutableSet()) { optionsRemovedListeners.forEach { listener -> listener(it) } }
}
fun <C : ItemClass<C>> GameCell<C>?.mayBe(item: Item<C>, mayHaveSelection: Boolean = true) =

10
domain/src/main/kotlin/ch/dissem/yaep/domain/GameRow.kt
View File

@@ -11,12 +11,14 @@ class GameRow<C : ItemClass<C>>(
cells.forEach { cleanupOptions(it) }
}
private fun cleanupOptions(cell: GameCell<C>) {
if (cell.options.size == 1 && cell.selection == null) {
cell.selection = cell.options.first()
private fun cleanupOptions(cell: GameCell<C>, firstCall: Boolean = true) {
if ((firstCall && cell.selection != null) || (cell.options.size == 1 && cell.selection == null)) {
if (cell.selection == null) {
cell.selection = cell.options.first()
}
filter { otherCell -> otherCell != cell && otherCell.selection == null }.forEach { otherCell ->
otherCell.options.remove(cell.selection)
cleanupOptions(otherCell)
cleanupOptions(otherCell, false)
}
}
}