Update of /var/cvs/src/org/mmbase/util/transformers
In directory james.mmbase.org:/tmp/cvs-serv13707
Modified Files:
XmlField.java
Log Message:
moved wiki specific stuff to richtext app
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers
Index: XmlField.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/transformers/XmlField.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- XmlField.java 4 Aug 2007 08:09:14 -0000 1.51
+++ XmlField.java 25 Mar 2008 17:07:24 -0000 1.52
@@ -20,7 +20,7 @@
* XMLFields in MMBase. This class can encode such a field to several other
formats.
*
* @author Michiel Meeuwissen
- * @version $Id: XmlField.java,v 1.51 2007/08/04 08:09:14 michiel Exp $
+ * @version $Id: XmlField.java,v 1.52 2008/03/25 17:07:24 michiel Exp $
*/
public class XmlField extends ConfigurableStringTransformer implements
CharTransformer {
@@ -718,31 +718,6 @@
obj.replace("\n", "<br />\r"); // handle new remaining newlines.
}
- 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+)\\]");
-
- 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, SECTIONS, REMOVE_NEWLINES, SURROUNDING_P,
placeListsInsideP);
- handleFormat(obj, false);
- String string = obj.toString();
- Matcher ps = wikiP.matcher(string);
- string = ps.replaceAll("<p id=\"$1\">");
- Matcher sections = wikiSection.matcher(string);
- string = sections.replaceAll("<section id=\"$1\"><h>");
- Matcher anchors = wikiAnchor.matcher(string);
- string = anchors.replaceAll("<a id=\"$1\" />");
- return string;
- }
-
- public static String wikiToXML(String data) {
- return wikiToXML(data, LISTS_OUTSIDE_P);
- }
-
/**
* Defines a kind of 'rich' text format. This is a way to easily
* type structured text in XML. The XML tags which can be
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
