Author: simoneg
Date: Mon Jan 25 10:35:05 2010
New Revision: 902768
URL: http://svn.apache.org/viewvc?rev=902768&view=rev
Log:
Remove mozilla bogus node from rich text
Modified:
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/beans/richtext/RichTextVisitor.java
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/conversion/richtext/RichTextConverterToString.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=902768&r1=902767&r2=902768&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
Mon Jan 25 10:35:05 2010
@@ -358,6 +358,11 @@
*/
public boolean skipTag(Tag tag) {
String tagname = tag.getTagName();
+ if (tagname.equals("BR")) {
+ if (tag.getAttribute("_moz_editor_bogus_node") != null)
{
+ return true;
+ }
+ }
boolean skiptag = false;
if (!validator.isPermitBackgroundColors()) {
tag.removeAttribute("bgcolor");
Modified:
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/conversion/richtext/RichTextConverterToString.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/conversion/richtext/RichTextConverterToString.java?rev=902768&r1=902767&r2=902768&view=diff
==============================================================================
---
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/conversion/richtext/RichTextConverterToString.java
(original)
+++
labs/magma/trunk/beans-richtext/src/main/java/org/apache/magma/conversion/richtext/RichTextConverterToString.java
Mon Jan 25 10:35:05 2010
@@ -56,7 +56,7 @@
* Converts to a {...@link RichTextString} performing cleanup.
*/
public RichTextString from(String value) {
- if (value == null) return null;
+ if (value == null || value.length() == 0) return null;
RichTextValidator validator = null;
PropertyInfo prop = this.getProperty();
if (prop != null) {
@@ -70,6 +70,8 @@
RichTextVisitor visitor = new RichTextVisitor(validator, sw);
visitor.visit(value);
sw.flush();
+ String strval = sw.toString().trim();
+ if (value.length() == 0) return null;
RichTextString ret = new RichTextString(sw.toString());
ret.bindProperty(prop);
return ret;
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=902768&r1=902767&r2=902768&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
Mon Jan 25 10:35:05 2010
@@ -109,6 +109,19 @@
}
@Test
+ public void bogusNode() throws Exception {
+ String simpleHtml = "<br _moz_editor_bogus_node=\"TRUE\">";
+ {
+ RichTextValidator validator = new RichTextValidator();
+ StringWriter sw = new StringWriter();
+ RichTextVisitor visitor = new
RichTextVisitor(validator, sw);
+ visitor.visit(simpleHtml);
+ System.out.println(sw.toString());
+ //assertEquals(0, visitor.getMessages().size());
+ }
+ }
+
+ @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]
