From 1f4c37104b3faa3c1cc36f0aa55718c5828d5288 Mon Sep 17 00:00:00 2001 From: jdrueckert Date: Sat, 16 Nov 2019 19:29:26 +0100 Subject: [PATCH] Refactor AboutViewController (#480) - rename getPaneFor to createPaneFor - rename getViewFor to createViewFor - remove aboutViewController update from ApplicationController --- .../launcher/gui/javafx/AboutViewController.java | 8 ++++---- .../launcher/gui/javafx/ApplicationController.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/terasology/launcher/gui/javafx/AboutViewController.java b/src/main/java/org/terasology/launcher/gui/javafx/AboutViewController.java index 92c40a506..4ba1734c9 100644 --- a/src/main/java/org/terasology/launcher/gui/javafx/AboutViewController.java +++ b/src/main/java/org/terasology/launcher/gui/javafx/AboutViewController.java @@ -56,7 +56,7 @@ public void update() { Stream.of("README.md", "CHANGELOG.md", "CONTRIBUTING.md", "LICENSE") .map(filename -> BundleUtils.getFXMLUrl(ABOUT, filename)) .filter(Objects::nonNull) - .map(this::getPaneFor) + .map(this::createPaneFor) .filter(Optional::isPresent) .map(Optional::get) .forEach(aboutInfoAccordion.getPanes()::add); @@ -66,8 +66,8 @@ public void update() { } } - private Optional getPaneFor(URL url) { - return getViewFor(url) + private Optional createPaneFor(URL url) { + return createViewFor(url) .map(view -> { view.getStylesheets().add(BundleUtils.getFXMLUrl("css_webview").toExternalForm()); view.setContextMenuEnabled(false); @@ -88,7 +88,7 @@ private Optional getPaneFor(URL url) { }); } - private Optional getViewFor(URL url) { + private Optional createViewFor(URL url) { switch (Files.getFileExtension(url.getFile().toLowerCase())) { case "md": case "markdown": diff --git a/src/main/java/org/terasology/launcher/gui/javafx/ApplicationController.java b/src/main/java/org/terasology/launcher/gui/javafx/ApplicationController.java index 10e1f9771..ff878a085 100644 --- a/src/main/java/org/terasology/launcher/gui/javafx/ApplicationController.java +++ b/src/main/java/org/terasology/launcher/gui/javafx/ApplicationController.java @@ -621,7 +621,6 @@ private void updateGui() { updateLabels(); updateTooltipTexts(); updateChangeLog(); - aboutViewController.update(); } private void updateLabels() {