From 22c46342a0ea9928c1a15d9631dfdc85370ffe2b Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 28 Jul 2021 21:49:01 +0200 Subject: [PATCH] style: parameter annotation in same line --- .../minosoft/gui/eros/card/AbstractCard.kt | 3 +- .../gui/eros/crash/ErosCrashReport.kt | 9 ++--- .../dialogs/SimpleErosConfirmationDialog.kt | 12 +++---- .../gui/eros/dialogs/UpdateServerDialog.kt | 33 +++++++------------ .../gui/eros/main/MainErosController.kt | 30 ++++++----------- .../gui/eros/main/play/PlayMainController.kt | 18 ++++------ .../main/play/server/ServerListController.kt | 18 ++++------ .../play/server/card/ServerCardController.kt | 18 ++++------ .../server/type/ServerTypeCardController.kt | 9 ++--- 9 files changed, 50 insertions(+), 100 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/card/AbstractCard.kt b/src/main/java/de/bixilon/minosoft/gui/eros/card/AbstractCard.kt index 3b4261788..6338cf8e1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/card/AbstractCard.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/card/AbstractCard.kt @@ -21,8 +21,7 @@ import java.net.URL import java.util.* abstract class AbstractCard : ListCell(), Initializable { - @FXML - lateinit var root: HBox + @FXML lateinit var root: HBox override fun initialize(url: URL?, resourceBundle: ResourceBundle?) { this.graphic = root diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt b/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt index 0646e712e..056b6c8d4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt @@ -44,14 +44,11 @@ import java.text.SimpleDateFormat class ErosCrashReport : JavaFXWindowController() { - @FXML - private lateinit var crashReportPathDescriptionFX: TextFlow + @FXML private lateinit var crashReportPathDescriptionFX: TextFlow - @FXML - private lateinit var crashReportPathFX: Hyperlink + @FXML private lateinit var crashReportPathFX: Hyperlink - @FXML - private lateinit var detailsFX: TextArea + @FXML private lateinit var detailsFX: TextArea var crashReportPath: String? = null diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/dialogs/SimpleErosConfirmationDialog.kt b/src/main/java/de/bixilon/minosoft/gui/eros/dialogs/SimpleErosConfirmationDialog.kt index 55521f8bc..584d2ff89 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/dialogs/SimpleErosConfirmationDialog.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/dialogs/SimpleErosConfirmationDialog.kt @@ -34,14 +34,10 @@ class SimpleErosConfirmationDialog( val onCancel: () -> Unit = {}, val onConfirm: () -> Unit, ) : JavaFXWindowController() { - @FXML - lateinit var headerFX: TextFlow - @FXML - lateinit var descriptionFX: TextFlow - @FXML - lateinit var cancelButtonFX: Button - @FXML - lateinit var confirmButtonFX: Button + @FXML lateinit var headerFX: TextFlow + @FXML lateinit var descriptionFX: TextFlow + @FXML lateinit var cancelButtonFX: Button + @FXML lateinit var confirmButtonFX: Button fun show() { Platform.runLater { diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/dialogs/UpdateServerDialog.kt b/src/main/java/de/bixilon/minosoft/gui/eros/dialogs/UpdateServerDialog.kt index 75b3a1e9a..6ca72524e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/dialogs/UpdateServerDialog.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/dialogs/UpdateServerDialog.kt @@ -41,40 +41,29 @@ class UpdateServerDialog( val onCancel: () -> Unit = {}, val onUpdate: (name: String, address: String, forcedVersion: Version?) -> Unit, ) : JavaFXWindowController() { - @FXML - lateinit var descriptionFX: TextFlow + @FXML lateinit var descriptionFX: TextFlow - @FXML - lateinit var serverNameLabelFX: TextFlow + @FXML lateinit var serverNameLabelFX: TextFlow - @FXML - lateinit var serverNameFX: TextField + @FXML lateinit var serverNameFX: TextField - @FXML - lateinit var serverAddressLabelFX: TextFlow + @FXML lateinit var serverAddressLabelFX: TextFlow - @FXML - lateinit var serverAddressFX: TextField + @FXML lateinit var serverAddressFX: TextField - @FXML - lateinit var forcedVersionLabelFX: TextFlow + @FXML lateinit var forcedVersionLabelFX: TextFlow - @FXML - lateinit var forcedVersionFX: ComboBox + @FXML lateinit var forcedVersionFX: ComboBox - @FXML - lateinit var showReleasesFX: CheckBox + @FXML lateinit var showReleasesFX: CheckBox - @FXML - lateinit var showSnapshotsFX: CheckBox + @FXML lateinit var showSnapshotsFX: CheckBox - @FXML - lateinit var updateServerButtonFX: Button + @FXML lateinit var updateServerButtonFX: Button - @FXML - lateinit var cancelButtonFX: Button + @FXML lateinit var cancelButtonFX: Button fun show() { diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt index 1bd1d0c0e..5c52418f0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt @@ -38,33 +38,23 @@ import org.kordamp.ikonli.javafx.FontIcon class MainErosController : JavaFXWindowController() { - @FXML - private lateinit var logoFX: ImageView - @FXML - private lateinit var versionTextFX: Text + @FXML private lateinit var logoFX: ImageView + @FXML private lateinit var versionTextFX: Text - @FXML - private lateinit var playIconFX: FontIcon - @FXML - private lateinit var settingsIconFX: FontIcon + @FXML private lateinit var playIconFX: FontIcon + @FXML private lateinit var settingsIconFX: FontIcon - @FXML - private lateinit var helpIconFX: FontIcon + @FXML private lateinit var helpIconFX: FontIcon - @FXML - private lateinit var aboutIconFX: FontIcon + @FXML private lateinit var aboutIconFX: FontIcon - @FXML - private lateinit var exitIconFX: FontIcon + @FXML private lateinit var exitIconFX: FontIcon - @FXML - private lateinit var contentFX: Pane + @FXML private lateinit var contentFX: Pane - @FXML - private lateinit var accountImageFX: ImageView + @FXML private lateinit var accountImageFX: ImageView - @FXML - private lateinit var accountNameFX: Text + @FXML private lateinit var accountNameFX: Text private lateinit var icons: List diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/PlayMainController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/PlayMainController.kt index 473f61f29..7222e2716 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/PlayMainController.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/PlayMainController.kt @@ -34,23 +34,17 @@ import javafx.scene.layout.Pane import javafx.scene.text.TextFlow class PlayMainController : EmbeddedJavaFXController() { - @FXML - private lateinit var playTypeContentFX: Pane + @FXML private lateinit var playTypeContentFX: Pane - @FXML - private lateinit var playTypeListViewFX: ListView + @FXML private lateinit var playTypeListViewFX: ListView - @FXML - private lateinit var refreshPaneFX: GridPane + @FXML private lateinit var refreshPaneFX: GridPane - @FXML - private lateinit var refreshHeaderFX: TextFlow + @FXML private lateinit var refreshHeaderFX: TextFlow - @FXML - private lateinit var refreshText1FX: TextFlow + @FXML private lateinit var refreshText1FX: TextFlow - @FXML - private lateinit var refreshText2FX: TextFlow + @FXML private lateinit var refreshText2FX: TextFlow private lateinit var currentController: EmbeddedJavaFXController<*> diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/ServerListController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/ServerListController.kt index 6ae51fe1c..b70337bf5 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/ServerListController.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/ServerListController.kt @@ -47,24 +47,18 @@ import javafx.scene.layout.* class ServerListController : EmbeddedJavaFXController(), Refreshable { - @FXML - private lateinit var hideOfflineFX: CheckBox + @FXML private lateinit var hideOfflineFX: CheckBox - @FXML - private lateinit var hideFullFX: CheckBox + @FXML private lateinit var hideFullFX: CheckBox - @FXML - private lateinit var hideEmptyFX: CheckBox + @FXML private lateinit var hideEmptyFX: CheckBox - @FXML - private lateinit var addServerButtonFX: Button + @FXML private lateinit var addServerButtonFX: Button - @FXML - private lateinit var serverListViewFX: ListView + @FXML private lateinit var serverListViewFX: ListView - @FXML - private lateinit var serverInfoFX: AnchorPane + @FXML private lateinit var serverInfoFX: AnchorPane var customRefresh: (() -> Unit)? = null diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/ServerCardController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/ServerCardController.kt index d242e903f..5683d1f20 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/ServerCardController.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/ServerCardController.kt @@ -38,23 +38,17 @@ import javafx.scene.text.TextFlow import java.io.ByteArrayInputStream class ServerCardController : AbstractCard() { - @FXML - private lateinit var faviconFX: ImageView + @FXML private lateinit var faviconFX: ImageView - @FXML - private lateinit var serverNameFX: TextFlow + @FXML private lateinit var serverNameFX: TextFlow - @FXML - private lateinit var motdFX: TextFlow + @FXML private lateinit var motdFX: TextFlow - @FXML - private lateinit var pingFX: Text + @FXML private lateinit var pingFX: Text - @FXML - private lateinit var playerCountFX: Text + @FXML private lateinit var playerCountFX: Text - @FXML - private lateinit var serverVersionFX: Text + @FXML private lateinit var serverVersionFX: Text private var lastServerCard: ServerCard? = null diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/type/ServerTypeCardController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/type/ServerTypeCardController.kt index a407c3fa5..66506c2a7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/type/ServerTypeCardController.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/type/ServerTypeCardController.kt @@ -24,14 +24,11 @@ import javafx.scene.text.TextFlow import org.kordamp.ikonli.javafx.FontIcon class ServerTypeCardController : AbstractCard() { - @FXML - lateinit var iconFX: FontIcon + @FXML lateinit var iconFX: FontIcon - @FXML - lateinit var headerFX: TextFlow + @FXML lateinit var headerFX: TextFlow - @FXML - lateinit var textFX: TextFlow + @FXML lateinit var textFX: TextFlow override fun updateItem(item: ServerTypes?, empty: Boolean) { super.updateItem(item, empty)