diff --git a/src/tools/messages/MessageFileVerifier.java b/src/tools/messages/MessageFileVerifier.java index af06298d..75e9927e 100644 --- a/src/tools/messages/MessageFileVerifier.java +++ b/src/tools/messages/MessageFileVerifier.java @@ -16,7 +16,7 @@ import java.util.Set; */ public class MessageFileVerifier { - private static final char NEW_LINE = '\n'; + private static final String NEW_LINE = "\n"; private final String messagesFile; private final Set unknownKeys = new HashSet<>(); @@ -96,20 +96,13 @@ public class MessageFileVerifier { } } - // Very ugly way of verifying if the last char in the file is a new line, in which case we won't start by - // adding a new line to the file. It's grossly inefficient but with the scale of the messages file it's fine - String fileContents = FileUtils.readFromFile(messagesFile); - String contentsToAdd = ""; - if (fileContents.charAt(fileContents.length() - 1) == NEW_LINE) { - contentsToAdd += NEW_LINE; - } - - // We know that all keys in keysToAdd are safe to retrieve and add + // We know that all keys in keysToAdd are safe to retrieve and write + StringBuilder sb = new StringBuilder(NEW_LINE); for (String keyToAdd : keysToAdd) { - contentsToAdd += keyToAdd + ":" + defaultMessages.get(keyToAdd) + NEW_LINE; + sb.append(keyToAdd).append(":").append(defaultMessages.get(keyToAdd)).append(NEW_LINE); missingKeys.put(keyToAdd, true); } - FileUtils.appendToFile(messagesFile, contentsToAdd); + FileUtils.appendToFile(messagesFile, sb.toString()); } private static Set getAllMessageKeys() { diff --git a/src/tools/messages/MessagesVerifierRunner.java b/src/tools/messages/MessagesVerifierRunner.java index 036ea849..174c00f7 100644 --- a/src/tools/messages/MessagesVerifierRunner.java +++ b/src/tools/messages/MessagesVerifierRunner.java @@ -21,7 +21,7 @@ import static java.lang.String.format; */ public final class MessagesVerifierRunner { - public static final String MESSAGES_FOLDER = ToolsConstants.MAIN_RESOURCES_ROOT + "messages/"; + private static final String MESSAGES_FOLDER = ToolsConstants.MAIN_RESOURCES_ROOT + "messages/"; private static final String SOURCES_TAG = "{msgdir}"; private MessagesVerifierRunner() { @@ -63,11 +63,15 @@ public final class MessagesVerifierRunner { verifyFile(verifier); } } + + if (messageFiles.size() > 1) { + System.out.println("Checked " + messageFiles.size() + " files"); + } } private static void verifyFile(MessageFileVerifier verifier) { Map missingKeys = verifier.getMissingKeys(); - if (missingKeys.isEmpty()) { + if (!missingKeys.isEmpty()) { System.out.println(" Missing keys: " + missingKeys.keySet()); } @@ -83,7 +87,7 @@ public final class MessagesVerifierRunner { verifier.addMissingKeys(defaultMessages); missingKeys = verifier.getMissingKeys(); List addedKeys = getKeysWithValue(Boolean.TRUE, missingKeys); - System.out.println("Could add missing keys " + addedKeys); + System.out.println(" Added missing keys " + addedKeys); List unsuccessfulKeys = getKeysWithValue(Boolean.FALSE, missingKeys); if (!unsuccessfulKeys.isEmpty()) { diff --git a/src/tools/permissions/PermissionsListWriter.java b/src/tools/permissions/PermissionsListWriter.java index 3f675ad5..c8ba0554 100644 --- a/src/tools/permissions/PermissionsListWriter.java +++ b/src/tools/permissions/PermissionsListWriter.java @@ -25,8 +25,8 @@ public class PermissionsListWriter { boolean writeToFile = false; if (includeDescription) { - System.out.println("Write to file? [Enter 'n' for console output]"); - writeToFile = !matches("n", scanner); + System.out.println("Write to file? [Enter 'y' for yes]"); + writeToFile = matches("y", scanner); } scanner.close();