mirrors/packwiz-installer
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz-installer.git synced 2025-11-01 11:14:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor GUI code, remove bad SwingWorker junk

Browse Source
This commit is contained in:
comp500
2020-12-13 16:12:44 +00:00
parent f52cd19ad4
commit f5b22f37a4
16 changed files with 94 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/kotlin/link/infra/packwiz/installer/Main.kt
View File

@@ -3,9 +3,8 @@
package link.infra.packwiz.installer
import link.infra.packwiz.installer.metadata.SpaceSafeURI
import link.infra.packwiz.installer.ui.CLIHandler
import link.infra.packwiz.installer.ui.InputStateHandler
import link.infra.packwiz.installer.ui.InstallWindow
import link.infra.packwiz.installer.ui.cli.CLIHandler
import link.infra.packwiz.installer.ui.gui.InstallWindow
import org.apache.commons.cli.DefaultParser
import org.apache.commons.cli.Options
import org.apache.commons.cli.ParseException
@@ -19,7 +18,7 @@ import kotlin.system.exitProcess
@Suppress("unused")
class Main(args: Array<String>) {
// Don't attempt to start a GUI if we are headless
var guiEnabled = !GraphicsEnvironment.isHeadless()
private var guiEnabled = !GraphicsEnvironment.isHeadless()
private fun startup(args: Array<String>) {
val options = Options()
@@ -59,8 +58,7 @@ class Main(args: Array<String>) {
cmd.getOptionValue("title")?.also(ui::setTitle)
val inputStateHandler = InputStateHandler()
ui.show(inputStateHandler)
ui.show()
val uOptions = UpdateManager.Options().apply {
side = cmd.getOptionValue("side")?.let((UpdateManager.Options.Side)::from) ?: side
@@ -76,18 +74,13 @@ class Main(args: Array<String>) {
}
// Start update process!
// TODO: start in SwingWorker?
try {
ui.executeManager {
try {
UpdateManager(uOptions, ui, inputStateHandler)
} catch (e: Exception) { // TODO: better error message?
ui.handleExceptionAndExit(e)
}
}
UpdateManager(uOptions, ui)
} catch (e: Exception) { // TODO: better error message?
ui.handleExceptionAndExit(e)
}
println("Finished successfully!")
ui.dispose()
}
companion object {