You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2008/02/28 02:03:48 UTC
svn commit: r631796 -
/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
Author: sebb
Date: Wed Feb 27 17:03:37 2008
New Revision: 631796
URL: http://svn.apache.org/viewvc?rev=631796&view=rev
Log:
Make makeTidyParser() public
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java?rev=631796&r1=631795&r2=631796&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java Wed Feb 27 17:03:37 2008
@@ -172,10 +172,8 @@
private static Document tidyDoc(InputStream stream, boolean quiet, boolean showWarnings, boolean report_errors,
boolean isXML) throws TidyException {
- Tidy tidy = makeTidyParser(quiet, showWarnings, isXML);
- // Always capture errors
- StringWriter sw = new StringWriter();
- tidy.setErrout(new PrintWriter(sw));
+ StringWriter sw = new StringWriter();
+ Tidy tidy = makeTidyParser(quiet, showWarnings, isXML, sw);
Document doc = tidy.parseDOM(stream, null);
doc.normalize();
if (tidy.getParseErrors() > 0) {
@@ -190,23 +188,19 @@
return doc;
}
- private static Tidy makeTidyParser(boolean quiet, boolean showWarnings, boolean isXml) {
- Tidy tidy = new Tidy();
- tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
- tidy.setQuiet(quiet);
- tidy.setShowWarnings(showWarnings);
- tidy.setMakeClean(true);
- tidy.setXmlTags(isXml);
- // tidy.setShowErrors(1);
- return tidy;
- }
-
- // Not used
- // public static Document makeDocument(InputStream stream)
- // throws ParserConfigurationException, SAXException, IOException {
- // return makeDocumentBuilder( false, false, false).parse(stream);
- // }
-
+ public static Tidy makeTidyParser(boolean quiet, boolean showWarnings, boolean isXml, StringWriter sw) {
+ Tidy tidy = new Tidy();
+ tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
+ tidy.setQuiet(quiet);
+ tidy.setShowWarnings(showWarnings);
+ tidy.setMakeClean(true);
+ tidy.setXmlTags(isXml);
+ if (sw != null) {
+ tidy.setErrout(new PrintWriter(sw));
+ }
+ return tidy;
+ }
+
static class MyErrorHandler implements ErrorHandler {
private final boolean val, tol;
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org