From 108fd4276db88bd4f7c9a55bb7062e6a1e111a10 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 4 Sep 2018 11:51:54 +0800 Subject: [PATCH] fix datetime surprises in Psychomatrix --- .../PsychomatrixBase/domain/entities/Psychomatrix.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/entities/Psychomatrix.kt b/src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/entities/Psychomatrix.kt index 2a1eb88..2a9dc31 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/entities/Psychomatrix.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/entities/Psychomatrix.kt @@ -1,12 +1,11 @@ package com.github.insanusmokrassar.PsychomatrixBase.domain.entities import org.joda.time.DateTime -import java.text.DateFormat -import java.text.SimpleDateFormat -import java.util.* +import org.joda.time.format.DateTimeFormat +import org.joda.time.format.DateTimeFormatter import kotlin.math.sqrt -private val dateFormat: DateFormat = SimpleDateFormat("dMyyyy", Locale.ROOT) +private val dateFormat: DateTimeFormatter = DateTimeFormat.forPattern("dMyyyy") private fun Int.toDigits(): List { return "$this".map { "$it".toByte() } } @@ -27,7 +26,7 @@ class Psychomatrix(val date: DateTime) { ) init { - val dateDigits = dateFormat.format(date).map { "$it".toByte() }.toMutableList() + val dateDigits = dateFormat.print(date).map { "$it".toByte() }.toMutableList() val firstNumber = dateDigits.sum() val firstNumberDigits = firstNumber.toDigits()