MovingBlocks
/
TerasologyLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: pass LauncherConfiguration to ApplicationController#update (#664) 

We're unpacking all members from the LauncherConfiguration to pass separately to the ApplicationController when showing the main stage.

Instead, pass the configuration object as is, and take the respective information out as needed in ApplicationController#update itself.
master
Tobias Nett 2021-09-01 17:56:38 +02:00 committed by GitHub
parent 2177d360ae
commit a0fed1fbae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/terasology/launcher/TerasologyLauncher.java
View File

@ -134,14 +134,7 @@ public final class TerasologyLauncher extends Application {
root = (Parent) fxmlLoader.load();
}
final ApplicationController controller = fxmlLoader.getController();
controller.update(
launcherConfiguration.getLauncherDirectory(),
launcherConfiguration.getDownloadDirectory(),
launcherConfiguration.getLauncherSettings(),
launcherConfiguration.getRepositoryManager(),
launcherConfiguration.getGameManager(),
mainStage,
hostServices);
controller.update(launcherConfiguration, mainStage, hostServices);
Scene scene = new Scene(root);
scene.getStylesheets().add(BundleUtils.getStylesheet("css_terasology"));

15
src/main/java/org/terasology/launcher/ui/ApplicationController.java
View File

@ -35,6 +35,7 @@ import javafx.stage.Stage;
import javafx.stage.StageStyle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.launcher.LauncherConfiguration;
import org.terasology.launcher.game.GameManager;
import org.terasology.launcher.game.GameService;
import org.terasology.launcher.game.Installation;
@ -251,15 +252,13 @@ public class ApplicationController {
}
@SuppressWarnings("checkstyle:HiddenField")
public void update(final Path launcherDirectory, final Path downloadDirectory, final LauncherSettings launcherSettings,
final RepositoryManager repositoryManager, final GameManager gameManager,
final Stage stage, final HostServices hostServices) {
this.launcherDirectory = launcherDirectory;
this.launcherSettings = launcherSettings;
public void update(final LauncherConfiguration configuration, final Stage stage, final HostServices hostServices) {
this.launcherDirectory = configuration.getLauncherDirectory();
this.launcherSettings = configuration.getLauncherSettings();
this.showPreReleases.bind(launcherSettings.showPreReleases());
this.repositoryManager = repositoryManager;
this.gameManager = gameManager;
this.repositoryManager = configuration.getRepositoryManager();
this.gameManager = configuration.getGameManager();
this.stage = stage;
@ -284,7 +283,7 @@ public class ApplicationController {
//TODO: This only updates when the launcher is initialized (which should happen exactly once o.O)
// We should update this value at least every time the download directory changes (user setting).
// Ideally, we would check periodically for disk space.
if (downloadDirectory.toFile().getUsableSpace() <= MINIMUM_FREE_SPACE) {
if (configuration.getDownloadDirectory().toFile().getUsableSpace() <= MINIMUM_FREE_SPACE) {
warning.setValue(Optional.of(Warning.LOW_ON_SPACE));
} else {
warning.setValue(Optional.empty());