Author: simoneg
Date: Tue Feb 9 16:27:03 2010
New Revision: 908105
URL: http://svn.apache.org/viewvc?rev=908105&view=rev
Log:
Don't remove empty TD when purging HTML from word stuff
Modified:
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java
labs/magma/trunk/beans-richtext/src/test/java/org/apache/magma/validation/validators/RichTextVisitorTest.java
Modified:
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java?rev=908105&r1=908104&r2=908105&view=diff
==============================================================================
---
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java
(original)
+++
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java
Tue Feb 9 16:27:03 2010
@@ -177,6 +177,8 @@
// Fill object and embed before
new ReplacePattern("(?i)<object\\s*([^>]*)>\\s*</object>",
"<object $1>-_-_TEMPORARY_-_-</object>"),
new ReplacePattern("(?i)<embed\\s*([^>]*)>\\s*</embed>",
"<embed $1>-_-_TEMPORARY_-_-</embed>"),
+ new ReplacePattern("(?i)<td\\s*([^>]*)>\\s*</td>", "<td
$1>-_-_TEMPORARY_-_-</td>"),
+ new ReplacePattern("(?i)<td\\s*([^>]*)>\\s* \\s*</td>",
"<td $1>-_-_TEMPORARY_-_- </td>"),
new ReplacePattern("(?i)<(\\w*)\\s*[^>]*>\\s* \\s*</\\1>",
" "),
new ReplacePattern("(?i)<(\\w*)\\s*[^>]*>\\s*</\\1>", ""),
new ReplacePattern("(?i)<(\\w*)\\s*[^>]*>\\s* \\s*</\\1>",
" "),
Modified:
labs/magma/trunk/beans-richtext/src/test/java/org/apache/magma/validation/validators/RichTextVisitorTest.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/beans-richtext/src/test/java/org/apache/magma/validation/validators/RichTextVisitorTest.java?rev=908105&r1=908104&r2=908105&view=diff
==============================================================================
---
labs/magma/trunk/beans-richtext/src/test/java/org/apache/magma/validation/validators/RichTextVisitorTest.java
(original)
+++
labs/magma/trunk/beans-richtext/src/test/java/org/apache/magma/validation/validators/RichTextVisitorTest.java
Tue Feb 9 16:27:03 2010
@@ -26,6 +26,7 @@
import java.io.StringWriter;
import org.apache.magma.beans.richtext.RichTextVisitor;
+import static org.apache.magma.testing.AssertStringStructure.assertStructure;
import org.htmlparser.Parser;
import org.junit.Test;
@@ -122,6 +123,28 @@
}
@Test
+ public void keepEmptyTds() throws Exception {
+ {
+ String simpleHtml =
"<table><tr><td></td><td> </td></tr></table>";
+ RichTextValidator validator = new RichTextValidator();
+ StringWriter sw = new StringWriter();
+ RichTextVisitor visitor = new
RichTextVisitor(validator, sw);
+ visitor.visit(simpleHtml);
+ System.out.println(sw.toString());
+ assertStructure(sw.toString(),
"table","tr","td","/td","td","/td");
+ }
+ {
+ String simpleHtml = "<div>stuff</div><p></p>";
+ RichTextValidator validator = new RichTextValidator();
+ StringWriter sw = new StringWriter();
+ RichTextVisitor visitor = new
RichTextVisitor(validator, sw);
+ visitor.visit(simpleHtml);
+ System.out.println(sw.toString());
+ assertStructure(sw.toString(), "div", "stuff", "/div>",
"$$");
+ }
+ }
+
+ @Test
public void wordmess() throws Exception {
InputStream stream =
getClass().getResourceAsStream("/org/apache/magma/beans/wordmess.html");
InputStreamReader isr = new InputStreamReader(stream);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
