[jsemver] 77/95: Improve Exceptions' toString() method

[Alexandre Viau]

This is an automated email from the git hooks/post-receive script.

reazem-guest pushed a commit to branch master
in repository jsemver.

commit f95c18cf6c3b9b502ae775bcf59f91bdd6bbecb3
Author: Zafar Khaja <zafarkhaja at gmail.com>
Date:   Tue Jan 28 17:15:32 2014 +0400

    Improve Exceptions' toString() method
---
 .../zafarkhaja/semver/UnexpectedCharacterException.java       | 11 +++++++++--
 .../zafarkhaja/semver/expr/UnexpectedTokenException.java      |  7 +++++--
 .../zafarkhaja/semver/util/UnexpectedElementException.java    |  7 +++++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/zafarkhaja/semver/UnexpectedCharacterException.java b/src/main/java/com/github/zafarkhaja/semver/UnexpectedCharacterException.java
index 657bca5..52c6c0e 100644
--- a/src/main/java/com/github/zafarkhaja/semver/UnexpectedCharacterException.java
+++ b/src/main/java/com/github/zafarkhaja/semver/UnexpectedCharacterException.java
@@ -85,9 +85,16 @@ public class UnexpectedCharacterException extends ParseException {
      */
     @Override
     public String toString() {
-        String message = "Unexpected character '" + unexpected + "'";
+        String message = String.format(
+            "Unexpected character '%s(%s)'",
+            CharType.forCharacter(unexpected),
+            unexpected
+        );
         if (expected.length > 0) {
-            message += ", expecting '" + Arrays.toString(expected) + "'";
+            message += String.format(
+                ", expecting '%s'",
+                Arrays.toString(expected)
+            );
         }
         return message;
     }
diff --git a/src/main/java/com/github/zafarkhaja/semver/expr/UnexpectedTokenException.java b/src/main/java/com/github/zafarkhaja/semver/expr/UnexpectedTokenException.java
index 4207abf..436a4e8 100644
--- a/src/main/java/com/github/zafarkhaja/semver/expr/UnexpectedTokenException.java
+++ b/src/main/java/com/github/zafarkhaja/semver/expr/UnexpectedTokenException.java
@@ -66,9 +66,12 @@ public class UnexpectedTokenException extends ParseException {
      */
     @Override
     public String toString() {
-        String message = "Unexpected token '" + unexpected + "'";
+        String message = String.format("Unexpected token '%s'", unexpected);
         if (expected.length > 0) {
-            message += ", expecting '" + Arrays.toString(expected) + "'";
+            message += String.format(
+                ", expecting '%s'",
+                Arrays.toString(expected)
+            );
         }
         return message;
     }
diff --git a/src/main/java/com/github/zafarkhaja/semver/util/UnexpectedElementException.java b/src/main/java/com/github/zafarkhaja/semver/util/UnexpectedElementException.java
index f8b56c9..2f1ae31 100644
--- a/src/main/java/com/github/zafarkhaja/semver/util/UnexpectedElementException.java
+++ b/src/main/java/com/github/zafarkhaja/semver/util/UnexpectedElementException.java
@@ -84,9 +84,12 @@ public class UnexpectedElementException extends RuntimeException {
      */
     @Override
     public String toString() {
-        String message = "Unexpected element '" + unexpected + "'";
+        String message = String.format("Unexpected element '%s'", unexpected);
         if (expected.length > 0) {
-            message += ", expecting '" + Arrays.toString(expected) + "'";
+            message += String.format(
+                ", expecting '%s'",
+                Arrays.toString(expected)
+            );
         }
         return message;
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jsemver.git