diff --git a/src/main/kotlin/com/marvinelsen/willow/ui/cells/EntryCellFactory.kt b/src/main/kotlin/com/marvinelsen/willow/ui/cells/EntryCellFactory.kt index d00633c..3683989 100644 --- a/src/main/kotlin/com/marvinelsen/willow/ui/cells/EntryCellFactory.kt +++ b/src/main/kotlin/com/marvinelsen/willow/ui/cells/EntryCellFactory.kt @@ -110,9 +110,15 @@ internal class EntryCell(private val resources: ResourceBundle, private val conf ) ) - val definition = entry.cedictDefinitions.joinToString( - separator = " / " - ) { it.joinToString(separator = "; ") } + val definition = when { + entry.cedictDefinitions.isNotEmpty() -> entry.cedictDefinitions.joinToString( + separator = " / " + ) { it.joinToString(separator = "; ") } + + entry.crossStraitsDefinitions.isNotEmpty() -> entry.crossStraitsDefinitions.joinToString(separator = " / ") { it.definition } + entry.moedictDefinitions.isNotEmpty() -> entry.moedictDefinitions.joinToString(separator = " / ") { it.definition } + else -> error("No definition for entry") + } labelDefinition.text = definition contextMenu = createContextMenuForEntry(entry, resources)