Update of /var/cvs/applications/richtext/src/org/mmbase/richtext/transformers
In directory james.mmbase.org:/tmp/cvs-serv13764
Modified Files:
XmlField.java
Log Message:
moved wiki specific stuff from org.mmbase.util.transformers.XmlField
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- XmlField.java 21 Feb 2007 15:03:25 -0000 1.4
+++ XmlField.java 25 Mar 2008 17:07:59 -0000 1.5
@@ -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.4 2007/02/21 15:03:25 michiel Exp $
+ * @version $Id: XmlField.java,v 1.5 2008/03/25 17:07:59 michiel Exp $
* @todo THIS CLASS NEEDS A CONCEPT! It gets a bit messy.
*/
@@ -66,20 +66,22 @@
protected final static boolean LISTS_OUTSIDE_P = false;
+ static {
+ org.mmbase.util.Encode.register(XmlField.class.getName());
+ }
+
+
+
private static Pattern wikiWrappingAnchor =
Pattern.compile("\\[(\\w+):(.*?)\\]");
private static Pattern wikiP = Pattern.compile("<p>\\[(\\w+)\\]");
private static Pattern wikiSection =
Pattern.compile("<section><h>\\[(\\w+)\\]");
private static Pattern wikiAnchor = Pattern.compile("\\[(\\w+)\\]");
- static {
- org.mmbase.util.Encode.register(XmlField.class.getName());
- }
-
- public static String wikiToXML(String data) {
+ public static String wikiToXML(String data, boolean placeListsInsideP) {
Matcher wrappingAnchors =
wikiWrappingAnchor.matcher(prepareDataString(data));
data = wrappingAnchors.replaceAll("<a id=\"$1\">$2</a>");
StringObject obj = new StringObject(data);
- handleRich(obj, true, false, true);
+ handleRich(obj, true, false, true, placeListsInsideP);
handleFormat(obj, false);
String string = obj.toString();
Matcher ps = wikiP.matcher(string);
@@ -89,7 +91,9 @@
Matcher anchors = wikiAnchor.matcher(string);
string = anchors.replaceAll("<a id=\"$1\" />");
return string;
-
+ }
+ public static String wikiToXML(String data) {
+ return wikiToXML(data, false);
}
/**
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
