From 254e948c8d1adf316b9fb5dd818810ff5eab3aed Mon Sep 17 00:00:00 2001 From: Stefan Dollase Date: Mon, 21 Nov 2016 04:16:43 +0100 Subject: [PATCH] rename refactorings --- src/main/java/amidst/gui/main/Actions.java | 6 +++--- src/main/java/amidst/gui/main/MainWindow.java | 8 ++++---- src/main/java/amidst/gui/main/UpdatePrompt.java | 4 ++-- src/main/java/amidst/gui/seedsearcher/SeedSearcher.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/amidst/gui/main/Actions.java b/src/main/java/amidst/gui/main/Actions.java index 68b35aac..1da07bc6 100644 --- a/src/main/java/amidst/gui/main/Actions.java +++ b/src/main/java/amidst/gui/main/Actions.java @@ -184,7 +184,7 @@ public class Actions { @CalledOnlyBy(AmidstThread.EDT) public void howCanIMoveAPlayer() { - mainWindow.displayMessage( + mainWindow.displayInfo( "How can I move a player?", "If you load the world from a save game, you can change the player locations.\n" + "1. Scroll the map to and right-click on the new player location, this opens a popup menu.\n" @@ -253,7 +253,7 @@ public class Actions { @CalledOnlyBy(AmidstThread.EDT) public void about() { - mainWindow.displayMessage( + mainWindow.displayInfo( "About", "Amidst - Advanced Minecraft Interfacing and Data/Structure Tracking\n\n" + "Author: Skidoodle aka skiphs\n" + "Mail: toolbox4minecraft+amidst@gmail.com\n" @@ -335,7 +335,7 @@ public class Actions { ImageIO.write(image, "png", file); } catch (IOException e) { AmidstLogger.warn(e); - mainWindow.displayException(e); + mainWindow.displayError(e); } } diff --git a/src/main/java/amidst/gui/main/MainWindow.java b/src/main/java/amidst/gui/main/MainWindow.java index fa4b2c94..62356829 100644 --- a/src/main/java/amidst/gui/main/MainWindow.java +++ b/src/main/java/amidst/gui/main/MainWindow.java @@ -150,7 +150,7 @@ public class MainWindow { setWorld(mojangApi.createWorldFromSeed(worldSeed, worldType)); } catch (IllegalStateException | MinecraftInterfaceException e) { AmidstLogger.warn(e); - displayException(e); + displayError(e); } } @@ -160,7 +160,7 @@ public class MainWindow { setWorld(mojangApi.createWorldFromSaveGame(file)); } catch (IllegalStateException | MinecraftInterfaceException | IOException | MojangApiParsingException e) { AmidstLogger.warn(e); - displayException(e); + displayError(e); } } @@ -282,7 +282,7 @@ public class MainWindow { } @CalledOnlyBy(AmidstThread.EDT) - public void displayMessage(String title, String message) { + public void displayInfo(String title, String message) { AmidstMessageBox.displayInfo(frame, title, message); } @@ -292,7 +292,7 @@ public class MainWindow { } @CalledOnlyBy(AmidstThread.EDT) - public void displayException(Exception e) { + public void displayError(Exception e) { AmidstMessageBox.displayError(frame, "Error", e); } diff --git a/src/main/java/amidst/gui/main/UpdatePrompt.java b/src/main/java/amidst/gui/main/UpdatePrompt.java index c810c014..235b7941 100644 --- a/src/main/java/amidst/gui/main/UpdatePrompt.java +++ b/src/main/java/amidst/gui/main/UpdatePrompt.java @@ -37,8 +37,8 @@ public class UpdatePrompt { return new UpdatePrompt( currentVersion, workerExecutor, - e -> mainWindow.displayException(e), - () -> mainWindow.displayMessage(TITLE, NO_UPDATES_AVAILABLE), + e -> mainWindow.displayError(e), + () -> mainWindow.displayInfo(TITLE, NO_UPDATES_AVAILABLE), message -> mainWindow.askToConfirmYesNo(TITLE, message)); } } else { diff --git a/src/main/java/amidst/gui/seedsearcher/SeedSearcher.java b/src/main/java/amidst/gui/seedsearcher/SeedSearcher.java index b947aefc..5d4b815a 100644 --- a/src/main/java/amidst/gui/seedsearcher/SeedSearcher.java +++ b/src/main/java/amidst/gui/seedsearcher/SeedSearcher.java @@ -69,7 +69,7 @@ public class SeedSearcher { doSearch(reporter, configuration); } catch (IllegalStateException | MinecraftInterfaceException e) { AmidstLogger.warn(e); - mainWindow.displayException(e); + mainWindow.displayError(e); } finally { this.isSearching = false; this.isStopRequested = false;