From d3ab98564284eb1b3aa0098421c9b0b080d4c868 Mon Sep 17 00:00:00 2001 From: Griefed Date: Mon, 6 Jun 2022 20:39:55 +0200 Subject: [PATCH] improv(GUI Ready status): Enable generation button and turn of status bar after generation has completed, but before dialogs are shown. Looks better and makes more sense. --- .../swing/TabCreateServerPack.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/backend/main/java/de/griefed/serverpackcreator/swing/TabCreateServerPack.java b/backend/main/java/de/griefed/serverpackcreator/swing/TabCreateServerPack.java index 044eea35c..f3fbbd096 100644 --- a/backend/main/java/de/griefed/serverpackcreator/swing/TabCreateServerPack.java +++ b/backend/main/java/de/griefed/serverpackcreator/swing/TabCreateServerPack.java @@ -2069,8 +2069,7 @@ private void generateServerpack(ActionEvent event) { break; default: - BUTTON_GENERATESERVERPACK.setEnabled(true); - STATUS_BAR.setIndeterminate(false); + ready(); break; } } @@ -2163,6 +2162,8 @@ public void handle(String line) { false); MATERIALTEXTPANEUI.installUI(SERVERPACKGENERATEDTEXTPANE); + ready(); + if (JOptionPane.showConfirmDialog( FRAME_SERVERPACKCREATOR, SERVERPACKGENERATEDTEXTPANE, @@ -2210,6 +2211,8 @@ public void handle(String line) { errors.append(i + 1).append(": ").append(encounteredErrors.get(i)).append("\n"); } + ready(); + JOptionPane.showMessageDialog( FRAME_SERVERPACKCREATOR, errors, @@ -2224,9 +2227,7 @@ public void handle(String line) { tailer.stop(); - BUTTON_GENERATESERVERPACK.setEnabled(true); - STATUS_BAR.setIndeterminate(false); - FRAME_SERVERPACKCREATOR.setResizable(true); + ready(); System.gc(); System.runFinalization(); @@ -2235,6 +2236,11 @@ public void handle(String line) { }); } + private void ready() { + BUTTON_GENERATESERVERPACK.setEnabled(true); + STATUS_BAR.setIndeterminate(false); + } + /** * Save the current configuration to a specified file. *