rename refactorings

master
Stefan Dollase 2016-11-21 04:16:43 +01:00
parent b92205eef3
commit 254e948c8d
4 changed files with 10 additions and 10 deletions

View File

@ -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);
}
}

View File

@ -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);
}

View File

@ -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 {

View File

@ -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;