diff --git a/linkcheck/src/main/org/apache/maven/linkcheck/FileToCheck.java b/linkcheck/src/main/org/apache/maven/linkcheck/FileToCheck.java index 597feebb..abe4c4c2 100644 --- a/linkcheck/src/main/org/apache/maven/linkcheck/FileToCheck.java +++ b/linkcheck/src/main/org/apache/maven/linkcheck/FileToCheck.java @@ -75,16 +75,15 @@ import com.meterware.httpunit.WebResponse; /** * @author Ben Walding - * @version $Id: FileToCheck.java,v 1.3 2003/02/03 14:13:54 bwalding Exp $ + * @version $Id: FileToCheck.java,v 1.4 2003/02/15 08:03:23 bwalding Exp $ * */ public class FileToCheck { private File base; - private File f; + private File fileToCheck; private String status = STATUS_OK; private String message = ""; - private LinkCheck linkcheck; private int successful; private int unsuccessful; @@ -92,10 +91,10 @@ public class FileToCheck public static final String STATUS_JTIDY_FAILURE = "Unable to tidy source"; public static final String STATUS_OK = "OK"; - public FileToCheck(File base, File f) + public FileToCheck(File base, File fileToCheck) { this.base = base; - this.f = f; + this.fileToCheck = fileToCheck; } private List links = new ArrayList(); @@ -110,7 +109,7 @@ public class FileToCheck try { WebConversation wc = new WebConversation(); - WebRequest req = new GetMethodWebRequest(f.toURL().toString()); + WebRequest req = new GetMethodWebRequest(fileToCheck.toURL().toString()); WebResponse resp = wc.getResponse(req); WebLink[] wl = resp.getLinks(); Map uniqueLinks = new HashMap(); @@ -131,7 +130,7 @@ public class FileToCheck LinkCheckResult lcr = new LinkCheckResult(); - LinkValidationItem lvi = new LinkValidationItem(f, href); + LinkValidationItem lvi = new LinkValidationItem(fileToCheck, href); LinkValidationResult result = lvm.validateLink(lvi); lcr.setTarget(href); @@ -156,10 +155,8 @@ public class FileToCheck } catch (Exception e) { - message = e.toString(); - System.err.println(e.toString()); + System.err.println(message); throw (e); - } } @@ -225,7 +222,7 @@ public class FileToCheck public String getName() { String baseName = base.getAbsolutePath(); - String fileName = f.getAbsolutePath(); + String fileName = fileToCheck.getAbsolutePath(); if (fileName.startsWith(baseName)) fileName = fileName.substring(baseName.length() + 1);