AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 20:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

style: parameter annotation in same line

Browse Source
This commit is contained in:
Bixilon 2021-07-28 21:49:01 +02:00
parent c5e0256ba4
commit 22c46342a0
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
9 changed files with 50 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/bixilon/minosoft/gui/eros/card/AbstractCard.kt
View File

@ -21,8 +21,7 @@ import java.net.URL
import java.util.* import java.util.*
abstract class AbstractCard<T> : ListCell<T>(), Initializable { abstract class AbstractCard<T> : ListCell<T>(), Initializable {
@FXML @FXML lateinit var root: HBox
lateinit var root: HBox
override fun initialize(url: URL?, resourceBundle: ResourceBundle?) { override fun initialize(url: URL?, resourceBundle: ResourceBundle?) {
this.graphic = root this.graphic = root

9
src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt
View File

@ -44,14 +44,11 @@ import java.text.SimpleDateFormat
class ErosCrashReport : JavaFXWindowController() { class ErosCrashReport : JavaFXWindowController() {
@FXML @FXML private lateinit var crashReportPathDescriptionFX: TextFlow
private lateinit var crashReportPathDescriptionFX: TextFlow
@FXML @FXML private lateinit var crashReportPathFX: Hyperlink
private lateinit var crashReportPathFX: Hyperlink
@FXML @FXML private lateinit var detailsFX: TextArea
private lateinit var detailsFX: TextArea
var crashReportPath: String? = null var crashReportPath: String? = null

12
src/main/java/de/bixilon/minosoft/gui/eros/dialogs/SimpleErosConfirmationDialog.kt
View File

@ -34,14 +34,10 @@ class SimpleErosConfirmationDialog(
val onCancel: () -> Unit = {}, val onCancel: () -> Unit = {},
val onConfirm: () -> Unit, val onConfirm: () -> Unit,
) : JavaFXWindowController() { ) : JavaFXWindowController() {
@FXML @FXML lateinit var headerFX: TextFlow
lateinit var headerFX: TextFlow @FXML lateinit var descriptionFX: TextFlow
@FXML @FXML lateinit var cancelButtonFX: Button
lateinit var descriptionFX: TextFlow @FXML lateinit var confirmButtonFX: Button
@FXML
lateinit var cancelButtonFX: Button
@FXML
lateinit var confirmButtonFX: Button
fun show() { fun show() {
Platform.runLater { Platform.runLater {

33
src/main/java/de/bixilon/minosoft/gui/eros/dialogs/UpdateServerDialog.kt
View File

@ -41,40 +41,29 @@ class UpdateServerDialog(
val onCancel: () -> Unit = {}, val onCancel: () -> Unit = {},
val onUpdate: (name: String, address: String, forcedVersion: Version?) -> Unit, val onUpdate: (name: String, address: String, forcedVersion: Version?) -> Unit,
) : JavaFXWindowController() { ) : JavaFXWindowController() {
@FXML @FXML lateinit var descriptionFX: TextFlow
lateinit var descriptionFX: TextFlow
@FXML @FXML lateinit var serverNameLabelFX: TextFlow
lateinit var serverNameLabelFX: TextFlow
@FXML @FXML lateinit var serverNameFX: TextField
lateinit var serverNameFX: TextField
@FXML @FXML lateinit var serverAddressLabelFX: TextFlow
lateinit var serverAddressLabelFX: TextFlow
@FXML @FXML lateinit var serverAddressFX: TextField
lateinit var serverAddressFX: TextField
@FXML @FXML lateinit var forcedVersionLabelFX: TextFlow
lateinit var forcedVersionLabelFX: TextFlow
@FXML @FXML lateinit var forcedVersionFX: ComboBox<Version>
lateinit var forcedVersionFX: ComboBox<Version>
@FXML @FXML lateinit var showReleasesFX: CheckBox
lateinit var showReleasesFX: CheckBox
@FXML @FXML lateinit var showSnapshotsFX: CheckBox
lateinit var showSnapshotsFX: CheckBox
@FXML @FXML lateinit var updateServerButtonFX: Button
lateinit var updateServerButtonFX: Button
@FXML @FXML lateinit var cancelButtonFX: Button
lateinit var cancelButtonFX: Button
fun show() { fun show() {

30
src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt
View File

@ -38,33 +38,23 @@ import org.kordamp.ikonli.javafx.FontIcon
class MainErosController : JavaFXWindowController() { class MainErosController : JavaFXWindowController() {
@FXML @FXML private lateinit var logoFX: ImageView
private lateinit var logoFX: ImageView @FXML private lateinit var versionTextFX: Text
@FXML
private lateinit var versionTextFX: Text
@FXML @FXML private lateinit var playIconFX: FontIcon
private lateinit var playIconFX: FontIcon @FXML private lateinit var settingsIconFX: FontIcon
@FXML
private lateinit var settingsIconFX: FontIcon
@FXML @FXML private lateinit var helpIconFX: FontIcon
private lateinit var helpIconFX: FontIcon
@FXML @FXML private lateinit var aboutIconFX: FontIcon
private lateinit var aboutIconFX: FontIcon
@FXML @FXML private lateinit var exitIconFX: FontIcon
private lateinit var exitIconFX: FontIcon
@FXML @FXML private lateinit var contentFX: Pane
private lateinit var contentFX: Pane
@FXML @FXML private lateinit var accountImageFX: ImageView
private lateinit var accountImageFX: ImageView
@FXML @FXML private lateinit var accountNameFX: Text
private lateinit var accountNameFX: Text
private lateinit var icons: List<FontIcon> private lateinit var icons: List<FontIcon>

18
src/main/java/de/bixilon/minosoft/gui/eros/main/play/PlayMainController.kt
View File

@ -34,23 +34,17 @@ import javafx.scene.layout.Pane
import javafx.scene.text.TextFlow import javafx.scene.text.TextFlow
class PlayMainController : EmbeddedJavaFXController<Pane>() { class PlayMainController : EmbeddedJavaFXController<Pane>() {
@FXML @FXML private lateinit var playTypeContentFX: Pane
private lateinit var playTypeContentFX: Pane
@FXML @FXML private lateinit var playTypeListViewFX: ListView<ServerTypes>
private lateinit var playTypeListViewFX: ListView<ServerTypes>
@FXML @FXML private lateinit var refreshPaneFX: GridPane
private lateinit var refreshPaneFX: GridPane
@FXML @FXML private lateinit var refreshHeaderFX: TextFlow
private lateinit var refreshHeaderFX: TextFlow
@FXML @FXML private lateinit var refreshText1FX: TextFlow
private lateinit var refreshText1FX: TextFlow
@FXML @FXML private lateinit var refreshText2FX: TextFlow
private lateinit var refreshText2FX: TextFlow
private lateinit var currentController: EmbeddedJavaFXController<*> private lateinit var currentController: EmbeddedJavaFXController<*>

18
src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/ServerListController.kt
View File

@ -47,24 +47,18 @@ import javafx.scene.layout.*
class ServerListController : EmbeddedJavaFXController<Pane>(), Refreshable { class ServerListController : EmbeddedJavaFXController<Pane>(), Refreshable {
@FXML @FXML private lateinit var hideOfflineFX: CheckBox
private lateinit var hideOfflineFX: CheckBox
@FXML @FXML private lateinit var hideFullFX: CheckBox
private lateinit var hideFullFX: CheckBox
@FXML @FXML private lateinit var hideEmptyFX: CheckBox
private lateinit var hideEmptyFX: CheckBox
@FXML @FXML private lateinit var addServerButtonFX: Button
private lateinit var addServerButtonFX: Button
@FXML @FXML private lateinit var serverListViewFX: ListView<ServerCard>
private lateinit var serverListViewFX: ListView<ServerCard>
@FXML @FXML private lateinit var serverInfoFX: AnchorPane
private lateinit var serverInfoFX: AnchorPane
var customRefresh: (() -> Unit)? = null var customRefresh: (() -> Unit)? = null

18
src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/ServerCardController.kt
View File

@ -38,23 +38,17 @@ import javafx.scene.text.TextFlow
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
class ServerCardController : AbstractCard<ServerCard>() { class ServerCardController : AbstractCard<ServerCard>() {
@FXML @FXML private lateinit var faviconFX: ImageView
private lateinit var faviconFX: ImageView
@FXML @FXML private lateinit var serverNameFX: TextFlow
private lateinit var serverNameFX: TextFlow
@FXML @FXML private lateinit var motdFX: TextFlow
private lateinit var motdFX: TextFlow
@FXML @FXML private lateinit var pingFX: Text
private lateinit var pingFX: Text
@FXML @FXML private lateinit var playerCountFX: Text
private lateinit var playerCountFX: Text
@FXML @FXML private lateinit var serverVersionFX: Text
private lateinit var serverVersionFX: Text
private var lastServerCard: ServerCard? = null private var lastServerCard: ServerCard? = null

9
src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/type/ServerTypeCardController.kt
View File

@ -24,14 +24,11 @@ import javafx.scene.text.TextFlow
import org.kordamp.ikonli.javafx.FontIcon import org.kordamp.ikonli.javafx.FontIcon
class ServerTypeCardController : AbstractCard<ServerTypes>() { class ServerTypeCardController : AbstractCard<ServerTypes>() {
@FXML @FXML lateinit var iconFX: FontIcon
lateinit var iconFX: FontIcon
@FXML @FXML lateinit var headerFX: TextFlow
lateinit var headerFX: TextFlow
@FXML @FXML lateinit var textFX: TextFlow
lateinit var textFX: TextFlow
override fun updateItem(item: ServerTypes?, empty: Boolean) { override fun updateItem(item: ServerTypes?, empty: Boolean) {
super.updateItem(item, empty) super.updateItem(item, empty)