Author: hboutemy Date: Sun May 3 21:21:29 2009 New Revision: 771128 URL: http://svn.apache.org/viewvc?rev=771128&view=rev Log: [MPIR-136] avoid quote handling in a link (merged from trunk r771127)
Modified: maven/shared/branches/maven-reporting-impl-2.0.4.x/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java maven/shared/branches/maven-reporting-impl-2.0.4.x/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java Modified: maven/shared/branches/maven-reporting-impl-2.0.4.x/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-reporting-impl-2.0.4.x/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=771128&r1=771127&r2=771128&view=diff ============================================================================== --- maven/shared/branches/maven-reporting-impl-2.0.4.x/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java (original) +++ maven/shared/branches/maven-reporting-impl-2.0.4.x/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java Sun May 3 21:21:29 2009 @@ -693,7 +693,7 @@ { char ch = text.charAt( i ); - if ( ch == '\'' && !inQuote ) + if ( ch == '\'' && !inQuote && braceStack == 0 ) { // handle: '' if ( i + 1 < text.length() && text.charAt( i + 1 ) == '\'' ) Modified: maven/shared/branches/maven-reporting-impl-2.0.4.x/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-reporting-impl-2.0.4.x/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java?rev=771128&r1=771127&r2=771128&view=diff ============================================================================== --- maven/shared/branches/maven-reporting-impl-2.0.4.x/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java (original) +++ maven/shared/branches/maven-reporting-impl-2.0.4.x/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java Sun May 3 21:21:29 2009 @@ -100,6 +100,7 @@ checkPattern( "project''s info", new String[] { "project'", null, "s info", null } ); checkPattern( "it''s a question of {chance, http://en.wikipedia.org/wiki/Chance}", new String[] { "it'", null, "s a question of ", null, "chance", "http://en.wikipedia.org/wiki/Chance" } ); + checkPattern( "{s'inscrire,m...@mail.com}", new String[] { "s'inscrire", "m...@mail.com" } ); // throwing an IllegalArgumentException in case of unmatched quote would avoid the following: checkPattern( "it's a question of {chance, http://en.wikipedia.org/wiki/Chance}",