From 6898d240e5cd1125da538122264f08accaa8e052 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Wed, 24 Jul 2019 20:55:45 +0200
Subject: [PATCH] Replace javafx duration with java.time
---
Dockerfile | 0
.../playpad/server/json/DurationSerializerHandler.scala | 5 +++--
.../de/tobias/playpad/server/project/settings/Fade.scala | 2 +-
.../tobias/playpad/server/project/settings/PadSettings.scala | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 Dockerfile
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala b/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala
index 8b10f50..0c9c941 100644
--- a/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/json/DurationSerializerHandler.scala
@@ -1,7 +1,8 @@
package de.tobias.playpad.server.json
+import java.time.Duration
+
import com.google.gson.{JsonElement, JsonPrimitive}
-import javafx.util.Duration
class DurationSerializerHandler extends SerializerHandler {
override def serialize(value: Any): JsonPrimitive = value match {
@@ -10,7 +11,7 @@ class DurationSerializerHandler extends SerializerHandler {
}
override def deserialize(jsonElement: JsonElement): Duration = jsonElement match {
- case jsonPrimitive: JsonPrimitive => new Duration(jsonPrimitive.getAsInt)
+ case jsonPrimitive: JsonPrimitive => Duration.ofMillis(jsonPrimitive.getAsInt)
case _ => Duration.ZERO
}
}
diff --git a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala b/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
index 2aa834f..ccc17bb 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/settings/Fade.scala
@@ -1,9 +1,9 @@
package de.tobias.playpad.server.project.settings
+import java.time.Duration
import java.util.UUID
import de.tobias.playpad.server.json._
-import javafx.util.Duration
class Fade {
diff --git a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala b/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
index f6564b5..639171e 100644
--- a/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/settings/PadSettings.scala
@@ -1,10 +1,10 @@
package de.tobias.playpad.server.project.settings
+import java.time.Duration
import java.util.UUID
import de.tobias.playpad.server.json._
import de.tobias.playpad.server.project.{Design, Pad}
-import javafx.util.Duration
class PadSettings {
--
GitLab