saner exception handling

src/main/java/com/cadrlife/jhaml/JHamlBatchConverter.java

@@ -26,6 +26,7 @@ public List<File> convertAllInPath(File startDirectory) throws IOException {
 
 	@Override
 	protected void handleFile(File file, Collection<File> results) throws IOException {
+		try {
 		if (file.getName().endsWith("." + hamlExtension)) {
 			String warning = warning(file.getName());
 			String gsp = new JHaml()
@@ -38,6 +39,16 @@ protected void handleFile(File file, Collection<File> results) throws IOExceptio
 			}
 		}
 		results.add(file);
+		} catch (RuntimeException e) {
+			if (e instanceof JHamlParseException) {
+				RuntimeException ex = new JHamlParseException(e.getMessage(),
+						((JHamlParseException) e).getLineNumber(), file);
+				throw ex;
+			}
+			else {
+				throw e;
+			}
+		}
 	}
 
 	private String warning(String filename) {
@@ -86,5 +97,4 @@ public void setOutputModificationWarning(boolean outputModificationWarning) {
 	public boolean isOutputModificationWarning() {
 		return outputModificationWarning;
 	}
-
 }

src/main/java/com/cadrlife/jhaml/JHamlParseException.java

@@ -1,16 +1,26 @@
 package com.cadrlife.jhaml;
+import java.io.File;
 
 public class JHamlParseException extends RuntimeException {
 	private final int lineNumber;
+	private final File file;
 
 	public JHamlParseException(String message) {
 		super(message);
 		lineNumber = -1;
+		this.file = null;
 	}
 
 	public JHamlParseException(String message, int lineNumber) {
 		super("Line " + lineNumber + ": " + message);
 		this.lineNumber = lineNumber;
+		this.file = null;
+	}
+
+	public JHamlParseException(String message, int lineNumber, File file) {
+		super("File " + file + ", " + message);
+		this.lineNumber = lineNumber;
+		this.file = file;
 	}
 
 	public int getLineNumber() {

src/test/java/com/cadrlife/jhaml/JHamlTest.java

@@ -250,5 +250,5 @@ public void escapeAtBeginningOfLine() {
 	public void whitespaceAtEndIsIgnored() {
 		assertEquals("<div>\n  <p>Hello</p>\n</div>", jhaml.parse("%div\n  %p Hello\n  "));
 	}
-	
-}
+}
+