diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 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 8b10f50166495b31d9dab68e4b5e6bf15eb67c5c..0c9c941286f441383405675a6f5cf313b5a77a80 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 2aa834fbc44ee06e3d3ea786722c26fee9e48e4b..ccc17bb20cb7d5da0bcb76acbf70b555a8412135 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 f6564b58d9d707bf748c031594e754bb9078f869..639171ef20cd1011f093de6ae1903bd9cf0f3205 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 {