[Editor] Refactor editor code (i.e. 3-space tabs) | optimize imports

2021-02-05 21:05:49 +01:00
parent eec8ec8a80
commit 064a4976a8
29 changed files with 717 additions and 691 deletions
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/App.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/App.kt
@@ -4,7 +4,10 @@ import com.bartlomiejpluta.base.editor.view.main.MainView
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.ConfigurableApplicationContext
-import tornadofx.*
+import tornadofx.App
+import tornadofx.DIContainer
+import tornadofx.FX
+import tornadofx.launch
 import kotlin.reflect.KClass

@SpringBootApplication
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/service/DefaultUndoRedoService.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/command/service/DefaultUndoRedoService.kt
@@ -1,7 +1,6 @@
 package com.bartlomiejpluta.base.editor.command.service

 import com.bartlomiejpluta.base.editor.command.model.Undoable
-import org.apache.commons.logging.LogFactory
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
 import java.util.*
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/Brush.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/brush/Brush.kt
@@ -2,7 +2,9 @@ package com.bartlomiejpluta.base.editor.model.map.brush

 import com.bartlomiejpluta.base.editor.model.tileset.Tile
 import javafx.beans.property.SimpleIntegerProperty
-import tornadofx.*
+import tornadofx.getValue
+import tornadofx.observableListOf
+import tornadofx.setValue

 class Brush(newBrush: Array<Array<Tile>>) {
   val brush = observableListOf<Tile>()
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/layer/TileLayer.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/map/layer/TileLayer.kt
@@ -2,8 +2,7 @@ package com.bartlomiejpluta.base.editor.model.map.layer

 import com.bartlomiejpluta.base.editor.model.tileset.Tile
 import javafx.beans.property.SimpleStringProperty
-
-import tornadofx.*
+import tornadofx.getValue

 class TileLayer(name: String, val layer: Array<Array<Tile?>>) : Layer {

--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/tileset/TileSet.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/model/tileset/TileSet.kt
@@ -22,7 +22,15 @@ class TileSet(private val image: Image, val rows: Int, val columns: Int) {
   private fun cropTile(row: Int, column: Int): Tile {
      val reader = image.pixelReader
      val buffer = ByteBuffer.allocate(tileWidth * tileHeight * 4)
-        reader.getPixels(column * tileWidth, row * tileHeight, tileWidth, tileHeight, PixelFormat.getByteBgraInstance(), buffer, 4 * tileWidth)
+      reader.getPixels(
+         column * tileWidth,
+         row * tileHeight,
+         tileWidth,
+         tileHeight,
+         PixelFormat.getByteBgraInstance(),
+         buffer,
+         4 * tileWidth
+      )
      val tile = WritableImage(tileWidth, tileHeight)
      val writer = tile.pixelWriter
      writer.setPixels(0, 0, tileWidth, tileHeight, PixelFormat.getByteBgraInstance(), buffer, 4 * tileWidth)
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapCanvas.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapCanvas.kt
@@ -20,7 +20,7 @@ class MapCanvas(val map: GameMapVM, private val painter: MapPainter) : Renderabl


   override fun render(gc: GraphicsContext) {
-        gc.clearRect(0.0, 0.0, gc.canvas.width, gc.canvas.height);
+      gc.clearRect(0.0, 0.0, gc.canvas.width, gc.canvas.height)

       renderBackground(gc)

--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPainter.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/map/MapPainter.kt
@@ -4,8 +4,8 @@ import com.bartlomiejpluta.base.editor.model.tileset.Tile
 import com.bartlomiejpluta.base.editor.render.canvas.input.MapMouseEvent
 import com.bartlomiejpluta.base.editor.render.canvas.input.MapMouseEventHandler
 import com.bartlomiejpluta.base.editor.render.model.Renderable
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
 import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
+import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
 import javafx.beans.property.IntegerProperty
 import javafx.scene.canvas.GraphicsContext
 import javafx.scene.input.MouseButton
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetCanvas.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/render/canvas/tileset/TileSetCanvas.kt
@@ -18,7 +18,7 @@ class TileSetCanvas(private val tileSet: TileSet, brushVM: BrushVM) : Renderable
   private var mouseColumn = -1

   override fun render(gc: GraphicsContext) {
-        gc.clearRect(0.0, 0.0, gc.canvas.width, gc.canvas.height);
+      gc.clearRect(0.0, 0.0, gc.canvas.width, gc.canvas.height)

       renderTiles(gc)
      selection.render(gc)
@@ -28,7 +28,12 @@ class TileSetCanvas(private val tileSet: TileSet, brushVM: BrushVM) : Renderable
      for ((row, columns) in tiles.withIndex()) {
         for ((column, tile) in columns.withIndex()) {
            gc.fill = if ((row + column) % 2 == 0) BACKGROUND_COLOR1 else BACKGROUND_COLOR2
-                gc.fillRect(column * tile.image.width, row * tile.image.height, tileSet.tileWidth.toDouble(), tileSet.tileHeight.toDouble())
+            gc.fillRect(
+               column * tile.image.width,
+               row * tile.image.height,
+               tileSet.tileWidth.toDouble(),
+               tileSet.tileHeight.toDouble()
+            )
            gc.drawImage(tile.image, column * tile.image.width, row * tile.image.height)
         }
      }
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/map/MapPane.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/component/map/MapPane.kt
@@ -4,15 +4,20 @@ import com.bartlomiejpluta.base.editor.render.canvas.input.MapMouseEvent
 import com.bartlomiejpluta.base.editor.render.canvas.map.MapCanvas
 import com.bartlomiejpluta.base.editor.render.canvas.map.MapPainter
 import com.bartlomiejpluta.base.editor.render.canvas.map.MapPaintingTrace
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
 import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
+import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
 import javafx.beans.property.IntegerProperty
 import javafx.event.EventHandler
 import javafx.scene.canvas.Canvas
 import javafx.scene.input.MouseEvent


-class MapPane(map: GameMapVM, brushVM: BrushVM, selectedLayer: IntegerProperty, paintingCallback: (MapPaintingTrace) -> Unit) : Canvas(), EventHandler<MouseEvent> {
+class MapPane(
+   map: GameMapVM,
+   brushVM: BrushVM,
+   selectedLayer: IntegerProperty,
+   paintingCallback: (MapPaintingTrace) -> Unit
+) : Canvas(), EventHandler<MouseEvent> {
   private var tileSet = map.tileSet
   private val painter = MapPainter(map, brushVM, selectedLayer, paintingCallback)
   private val mapCanvas = MapCanvas(map, painter)
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/fragment/MapFragment.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/fragment/MapFragment.kt
@@ -6,8 +6,8 @@ import com.bartlomiejpluta.base.editor.model.map.layer.Layer
 import com.bartlomiejpluta.base.editor.model.map.map.GameMap
 import com.bartlomiejpluta.base.editor.view.component.map.MapPane
 import com.bartlomiejpluta.base.editor.view.component.tileset.TileSetPane
-import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
 import com.bartlomiejpluta.base.editor.viewmodel.map.BrushVM
+import com.bartlomiejpluta.base.editor.viewmodel.map.GameMapVM
 import javafx.beans.property.SimpleDoubleProperty
 import javafx.beans.property.SimpleIntegerProperty
 import javafx.scene.control.TableView
@@ -95,7 +95,10 @@ class MapFragment : Fragment() {
                  }

                  button(graphic = FontIcon("fa-chevron-down")) {
-                            enableWhen(selectedLayer.lessThan(mapVM.layers.sizeProperty().minus(1)).and(selectedLayer.greaterThanOrEqualTo(0)))
+                     enableWhen(
+                        selectedLayer.lessThan(mapVM.layers.sizeProperty().minus(1))
+                           .and(selectedLayer.greaterThanOrEqualTo(0))
+                     )
                     action {
                        val newIndex = selectedLayer.value + 1
                        mapVM.layers.swap(selectedLayer.value, newIndex)
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/BrushVM.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/BrushVM.kt
@@ -2,7 +2,8 @@ package com.bartlomiejpluta.base.editor.viewmodel.map

 import com.bartlomiejpluta.base.editor.model.map.brush.Brush
 import com.bartlomiejpluta.base.editor.model.tileset.Tile
-import tornadofx.*
+import tornadofx.ItemViewModel
+import tornadofx.getValue

 class BrushVM : ItemViewModel<Brush>(Brush(arrayOf(arrayOf()))) {
   val brush = bind(Brush::brush)
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/GameMapVM.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/viewmodel/map/GameMapVM.kt
@@ -3,7 +3,8 @@ package com.bartlomiejpluta.base.editor.viewmodel.map
 import com.bartlomiejpluta.base.editor.model.map.layer.Layer
 import com.bartlomiejpluta.base.editor.model.map.map.GameMap
 import javafx.beans.property.SimpleListProperty
-import tornadofx.*
+import tornadofx.ItemViewModel
+import tornadofx.getValue

 class GameMapVM : ItemViewModel<GameMap>() {
   val layers: SimpleListProperty<Layer> = bind(GameMap::layers)