[pmd-devel] SF.net SVN: pmd:[6816] branches/pmd/4.2.x/etc
A source code analyzer
Brought to you by:
adangel,
juansotuyo
From: <rpe...@us...> - 2009-02-05 10:57:30
|
Revision: 6816 http://pmd.svn.sourceforge.net/pmd/?rev=6816&view=rev Author: rpelisse Date: 2009-02-05 10:57:28 +0000 (Thu, 05 Feb 2009) Log Message: ----------- Bug fixing 1609038 - Xslt report generators break if path contains 'java'. As suggested by bug reporter i switch call to 'translate' and call to 'substring-before'. Modified Paths: -------------- branches/pmd/4.2.x/etc/changelog.txt branches/pmd/4.2.x/etc/xslt/corley-pmd-report.xslt branches/pmd/4.2.x/etc/xslt/only-prio1.xslt branches/pmd/4.2.x/etc/xslt/only-prio2.xslt branches/pmd/4.2.x/etc/xslt/only-prio3.xslt branches/pmd/4.2.x/etc/xslt/only-prio4.xslt branches/pmd/4.2.x/etc/xslt/only-prio5.xslt branches/pmd/4.2.x/etc/xslt/pmd-report-per-class.xslt branches/pmd/4.2.x/etc/xslt/wz-pmd-report.xslt Modified: branches/pmd/4.2.x/etc/changelog.txt =================================================================== --- branches/pmd/4.2.x/etc/changelog.txt 2009-02-05 03:40:38 UTC (rev 6815) +++ branches/pmd/4.2.x/etc/changelog.txt 2009-02-05 10:57:28 UTC (rev 6816) @@ -8,6 +8,7 @@ Fixed bug 1955852 - false positives for UnusedPrivateMethod & UnusedLocalVariable Fixed bug 2404700 - UseSingleton should not act on enums Fixed bug 2225474 - VariableNamingConventions does not work with nonprimitives +Fixed bug 1609038 - Xslt report generators break if path contains "java" Fixed bug - JUnitTestsShouldIncludeAssert now detects Junit 4 Assert.assert... constructs New rule: Modified: branches/pmd/4.2.x/etc/xslt/corley-pmd-report.xslt =================================================================== --- branches/pmd/4.2.x/etc/xslt/corley-pmd-report.xslt 2009-02-05 03:40:38 UTC (rev 6815) +++ branches/pmd/4.2.x/etc/xslt/corley-pmd-report.xslt 2009-02-05 10:57:28 UTC (rev 6816) @@ -97,7 +97,7 @@ <xsl:for-each select="file"> <xsl:sort data-type="number" order="descending" select="count(violation)"/> <xsl:variable name="filename" select="@name"/> - <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3> + <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3> <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute> <thead> <tr> Modified: branches/pmd/4.2.x/etc/xslt/only-prio1.xslt =================================================================== --- branches/pmd/4.2.x/etc/xslt/only-prio1.xslt 2009-02-05 03:40:38 UTC (rev 6815) +++ branches/pmd/4.2.x/etc/xslt/only-prio1.xslt 2009-02-05 10:57:28 UTC (rev 6816) @@ -73,7 +73,7 @@ <xsl:for-each select="file[violation/@priority=1]"> <xsl:sort data-type="number" order="descending" select="count(violation[@priority = 1])"/> <xsl:variable name="filename" select="@name"/> - <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3> + <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3> <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute> <thead> <tr> Modified: branches/pmd/4.2.x/etc/xslt/only-prio2.xslt =================================================================== --- branches/pmd/4.2.x/etc/xslt/only-prio2.xslt 2009-02-05 03:40:38 UTC (rev 6815) +++ branches/pmd/4.2.x/etc/xslt/only-prio2.xslt 2009-02-05 10:57:28 UTC (rev 6816) @@ -73,7 +73,7 @@ <xsl:for-each select="file[violation/@priority=2]"> <xsl:sort data-type="number" order="descending" select="count(violation[@priority = 2])"/> <xsl:variable name="filename" select="@name"/> - <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3> + <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3> <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute> <thead> <tr> Modified: branches/pmd/4.2.x/etc/xslt/only-prio3.xslt =================================================================== --- branches/pmd/4.2.x/etc/xslt/only-prio3.xslt 2009-02-05 03:40:38 UTC (rev 6815) +++ branches/pmd/4.2.x/etc/xslt/only-prio3.xslt 2009-02-05 10:57:28 UTC (rev 6816) @@ -73,7 +73,7 @@ <xsl:for-each select="file[violation/@priority=3]"> <xsl:sort data-type="number" order="descending" select="count(violation[@priority = 3])"/> <xsl:variable name="filename" select="@name"/> - <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3> + <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3> <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute> <thead> <tr> Modified: branches/pmd/4.2.x/etc/xslt/only-prio4.xslt =================================================================== --- branches/pmd/4.2.x/etc/xslt/only-prio4.xslt 2009-02-05 03:40:38 UTC (rev 6815) +++ branches/pmd/4.2.x/etc/xslt/only-prio4.xslt 2009-02-05 10:57:28 UTC (rev 6816) @@ -73,7 +73,7 @@ <xsl:for-each select="file[violation/@priority=4]"> <xsl:sort data-type="number" order="descending" select="count(violation[@priority = 4])"/> <xsl:variable name="filename" select="@name"/> - <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3> + <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3> <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute> <thead> <tr> Modified: branches/pmd/4.2.x/etc/xslt/only-prio5.xslt =================================================================== --- branches/pmd/4.2.x/etc/xslt/only-prio5.xslt 2009-02-05 03:40:38 UTC (rev 6815) +++ branches/pmd/4.2.x/etc/xslt/only-prio5.xslt 2009-02-05 10:57:28 UTC (rev 6816) @@ -73,7 +73,7 @@ <xsl:for-each select="file[violation/@priority=4]"> <xsl:sort data-type="number" order="descending" select="count(violation[@priority = 5])"/> <xsl:variable name="filename" select="@name"/> - <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3> + <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3> <table border="0" width="100%" class="footcollapse"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute> <thead> <tr> Modified: branches/pmd/4.2.x/etc/xslt/pmd-report-per-class.xslt =================================================================== --- branches/pmd/4.2.x/etc/xslt/pmd-report-per-class.xslt 2009-02-05 03:40:38 UTC (rev 6815) +++ branches/pmd/4.2.x/etc/xslt/pmd-report-per-class.xslt 2009-02-05 10:57:28 UTC (rev 6816) @@ -75,7 +75,7 @@ <xsl:for-each select="file"> <xsl:sort data-type="number" order="descending" select="count(violation)"/> <xsl:variable name="filename" select="@name"/> - <H3><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(@name,'/','.'),'.java')"/></H3> + <h3><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></h3> <table border="0" width="100%" class="sortable"><xsl:attribute name="id">sortable_id_<xsl:value-of select="position()"/></xsl:attribute> <tr> <th>Prio</th> Modified: branches/pmd/4.2.x/etc/xslt/wz-pmd-report.xslt =================================================================== --- branches/pmd/4.2.x/etc/xslt/wz-pmd-report.xslt 2009-02-05 03:40:38 UTC (rev 6815) +++ branches/pmd/4.2.x/etc/xslt/wz-pmd-report.xslt 2009-02-05 10:57:28 UTC (rev 6816) @@ -83,7 +83,7 @@ <xsl:for-each select="violation"> <tr> <td style="padding: 3px" align="right"><div><xsl:attribute name="class"><xsl:call-template name="priorityDiv"/></xsl:attribute><xsl:value-of disable-output-escaping="yes" select="@priority"/></div></td> - <td style="padding: 3px" align="left"><xsl:value-of disable-output-escaping="yes" select="substring-before(translate(../@name,'/','.'),'.java')"/></td> + <td style="padding: 3px" align="left"><xsl:value-of disable-output-escaping="yes" select="translate(substring-before(@name,'.java'),'/','.')"/></td> <td style="padding: 3px" align="right"><xsl:value-of disable-output-escaping="yes" select="@beginline"/></td> <td style="padding: 3px" align="left" width="100%"><xsl:if test="@externalInfoUrl"><a><xsl:attribute name="href"><xsl:value-of select="@externalInfoUrl"/></xsl:attribute><xsl:call-template name="message"/></a></xsl:if><xsl:if test="not(@externalInfoUrl)"><xsl:call-template name="message"/></xsl:if></td> </tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |