From 6e1ed58933080dde2d0090415e1c8ad1891ad3d5 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 19 Sep 2013 23:11:55 +0000
Subject: [PATCH] [MCLIRR-58] Include the diffrence type number in the error
 message Submitted by Lukas Krejci

git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/clirr-maven-plugin@18755 52ab4f32-60fc-0310-b215-8acea882cd1b
---
 src/it/MCLIRR-48/pom.xml                                     | 1 +
 src/it/setup-MCLIRR-48/src/main/java/Class1.java             | 2 +-
 src/main/java/org/codehaus/mojo/clirr/AbstractClirrMojo.java | 4 ++--
 src/main/java/org/codehaus/mojo/clirr/LogDiffListener.java   | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/it/MCLIRR-48/pom.xml b/src/it/MCLIRR-48/pom.xml
index 71765e1..884ce4c 100644
--- a/src/it/MCLIRR-48/pom.xml
+++ b/src/it/MCLIRR-48/pom.xml
@@ -34,6 +34,7 @@
         </executions>
         <configuration>
           <comparisonVersion>1.0</comparisonVersion>
+          <textOutputFile>${project.build.directory}/clirr-check-results.txt</textOutputFile>
           <xmlOutputFile>${project.build.directory}/clirr-check-results.xml</xmlOutputFile>
           <ignoredDifferencesFile>predefined-ignored-differences.xml</ignoredDifferencesFile>
           <ignored>
diff --git a/src/it/setup-MCLIRR-48/src/main/java/Class1.java b/src/it/setup-MCLIRR-48/src/main/java/Class1.java
index c5e5965..02dc8f8 100644
--- a/src/it/setup-MCLIRR-48/src/main/java/Class1.java
+++ b/src/it/setup-MCLIRR-48/src/main/java/Class1.java
@@ -39,4 +39,4 @@ public class Class1 extends Base implements Serializable {
     public String returnSubClass2() {
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/codehaus/mojo/clirr/AbstractClirrMojo.java b/src/main/java/org/codehaus/mojo/clirr/AbstractClirrMojo.java
index c7f5871..4acecd3 100644
--- a/src/main/java/org/codehaus/mojo/clirr/AbstractClirrMojo.java
+++ b/src/main/java/org/codehaus/mojo/clirr/AbstractClirrMojo.java
@@ -271,7 +271,7 @@ public abstract class AbstractClirrMojo
         {
             try
             {
-                listeners.add( new XmlDiffListener( xmlOutputFile.getAbsolutePath() ) );
+                listeners.add( new TypeRevealingXmlDiffListener( xmlOutputFile.getAbsolutePath() ) );
             }
             catch ( IOException e )
             {
@@ -776,4 +776,4 @@ public abstract class AbstractClirrMojo
             reportDiffs( checker, origClasses2, currentClasses2 );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/codehaus/mojo/clirr/LogDiffListener.java b/src/main/java/org/codehaus/mojo/clirr/LogDiffListener.java
index 1db4cfc..7adf8cd 100644
--- a/src/main/java/org/codehaus/mojo/clirr/LogDiffListener.java
+++ b/src/main/java/org/codehaus/mojo/clirr/LogDiffListener.java
@@ -43,7 +43,8 @@ public class LogDiffListener
 
     public void reportDiff( ApiDifference apiDifference )
     {
-        String message = apiDifference.getAffectedClass() + ": " + apiDifference.getReport( messageTranslator );
+        String message = apiDifference.getMessage().getId() + ": " + apiDifference.getAffectedClass() + ": " +
+            apiDifference.getReport( messageTranslator );
 
         Severity severity = apiDifference.getMaximumSeverity();
         if ( severity.equals( Severity.INFO ) )
-- 
GitLab