You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/11/27 12:52:03 UTC

svn commit: r884840 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java

Author: bentmann
Date: Fri Nov 27 11:52:03 2009
New Revision: 884840

URL: http://svn.apache.org/viewvc?rev=884840&view=rev
Log:
o Improved problem reporting

Modified:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java?rev=884840&r1=884839&r2=884840&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java Fri Nov 27 11:52:03 2009
@@ -124,7 +124,7 @@
 
         for ( ModelProblem problem : result.getProblems() )
         {
-            ExceptionSummary child = handle( problem );
+            ExceptionSummary child = handle( problem, result.getProjectId() );
             if ( child != null )
             {
                 children.add( child );
@@ -143,11 +143,30 @@
         return new ExceptionSummary( null, message, null, children );
     }
 
-    private ExceptionSummary handle( ModelProblem problem )
+    private ExceptionSummary handle( ModelProblem problem, String projectId )
     {
         if ( ModelProblem.Severity.ERROR.compareTo( problem.getSeverity() ) >= 0 )
         {
-            return handle( problem.getMessage(), problem.getException() );
+            String message = problem.getMessage();
+
+            String location = "";
+
+            if ( !problem.getModelId().equals( projectId ) )
+            {
+                location += problem.getModelId();
+
+                if ( StringUtils.isNotEmpty( problem.getSource() ) )
+                {
+                    location += " (" + problem.getSource() + ")";
+                }
+            }
+
+            if ( StringUtils.isNotEmpty( location ) )
+            {
+                message += " @ " + location;
+            }
+
+            return handle( message, problem.getException() );
         }
         else
         {