From ebe30ef48689fe531286f3bf96226c14a5d03679 Mon Sep 17 00:00:00 2001 From: jstrachan Date: Wed, 1 Oct 2003 13:20:59 +0000 Subject: [PATCH] Added more details of recent fixes to the change.xml (thanks for the hint dion :) Also added another failing test case along with a fix git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114144 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/html2xdoc/Html2XdocBean.java | 20 +++++++++---------- .../apache/maven/html2xdoc/TestHtml2Xdoc.java | 1 + .../maven/html2xdoc/missingParaBug.html | 13 ++++++++++++ .../apache/maven/html2xdoc/missingParaBug.xml | 11 ++++++++++ html2xdoc/xdocs/changes.xml | 8 +++++++- 5 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.html create mode 100644 html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.xml diff --git a/html2xdoc/src/main/org/apache/maven/html2xdoc/Html2XdocBean.java b/html2xdoc/src/main/org/apache/maven/html2xdoc/Html2XdocBean.java index a346c053..f6180603 100644 --- a/html2xdoc/src/main/org/apache/maven/html2xdoc/Html2XdocBean.java +++ b/html2xdoc/src/main/org/apache/maven/html2xdoc/Html2XdocBean.java @@ -428,16 +428,16 @@ public class Html2XdocBean { String text = node.getText(); return text.trim().length() <= 0; } - if (node instanceof Element) { - String name = node.getName(); - if (name.equals("p")) { - String text = node.getText(); - return text.trim().length() <= 0; - } - if (name.equals("br")) { - return true; - } - } +// if (node instanceof Element) { +// String name = node.getName(); +// if (name.equals("p")) { +// String text = node.getText(); +// return text.trim().length() <= 0; +// } +// if (name.equals("br")) { +// return true; +// } +// } return false; } diff --git a/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java b/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java index 246942ad..d7fdb658 100644 --- a/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java +++ b/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java @@ -101,6 +101,7 @@ public class TestHtml2Xdoc extends TestCase { // Test cases //------------------------------------------------------------------------- public void testOne() throws Exception { + assertConversion("missingParaBug.html", "missingParaBug.xml"); assertConversion("linkInHeading.html", "linkInHeading.xml"); assertConversion("codeinpara.html", "codeinpara.xml"); assertConversion("input1.html", "output1.xml"); diff --git a/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.html b/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.html new file mode 100644 index 00000000..a8f1c9ff --- /dev/null +++ b/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.html @@ -0,0 +1,13 @@ + + + + + A title + + + +

Title

+

+Some Text

+ + diff --git a/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.xml b/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.xml new file mode 100644 index 00000000..d02f53d9 --- /dev/null +++ b/html2xdoc/src/test/org/apache/maven/html2xdoc/missingParaBug.xml @@ -0,0 +1,11 @@ + + + A title + + +
+

Some Text +

+
+ + diff --git a/html2xdoc/xdocs/changes.xml b/html2xdoc/xdocs/changes.xml index a3d844f3..24b7e67d 100644 --- a/html2xdoc/xdocs/changes.xml +++ b/html2xdoc/xdocs/changes.xml @@ -11,7 +11,13 @@ Only try to find files if the source directory exists - + + Numerous bug fixes have been made. A new HTML converter bean is now used + for every page to avoid contamination across pages. Also various invalid + transformations have been fixed, such as headings containing + either 'span' or 'a' elements, or paragraphs containing just images + or 'a' elements. +