/*
 * FindBugs - Find bugs in Java programs
 * Copyright (C) 2003,2004 University of Maryland
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 * 
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

package edu.umd.cs.findbugs;

import edu.umd.cs.findbugs.xml.Dom4JXMLOutput;

import org.dom4j.Document;
import org.dom4j.DocumentFactory;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;

/**
 * Report warnings as an XML document.
 */
public class XMLBugReporter extends BugCollectionBugReporter {
	private boolean addMessages;

	public XMLBugReporter(Project project) {
		super(project);
		this.addMessages = false;
	}

	public void setAddMessages(boolean enable) {
		this.addMessages = enable;
	}

	public void finish() {
		try {
			generateSummary();
			if (!addMessages) {
				// Plain XML output.
				// Write XML directly to the output stream.
				getBugCollection().writeXML(outputStream, getProject());
			} else {
				// XML output with messages.
				// This requires us to build a dom4j tree,
				// add the messages to it, and then
				// write the tree to the output stream.

				// Build tree
				DocumentFactory docFactory = new DocumentFactory();
				Document document = docFactory.createDocument();
				Dom4JXMLOutput treeBuilder = new Dom4JXMLOutput(document);
				getBugCollection().writeXML(treeBuilder, getProject());

				// Add messages
				AddMessages addMessages = new AddMessages(getBugCollection(), document);
				addMessages.execute();

				// Write to output stream
				XMLWriter writer = new XMLWriter(outputStream, OutputFormat.createPrettyPrint());
				writer.write(document);
			}
		} catch (Exception e) {
			logError("Couldn't write XML output: " + e.toString());
		}
	}
}

// vim:ts=4

@@ -875,108 +875,26 @@
 ort 
-edu.umd.cs.findbugs.xml.Dom4JXMLOutput;%0A%0Aimport org.dom4j.Document;%0Aimport org.dom4j.DocumentFactory
+org.dom4j.Document
 ;%0Aim
@@ -1691,213 +1691,50 @@
 ment
-Factory docFactory = new DocumentFactory();%0A%09%09%09%09Document document = docFactory.createDocument();%0A%09%09%09%09Dom4JXMLOutput treeBuilder = new Dom4JXMLOutput(document);%0A%09%09%09%09getBugCollection().writeXML(treeBuilder, 
+ document = getBugCollection().toDocument(
 getP

Use BugCollection.toDocument() instead of Dom4JXMLOutput