codinux
/
BankingClient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Started to implement to remove unnecessary spaces in usage, but now having to few

This commit is contained in:
dankito 2020-09-17 11:57:19 +02:00
parent b4d466ebf2
commit 497b82ce09
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/commonMain/kotlin/net/dankito/utils/multiplatform/CommonExtensions.kt
View File

@ -1,6 +1,12 @@
package net.dankito.utils.multiplatform
val Char.isLowerCase: Boolean
get() = toLowerCase() == this
val Char.isUpperCase: Boolean
get() = isLowerCase == false
fun Throwable?.getInnerExceptionMessage(maxDepth: Int = 3): String? {
return this?.getInnerException(maxDepth)?.message

22
fints4k/src/commonMain/kotlin/net/dankito/banking/fints/transactions/mt940/Mt940Parser.kt
View File

@ -5,6 +5,7 @@ import net.dankito.banking.fints.transactions.mt940.model.*
import net.dankito.utils.multiplatform.Date
import net.dankito.utils.multiplatform.DateFormatter
import net.dankito.utils.multiplatform.Month
import net.dankito.utils.multiplatform.isUpperCase
import net.dankito.utils.multiplatform.log.LoggerFactory
@ -335,7 +336,7 @@ open class Mt940Parser : IMt940Parser {
}
}
val usage = if (isFormattedUsage(usageParts)) usageParts.joinToString("")
val usage = if (isFormattedUsage(usageParts)) joinUsageParts(usageParts)
else usageParts.joinToString(" ")
val otherPartyNameString = if (otherPartyName.isEmpty()) null else otherPartyName.toString()
@ -346,6 +347,25 @@ open class Mt940Parser : IMt940Parser {
)
}
protected open fun joinUsageParts(usageParts: List<String>): String {
val usage = StringBuilder()
usageParts.firstOrNull()?.let {
usage.append(it)
}
for (i in 1..usageParts.size - 1) {
val part = usageParts[i]
if (part.isNotEmpty() && part.first().isUpperCase && usageParts[i - 1].last().isUpperCase == false) {
usage.append(" ")
}
usage.append(part)
}
return usage.toString()
}
protected open fun isFormattedUsage(usageParts: List<String>): Boolean {
return usageParts.any { UsageTypeRegex.find(it) != null }
}