From c8c1d2ebbb87cf550f4df9bd9ab8a35153aef21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wieland=20Sch=C3=B6bl?= Date: Mon, 12 Apr 2021 15:38:56 +0200 Subject: [PATCH] Refactor ObjectInfoData to Kotlin --- .../registration/config/ObjectInfoData.java | 16 ---------------- .../config/ObjectInfoConfigHandler.kt | 2 +- .../hmcore/registration/config/ObjectInfoData.kt | 7 +++++++ 3 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 src/main/java/org/hmcore/registration/config/ObjectInfoData.java create mode 100644 src/main/kotlin/org/hmcore/registration/config/ObjectInfoData.kt diff --git a/src/main/java/org/hmcore/registration/config/ObjectInfoData.java b/src/main/java/org/hmcore/registration/config/ObjectInfoData.java deleted file mode 100644 index 616f17e..0000000 --- a/src/main/java/org/hmcore/registration/config/ObjectInfoData.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.hmcore.registration.config; - -import org.jetbrains.annotations.Nullable; - -public class ObjectInfoData { - - public final String objectName; - public final String objectInfoChosen; - public final String _availableOptions; - - public ObjectInfoData(String objectName, @Nullable String objectInfoChosen, String availableOptions) { - this.objectName = objectName; - this.objectInfoChosen = objectInfoChosen == null ? "default" : objectInfoChosen; - _availableOptions = availableOptions; - } -} diff --git a/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt index 9e3cc1e..4446164 100644 --- a/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt +++ b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoConfigHandler.kt @@ -8,5 +8,5 @@ import extensions.map private val GSON = GsonBuilder().setPrettyPrinting().create() -fun Array>.generateFreshJSON(): String = +internal fun Array>.generateFreshJSON(): String = GSON.toJson(ObjectInfoConfig(map { ModuleInfo(it.name, it.objectInfoArray) })) \ No newline at end of file diff --git a/src/main/kotlin/org/hmcore/registration/config/ObjectInfoData.kt b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoData.kt new file mode 100644 index 0000000..0d89f2c --- /dev/null +++ b/src/main/kotlin/org/hmcore/registration/config/ObjectInfoData.kt @@ -0,0 +1,7 @@ +package org.hmcore.registration.config + +internal class ObjectInfoData @JvmOverloads constructor( + @JvmField val objectInfoName: String, + @JvmField val availableOptions: String, + @JvmField val objectInfoChosen: String = "default", +) \ No newline at end of file