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'.

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.2.x@6816 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Romain Pelisse 2009-02-05 10:57:28 +00:00
parent 751ed84e0d
commit 605de6f7bf
9 changed files with 9 additions and 8 deletions

View File

@ -8,6 +8,7 @@ Fixed bug 2315599 - False +: UseSingleton with class containing constructor
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:

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>