Skip to content

Commit d50aa34

Browse files
committed
add kotlinx.datetime and fix java datetime
1 parent 5fb5cb9 commit d50aa34

File tree

1 file changed

+14
-4
lines changed
  • ggdsl-echarts/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/echarts/translator

1 file changed

+14
-4
lines changed

ggdsl-echarts/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/echarts/translator/Parser.kt

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
package org.jetbrains.kotlinx.ggdsl.echarts.translator
66

7+
import kotlinx.datetime.LocalDate
8+
import kotlinx.datetime.LocalDateTime
9+
import kotlinx.datetime.LocalTime
710
import org.jetbrains.kotlinx.ggdsl.echarts.aes.NAME
811
import org.jetbrains.kotlinx.ggdsl.echarts.aes.X
912
import org.jetbrains.kotlinx.ggdsl.echarts.aes.Y
@@ -19,9 +22,6 @@ import org.jetbrains.kotlinx.ggdsl.ir.bindings.ScaledMapping
1922
import org.jetbrains.kotlinx.ggdsl.ir.bindings.Setting
2023
import org.jetbrains.kotlinx.ggdsl.ir.data.NamedDataInterface
2124
import org.jetbrains.kotlinx.ggdsl.ir.scale.*
22-
import java.time.LocalDate
23-
import java.time.LocalDateTime
24-
import java.time.LocalTime
2525
import kotlin.reflect.typeOf
2626

2727
@Suppress("UNCHECKED_CAST")
@@ -173,8 +173,18 @@ internal class Parser(plot: Plot) {
173173
is DefaultUnspecifiedScale, is UnspecifiedScale -> {
174174
when (this.domainType) {
175175
typeOf<String>(), typeOf<String?>(), typeOf<Char>(), typeOf<Char?>() -> AxisType.CATEGORY
176+
176177
typeOf<Number>(), typeOf<Number?>() -> AxisType.VALUE
177-
typeOf<LocalDate>(), typeOf<LocalDateTime>(), typeOf<LocalTime>(), typeOf<LocalDate?>(), typeOf<LocalDateTime?>(), typeOf<LocalTime?>() -> AxisType.TIME // TODO(kotlinx.datetime)
178+
179+
typeOf<LocalDateTime>(), typeOf<LocalDateTime?>(),
180+
typeOf<java.time.LocalDateTime>(), typeOf<java.time.LocalDateTime?>() -> AxisType.TIME
181+
182+
typeOf<LocalDate>(), typeOf<LocalDate?>(),
183+
typeOf<java.time.LocalDate>(), typeOf<java.time.LocalDate?>() -> AxisType.TIME
184+
185+
typeOf<LocalTime>(), typeOf<LocalTime?>(),
186+
typeOf<java.time.LocalTime>(), typeOf<java.time.LocalTime?>() -> AxisType.CATEGORY
187+
178188
else -> AxisType.VALUE
179189
}
180190
}

0 commit comments

Comments
 (0)