From f5a93816c747f909c9fd8a1fdade14968ab3fd73 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Fri, 23 Oct 2009 13:55:01 +0000
Subject: [PATCH] o Tweaked error message formatting

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@829065 13f79535-47bb-0310-9956-ffa450edef68
---
 .../exception/DefaultExceptionHandler.java    | 58 ++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
index 6f407785ff..0001616ae7 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
+++ b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
@@ -203,11 +203,6 @@ private String getMessage( String message, Throwable exception )
         {
             String exceptionMessage = t.getMessage();
 
-            if ( exceptionMessage == null )
-            {
-                exceptionMessage = "";
-            }
-
             if ( t instanceof AbstractMojoExecutionException )
             {
                 String longMessage = ( (AbstractMojoExecutionException) t ).getLongMessage();
@@ -219,35 +214,56 @@ private String getMessage( String message, Throwable exception )
                     }
                     else
                     {
-                        exceptionMessage += ": " + longMessage;
+                        exceptionMessage = join( exceptionMessage, longMessage );
                     }
                 }
             }
 
+            if ( StringUtils.isEmpty( exceptionMessage ) )
+            {
+                exceptionMessage = t.getClass().getSimpleName();
+            }
+
             if ( t instanceof UnknownHostException && !fullMessage.contains( "host" ) )
             {
-                if ( fullMessage.length() > 0 )
-                {
-                    fullMessage += ": ";
-                }
-                fullMessage += "Unknown host " + exceptionMessage;
+                fullMessage = join( fullMessage, "Unknown host " + exceptionMessage );
             }
             else if ( !fullMessage.contains( exceptionMessage ) )
             {
-                if ( fullMessage.length() > 0 )
-                {
-                    fullMessage += ": ";
-                }
-                fullMessage += exceptionMessage;
+                fullMessage = join( fullMessage, exceptionMessage );
             }
         }
 
-        if ( StringUtils.isEmpty( fullMessage ) && exception != null )
-        {
-            fullMessage = exception.toString();
-        }
-
         return fullMessage.trim();
     }
 
+    private String join( String message1, String message2 )
+    {
+        String message = "";
+
+        if ( StringUtils.isNotEmpty( message1 ) )
+        {
+            message = message1.trim();
+        }
+
+        if ( StringUtils.isNotEmpty( message2 ) )
+        {
+            if ( StringUtils.isNotEmpty( message ) )
+            {
+                if ( message.endsWith( "." ) || message.endsWith( "!" ) || message.endsWith( ":" ) )
+                {
+                    message += " ";
+                }
+                else
+                {
+                    message += ": ";
+                }
+            }
+
+            message += message2;
+        }
+
+        return message;
+    }
+
 }