Update of /var/cvs/applications/richtext/src/org/mmbase/richtext/transformers
In directory
james.mmbase.org:/tmp/cvs-serv15557/src/org/mmbase/richtext/transformers
Modified Files:
XmlField.java
Log Message:
added to option to limit to limit whitespace p or br, no combination of those
See also:
http://cvs.mmbase.org/viewcvs/applications/richtext/src/org/mmbase/richtext/transformers
Index: XmlField.java
===================================================================
RCS file:
/var/cvs/applications/richtext/src/org/mmbase/richtext/transformers/XmlField.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- XmlField.java 3 Jun 2008 12:24:37 -0000 1.9
+++ XmlField.java 10 Jun 2008 15:46:11 -0000 1.10
@@ -34,7 +34,7 @@
* Like [EMAIL PROTECTED] org.mmbase.util.transformers.XmlField} but adds
everything related to the MMXF doctype. This means basicly that it knows how to
surround <mmxf />
*
* @author Michiel Meeuwissen
- * @version $Id: XmlField.java,v 1.9 2008/06/03 12:24:37 michiel Exp $
+ * @version $Id: XmlField.java,v 1.10 2008/06/10 15:46:11 michiel Exp $
* @todo THIS CLASS NEEDS A CONCEPT! It gets a bit messy.
*/
@@ -47,8 +47,9 @@
public final static int POOR = 2;
public final static int BODY = 3;
public final static int XML = 4;
- public final static int WIKI = 12;
- public final static int WIKIBRS = 13;
+ public final static int WIKI = 12; // 1 nl ~ space, 2nl ~ p >2 nl ~ p
+ public final static int WIKIBRS = 13; // can enter more than one br
+ public final static int WIKIBR = 14; // 1 br is allowed.
// default doctype
public final static String XML_DOCTYPE = "<!DOCTYPE mmxf PUBLIC \"" +
Mmxf.DOCUMENTTYPE_PUBLIC + "\" \"" + Mmxf.DOCUMENTTYPE_SYSTEM + "\">\n";
@@ -131,6 +132,7 @@
return XSLTransform("mmxf2rich.xslt", data);
case WIKI :
case WIKIBRS :
+ case WIKIBR :
return XSLTransform("2rich.xslt", data);
case XHTML :
return XSLTransform("mmxf2xhtml.xslt", data);
@@ -141,6 +143,8 @@
}
}
+
+
public String transformBack(String r) {
String result = null;
try {
@@ -157,6 +161,9 @@
result = XML_TAGSTART + wikiToXML(r, false, LISTS_INSIDE_P) +
XML_TAGEND;
validate(XML_HEADER + result);
break;
+ case WIKIBR:
+ r = r.replaceAll("[\\n\\r]{3,}", "\n\n");
+ //log.info("R " + r);
case WIKIBRS :
result = XML_TAGSTART + wikiToXML(r, true, LISTS_INSIDE_P) +
XML_TAGEND;
validate(XML_HEADER + result);
@@ -192,6 +199,8 @@
return "MMXF_WIKI";
case WIKIBRS :
return "MMXF_WIKIBRS";
+ case WIKIBR :
+ return "MMXF_WIKIBR";
default :
return super.getEncoding();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
