From f6fcfdbd81e674333496d1b75716f1ed3e57a881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Sat, 6 Feb 2021 11:08:31 +0100
Subject: [PATCH] [Editor] Simplify temporary MainView code

---
 .../editor/controller/map/MapController.kt    | 12 ++-----
 .../base/editor/view/main/MainView.kt         | 36 ++++---------------
 2 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/controller/map/MapController.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/controller/map/MapController.kt
index 98c06217..6ddeb2a1 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/controller/map/MapController.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/controller/map/MapController.kt
@@ -1,22 +1,14 @@
 package com.bartlomiejpluta.base.editor.controller.map
 
-import com.bartlomiejpluta.base.editor.command.service.UndoRedoService
 import com.bartlomiejpluta.base.editor.controller.tileset.TileSetController
 import com.bartlomiejpluta.base.editor.model.map.map.GameMap
+import com.bartlomiejpluta.base.editor.model.tileset.TileSet
 import org.springframework.stereotype.Component
 import tornadofx.Controller
 
 @Component
 class MapController : Controller() {
-   private val undoRedoService: UndoRedoService by inject()
    private val tileSetController: TileSetController by inject()
 
-   private val map1 = GameMap(tileSetController.tileset, 20, 20)
-
-   private val map2 = GameMap(tileSetController.tileset, 50, 50)
-
-   fun getMap(id: Int) = when (id) {
-      1 -> map1
-      else -> map2
-   }
+   fun createMap(tileSet: TileSet, rows: Int, columns: Int) = GameMap(tileSet, rows, columns)
 }
\ No newline at end of file
diff --git a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt
index 3c4c2926..e6182236 100755
--- a/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt
+++ b/editor/src/main/kotlin/com/bartlomiejpluta/base/editor/view/main/MainView.kt
@@ -1,52 +1,30 @@
 package com.bartlomiejpluta.base.editor.view.main
 
 import com.bartlomiejpluta.base.editor.command.context.UndoableScope
-import com.bartlomiejpluta.base.editor.command.service.UndoRedoService
 import com.bartlomiejpluta.base.editor.controller.map.MapController
-import com.bartlomiejpluta.base.editor.event.RedrawMapRequestEvent
+import com.bartlomiejpluta.base.editor.controller.tileset.TileSetController
 import com.bartlomiejpluta.base.editor.view.map.MapFragment
 import javafx.scene.control.TabPane
+import org.kordamp.ikonli.javafx.FontIcon
 import tornadofx.*
 
 
 class MainView : View() {
-   private val undoRedoService: UndoRedoService by di()
    private val mapController: MapController by di()
+   private val tileSetController: TileSetController by di()
    private val tabPane = TabPane()
 
    override val root = borderpane {
-      top = hbox {
-         button("Map 1") {
+      top = toolbar {
+         button(graphic = FontIcon("fa-file-o")) {
             action {
-               val map = mapController.getMap(1)
+               val tileSet = tileSetController.tileset
+               val map = mapController.createMap(tileSet, 25, 25)
                tabPane += find<MapFragment>(UndoableScope(), MapFragment::map to map).apply {
                   title = "Map 1"
                }
             }
          }
-
-         button("Map 2") {
-            action {
-               val map = mapController.getMap(2)
-               tabPane += find<MapFragment>(UndoableScope(), MapFragment::map to map).apply {
-                  title = "Map 2"
-               }
-            }
-         }
-
-         button("Undo") {
-            action {
-               undoRedoService.undo()
-               fire(RedrawMapRequestEvent)
-            }
-         }
-
-         button("Redo") {
-            action {
-               undoRedoService.redo()
-               fire(RedrawMapRequestEvent)
-            }
-         }
       }
 
       center = tabPane