From 2b2869b853b82f1d7f51afd0964a012b9c1eb3e2 Mon Sep 17 00:00:00 2001
From: Tom Copeland <tomcopeland@users.sourceforge.net>
Date: Tue, 5 Dec 2006 14:38:24 +0000
Subject: [PATCH] Fixed bug 1570824 - HTML reports generated on Windows no
 longer contain double backslashes.  This caused problems when viewing those
 reports with Apache.

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4861 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd/etc/changelog.txt                         |  1 +
 .../pmd/renderers/AbstractRendererTst.java    | 20 ++++---------------
 .../pmd/renderers/HTMLRendererTest.java       |  1 +
 .../pmd/renderers/HTMLRenderer.java           |  2 +-
 pmd/xdocs/credits.xml                         |  2 +-
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index 46b0c82758..a27d4ca047 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -18,6 +18,7 @@ Fixed bug 1581123 - False +: UnnecessaryWrapperObjectCreation.
 Fixed bug 1592710 - VariableNamingConventions no longer reports false positives on certain enum declarations.
 Fixed bug 1593292 - The CPD GUI now works with the 'by extension' option selected.
 Fixed bug 1560944 - CPD now skips symlinks.
+Fixed bug 1570824 - HTML reports generated on Windows no longer contain double backslashes.  This caused problems when viewing those reports with Apache.
 Applied patch 1551189 - SingularField false + for initialization blocks
 Applied patch 1573981 - false + in CloneMethodMustImplementCloneable
 Applied patch 1574988 - false + in OverrideBothEqualsAndHashcode
diff --git a/pmd/regress/test/net/sourceforge/pmd/renderers/AbstractRendererTst.java b/pmd/regress/test/net/sourceforge/pmd/renderers/AbstractRendererTst.java
index 8a0697c8b8..b876e85fe4 100644
--- a/pmd/regress/test/net/sourceforge/pmd/renderers/AbstractRendererTst.java
+++ b/pmd/regress/test/net/sourceforge/pmd/renderers/AbstractRendererTst.java
@@ -20,22 +20,10 @@ public abstract class AbstractRendererTst extends RuleTst {
                 addViolation(ctx, c);
             return ctx;
         }
-
-        public String getMessage() {
-            return "msg";
-        }
-
-        public String getName() {
-            return "Foo";
-        }
-
-        public String getRuleSetName() {
-            return "RuleSet";
-        }
-
-        public String getDescription() {
-            return "desc";
-        }
+        public String getMessage() { return "msg";  }
+        public String getName() { return "Foo"; }
+        public String getRuleSetName() { return "RuleSet"; }
+        public String getDescription() { return "desc"; }
     }
 
     private static class FooRule2 extends FooRule {
diff --git a/pmd/regress/test/net/sourceforge/pmd/renderers/HTMLRendererTest.java b/pmd/regress/test/net/sourceforge/pmd/renderers/HTMLRendererTest.java
index 53fcaf7e9a..4dd32dae4f 100644
--- a/pmd/regress/test/net/sourceforge/pmd/renderers/HTMLRendererTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/renderers/HTMLRendererTest.java
@@ -1,6 +1,7 @@
 package test.net.sourceforge.pmd.renderers;
 
 import net.sourceforge.pmd.PMD;
+import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.Report.ProcessingError;
 import net.sourceforge.pmd.renderers.AbstractRenderer;
 import net.sourceforge.pmd.renderers.HTMLRenderer;
diff --git a/pmd/src/net/sourceforge/pmd/renderers/HTMLRenderer.java b/pmd/src/net/sourceforge/pmd/renderers/HTMLRenderer.java
index f35285cc6b..4697baa2f4 100644
--- a/pmd/src/net/sourceforge/pmd/renderers/HTMLRenderer.java
+++ b/pmd/src/net/sourceforge/pmd/renderers/HTMLRenderer.java
@@ -143,7 +143,7 @@ public class HTMLRenderer extends AbstractRenderer {
         if (linkPrefix == null) {
             return filename;
         }
-        String newFileName = filename.substring(0, filename.lastIndexOf('.'));
+        String newFileName = filename.substring(0, filename.lastIndexOf('.')).replace('\\', '/');
         return "<a href=\"" + linkPrefix + newFileName + ".html#" + line + "\">" + newFileName + "</a>";
     }
 }
diff --git a/pmd/xdocs/credits.xml b/pmd/xdocs/credits.xml
index 54ab203764..091af4258c 100644
--- a/pmd/xdocs/credits.xml
+++ b/pmd/xdocs/credits.xml
@@ -54,6 +54,7 @@
         </subsection>
         <subsection name="Contributors">
         <ul>
+            <li>Brent Fisher - Fixed report backslash bug, SummaryHTML report improvements</li>
             <li>Thomas Leplus - Rewrote UselessStringValueOf</li>
             <li>Larry Brigman - Reported symlink bug in CPD</li>
             <li>Harald Rohan - Reported bug in CPD GUI</li>
@@ -68,7 +69,6 @@
             <li>Peter Van de Voorde - Rewrote the 'create rule XML' functionality in the designer utility</li>
             <li>Josh Devins - Reported bug with annotation parsing</li>
             <li>Alan Berg - Reported bug in Ant task</li>
-            <li>Brent Fisher - SummaryHTML report improvements</li>
             <li>George Thomas - Wrote AvoidRethrowingException rule</li>
             <li>Robert Simmons - Reported bug in optimizations package along with suggestions for fix</li>
             <li>Brian Remedios - display cleanup of CPD GUI, code cleanup of StringUtil and various rules, cleanup of rule designer, code cleanup of net.sourceforge.pmd.ant.Formatter.java, code improvements to Eclipse plugin, created AbstractPoorMethodCall and refactored UseIndexOfChar</li>