From 1b2aa582d90d807aaafc01de04d300e3102aa6bd Mon Sep 17 00:00:00 2001 From: "moandji.ezana" Date: Tue, 23 Jun 2015 23:35:52 +0200 Subject: [PATCH] Removed trailing newlines from error messages. Fixes https://github.com/mwanji/toml4j/issues/18 --- CHANGELOG.md | 3 +- .../java/com/moandjiezana/toml/Results.java | 36 +++++++------------ 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc01b4f..ddc865b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,12 @@ ### Changed * __BREAKING:__ Toml#getList(String), Toml#getTable(String) and Toml#getTables(String) return null when key is not found +* Removed trailing newline from error messages ### Added * Support for underscores in numbers (the feature branch had accidentally not been merged! :( ) -* Toml#entrySet() +* Set Toml#entrySet() cf. Reflection section in README * Overloaded getters that take a default value. Thanks to __[udiabon](https://github.com/udiabon)__. ## 0.4.0 / 2015-02-16 diff --git a/src/main/java/com/moandjiezana/toml/Results.java b/src/main/java/com/moandjiezana/toml/Results.java index cc5ae75..a3ea318 100644 --- a/src/main/java/com/moandjiezana/toml/Results.java +++ b/src/main/java/com/moandjiezana/toml/Results.java @@ -19,7 +19,7 @@ class Results { .append(line) .append(": [") .append(table) - .append("]\n"); + .append("]"); } public void tableDuplicatesKey(String table, AtomicInteger line) { @@ -27,21 +27,19 @@ class Results { .append(line.get()) .append(": [") .append(table) - .append("]\n"); + .append("]"); } public void keyDuplicatesTable(String key, AtomicInteger line) { sb.append("Table already exists for key defined on line ") .append(line.get()) .append(": ") - .append(key) - .append('\n'); + .append(key); } void emptyImplicitTable(String table, int line) { sb.append("Invalid table definition due to empty implicit table name: ") - .append(table) - .append("\n"); + .append(table); } void invalidTable(String table, int line) { @@ -49,7 +47,7 @@ class Results { .append(line) .append(": ") .append(table) - .append("]\n"); + .append("]"); } void duplicateKey(String key, int line) { @@ -59,8 +57,7 @@ class Results { .append(line); } sb.append(": ") - .append(key) - .append('\n'); + .append(key); } void invalidTextAfterIdentifier(Identifier identifier, char text, int line) { @@ -68,24 +65,21 @@ class Results { .append(identifier.getName()) .append(" on line ") .append(line) - .append(". Make sure to terminate the value or add a comment (#).") - .append('\n'); + .append(". Make sure to terminate the value or add a comment (#)."); } void invalidKey(String key, int line) { sb.append("Invalid key on line ") .append(line) .append(": ") - .append(key) - .append('\n'); + .append(key); } void invalidTableArray(String tableArray, int line) { sb.append("Invalid table array definition on line ") .append(line) .append(": ") - .append(tableArray) - .append('\n'); + .append(tableArray); } void invalidValue(String key, String value, int line) { @@ -94,16 +88,14 @@ class Results { .append(": ") .append(key) .append(" = ") - .append(value) - .append('\n'); + .append(value); } void unterminatedKey(String key, int line) { sb.append("Key is not followed by an equals sign on line ") .append(line) .append(": ") - .append(key) - .append('\n'); + .append(key); } void unterminated(String key, String value, int line) { @@ -112,15 +104,13 @@ class Results { .append(": ") .append(key) .append(" = ") - .append(value.trim()) - .append('\n'); + .append(value.trim()); } public void heterogenous(String key, int line) { sb.append(key) .append(" becomes a heterogeneous array on line ") - .append(line) - .append('\n'); + .append(line); } boolean hasErrors() {