From eac3b5ffe771d133c6ae7117e408382d6110abd8 Mon Sep 17 00:00:00 2001
From: kaz <kaz@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 25 Jan 2003 04:17:54 +0000
Subject: [PATCH] Changing the idiom used to "fix" the problems with the
 interaction between the xml taglib and jelly context.  This just eliminates
 an extra line of JSL, but it does make it slightly more readable.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112735 13f79535-47bb-0310-9956-ffa450edef68
---
 checkstyle/src/plugin-resources/checkstyle.jsl | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/checkstyle/src/plugin-resources/checkstyle.jsl b/checkstyle/src/plugin-resources/checkstyle.jsl
index 2fbf78e1..f004f5b3 100644
--- a/checkstyle/src/plugin-resources/checkstyle.jsl
+++ b/checkstyle/src/plugin-resources/checkstyle.jsl
@@ -31,17 +31,15 @@
         </section>
 
         <section name="Summary">
-          <x:set var="fileCount" select="count(file)"/>
-          <x:set var="errorCount" select="count(file/error)"/>
+          <j:set var="fileCount"><x:expr select="count(file)"/></j:set>
+          <j:set var="errorCount"><x:expr select="count(file/error)"/></j:set>
           <table>
             <tr>
               <th>Files</th>
               <th>Errors</th>
             </tr>
             <tr>
-              <j:set var="fileCount">${fileCount}</j:set>
               <td><doc:formatAsNumber string="${fileCount}" pattern="0"/></td>
-              <j:set var="errorCount">${errorCount}</j:set>
               <td><doc:formatAsNumber string="${errorCount}" pattern="0"/></td>
             </tr>
           </table>
@@ -63,14 +61,13 @@
               <j:set var="name" value="${file.attribute('name').getValue()}"/>
               <j:set var="name" value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/>
               <!--- +1 is for the trailing slash above -->
-              <x:set var="errorCount" select="count($file/error)"/>
+              <j:set var="errorCount"><x:expr select="count($file/error)"/></j:set>
               
               <j:if test="${errorCount != 0}">
                 <tr>
                   <td>
                     <a href="#${name}">${name}</a>
                   </td>
-                  <j:set var="errorCount">${errorCount}</j:set>
                   <td><doc:formatAsNumber string="${errorCount}" pattern="0"/></td>
                 </tr>
               </j:if>