[Editor] Rename Compilation Logs to Build Logs
This commit is contained in:
@@ -4,7 +4,7 @@ import com.bartlomiejpluta.base.editor.code.build.exception.BuildException
|
||||
import com.bartlomiejpluta.base.editor.code.build.model.ClasspathResource
|
||||
import com.bartlomiejpluta.base.editor.code.model.FileSystemNode
|
||||
import com.bartlomiejpluta.base.editor.common.logs.enumeration.Severity
|
||||
import com.bartlomiejpluta.base.editor.event.AppendCompilationLogEvent
|
||||
import com.bartlomiejpluta.base.editor.event.AppendBuildLogsEvent
|
||||
import org.codehaus.commons.compiler.CompileException
|
||||
import org.codehaus.commons.compiler.util.resource.FileResource
|
||||
import org.codehaus.commons.compiler.util.resource.Resource
|
||||
@@ -48,7 +48,7 @@ class JaninoCompiler : Compiler {
|
||||
setDestinationDirectory(targetDirectory, false)
|
||||
|
||||
setWarningHandler { handle, message, location ->
|
||||
eventbus.fire(AppendCompilationLogEvent(Severity.WARNING, "$message ($handle)", location, "Compiler"))
|
||||
eventbus.fire(AppendBuildLogsEvent(Severity.WARNING, "$message ($handle)", location, "Compiler"))
|
||||
}
|
||||
|
||||
compile(compilationUnits)
|
||||
|
||||
@@ -6,8 +6,8 @@ import com.bartlomiejpluta.base.editor.code.build.game.GameEngineProvider
|
||||
import com.bartlomiejpluta.base.editor.code.build.packager.JarPackager
|
||||
import com.bartlomiejpluta.base.editor.code.build.project.ProjectAssembler
|
||||
import com.bartlomiejpluta.base.editor.common.logs.enumeration.Severity
|
||||
import com.bartlomiejpluta.base.editor.event.AppendCompilationLogEvent
|
||||
import com.bartlomiejpluta.base.editor.event.ClearCompilationLogEvent
|
||||
import com.bartlomiejpluta.base.editor.event.AppendBuildLogsEvent
|
||||
import com.bartlomiejpluta.base.editor.event.ClearBuildLogsEvent
|
||||
import com.bartlomiejpluta.base.editor.project.context.ProjectContext
|
||||
import com.bartlomiejpluta.base.editor.project.model.Project
|
||||
import javafx.beans.property.SimpleObjectProperty
|
||||
@@ -59,7 +59,7 @@ class DefaultBuildPipelineService : BuildPipelineService {
|
||||
try {
|
||||
projectContext.project?.let(this@DefaultBuildPipelineService::runPipeline)
|
||||
} catch (e: BuildException) {
|
||||
val event = AppendCompilationLogEvent(e.severity, e.message, e.location, e.tag)
|
||||
val event = AppendBuildLogsEvent(e.severity, e.message, e.location, e.tag)
|
||||
eventbus.fire(event)
|
||||
} finally {
|
||||
latch?.release()
|
||||
@@ -69,24 +69,24 @@ class DefaultBuildPipelineService : BuildPipelineService {
|
||||
}
|
||||
|
||||
private fun runPipeline(project: Project) {
|
||||
eventbus.fire(ClearCompilationLogEvent)
|
||||
eventbus.fire(ClearBuildLogsEvent)
|
||||
prepareBuildDirectory(project)
|
||||
|
||||
val outputFile = project.buildOutputJarFile
|
||||
val startTime = System.currentTimeMillis()
|
||||
|
||||
eventbus.fire(AppendCompilationLogEvent(Severity.INFO, "Compiling sources...", tag = TAG))
|
||||
eventbus.fire(AppendBuildLogsEvent(Severity.INFO, "Compiling sources...", tag = TAG))
|
||||
compiler.compile(project.codeFSNode, project.buildClassesDirectory)
|
||||
|
||||
eventbus.fire(AppendCompilationLogEvent(Severity.INFO, "Assembling game engine...", tag = TAG))
|
||||
eventbus.fire(AppendBuildLogsEvent(Severity.INFO, "Assembling game engine...", tag = TAG))
|
||||
engineProvider.provideBaseGameEngine(outputFile)
|
||||
|
||||
eventbus.fire(AppendCompilationLogEvent(Severity.INFO, "Assembling project assets...", tag = TAG))
|
||||
eventbus.fire(AppendBuildLogsEvent(Severity.INFO, "Assembling project assets...", tag = TAG))
|
||||
packager.pack(project.buildClassesDirectory, outputFile, "BOOT-INF/classes")
|
||||
projectAssembler.assembly(project, outputFile)
|
||||
|
||||
val buildingTime = (System.currentTimeMillis() - startTime) / 1000.0
|
||||
eventbus.fire(AppendCompilationLogEvent(Severity.INFO, "Done [${buildingTime}s]", tag = TAG))
|
||||
eventbus.fire(AppendBuildLogsEvent(Severity.INFO, "Done [${buildingTime}s]", tag = TAG))
|
||||
}
|
||||
|
||||
private fun prepareBuildDirectory(project: Project) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.bartlomiejpluta.base.editor.code.view
|
||||
|
||||
import com.bartlomiejpluta.base.editor.common.logs.component.LogsPane
|
||||
import com.bartlomiejpluta.base.editor.event.AppendCompilationLogEvent
|
||||
import com.bartlomiejpluta.base.editor.event.ClearCompilationLogEvent
|
||||
import com.bartlomiejpluta.base.editor.event.AppendBuildLogsEvent
|
||||
import com.bartlomiejpluta.base.editor.event.ClearBuildLogsEvent
|
||||
import com.bartlomiejpluta.base.editor.main.controller.MainController
|
||||
import com.bartlomiejpluta.base.editor.project.context.ProjectContext
|
||||
import org.codehaus.commons.compiler.Location
|
||||
@@ -11,19 +11,19 @@ import tornadofx.*
|
||||
import java.io.File
|
||||
|
||||
|
||||
class CompilerLogsView : View() {
|
||||
class BuildLogsView : View() {
|
||||
private val projectContext: ProjectContext by di()
|
||||
private val mainController: MainController by di()
|
||||
|
||||
private val compilationLogs = LogsPane(this::locationClick)
|
||||
private val buildLogs = LogsPane(this::locationClick)
|
||||
|
||||
init {
|
||||
subscribe<AppendCompilationLogEvent> { event ->
|
||||
compilationLogs.appendEntry(event.message, event.severity, event.location, event.tag)
|
||||
subscribe<AppendBuildLogsEvent> { event ->
|
||||
buildLogs.appendEntry(event.message, event.severity, event.location, event.tag)
|
||||
}
|
||||
|
||||
subscribe<ClearCompilationLogEvent> {
|
||||
compilationLogs.clear()
|
||||
subscribe<ClearBuildLogsEvent> {
|
||||
buildLogs.clear()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,10 +36,10 @@ class CompilerLogsView : View() {
|
||||
override val root = borderpane {
|
||||
left = hbox {
|
||||
button(graphic = FontIcon("fa-trash")) {
|
||||
action { compilationLogs.clear() }
|
||||
action { buildLogs.clear() }
|
||||
}
|
||||
}
|
||||
|
||||
center = compilationLogs
|
||||
center = buildLogs
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,7 @@ import org.codehaus.commons.compiler.Location
|
||||
import tornadofx.EventBus
|
||||
import tornadofx.FXEvent
|
||||
|
||||
data class AppendCompilationLogEvent(
|
||||
data class AppendBuildLogsEvent(
|
||||
val severity: Severity,
|
||||
val message: String,
|
||||
val location: Location? = null,
|
||||
@@ -3,4 +3,4 @@ package com.bartlomiejpluta.base.editor.event
|
||||
import tornadofx.EventBus
|
||||
import tornadofx.FXEvent
|
||||
|
||||
object ClearCompilationLogEvent : FXEvent(EventBus.RunOn.ApplicationThread)
|
||||
object ClearBuildLogsEvent : FXEvent(EventBus.RunOn.ApplicationThread)
|
||||
@@ -2,11 +2,11 @@ package com.bartlomiejpluta.base.editor.main.view
|
||||
|
||||
import com.bartlomiejpluta.base.editor.asset.view.list.AssetsListView
|
||||
import com.bartlomiejpluta.base.editor.code.model.Code
|
||||
import com.bartlomiejpluta.base.editor.code.view.BuildLogsView
|
||||
import com.bartlomiejpluta.base.editor.code.view.CodeEditorFragment
|
||||
import com.bartlomiejpluta.base.editor.code.view.CompilerLogsView
|
||||
import com.bartlomiejpluta.base.editor.code.view.ScriptFilesView
|
||||
import com.bartlomiejpluta.base.editor.code.viewmodel.CodeVM
|
||||
import com.bartlomiejpluta.base.editor.event.AppendCompilationLogEvent
|
||||
import com.bartlomiejpluta.base.editor.event.AppendBuildLogsEvent
|
||||
import com.bartlomiejpluta.base.editor.event.SelectMainViewTabEvent
|
||||
import com.bartlomiejpluta.base.editor.main.controller.MainController
|
||||
import com.bartlomiejpluta.base.editor.map.model.map.GameMap
|
||||
@@ -27,11 +27,11 @@ class MainView : View("BASE Game Editor") {
|
||||
private val mainMenuView = find<MainMenuView>()
|
||||
private val assetsView = find<AssetsListView>()
|
||||
private val scriptFilesView = find<ScriptFilesView>()
|
||||
private val compilerLogsView = find<CompilerLogsView>()
|
||||
private val buildLogsView = find<BuildLogsView>()
|
||||
|
||||
private val openTabs = mutableMapOf<Scope, Tab>()
|
||||
|
||||
private var compilationLogItem: DrawerItem by singleAssign()
|
||||
private var buildLogItem: DrawerItem by singleAssign()
|
||||
|
||||
private val tabPane = tabpane {
|
||||
|
||||
@@ -78,8 +78,8 @@ class MainView : View("BASE Game Editor") {
|
||||
title = "BASE Game Editor$projectName"
|
||||
}
|
||||
|
||||
subscribe<AppendCompilationLogEvent> {
|
||||
compilationLogItem.expanded = true
|
||||
subscribe<AppendBuildLogsEvent> {
|
||||
buildLogItem.expanded = true
|
||||
}
|
||||
|
||||
subscribe<SelectMainViewTabEvent> { event ->
|
||||
@@ -105,8 +105,8 @@ class MainView : View("BASE Game Editor") {
|
||||
}
|
||||
|
||||
bottom = drawer(multiselect = true) {
|
||||
compilationLogItem = item("Compilation Log") {
|
||||
this += compilerLogsView
|
||||
buildLogItem = item("Build Log") {
|
||||
this += buildLogsView
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user