Update of /var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml
In directory
james.mmbase.org:/tmp/cvs-serv15557/src/org/mmbase/richtext/processors/xml
Modified Files:
MmxfGetString.java MmxfSetString.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/processors/xml
Index: MmxfGetString.java
===================================================================
RCS file:
/var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml/MmxfGetString.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- MmxfGetString.java 10 Jun 2008 14:26:15 -0000 1.14
+++ MmxfGetString.java 10 Jun 2008 15:46:11 -0000 1.15
@@ -30,7 +30,7 @@
* This class implements the `get' for `mmxf' fields.
*
* @author Michiel Meeuwissen
- * @version $Id: MmxfGetString.java,v 1.14 2008/06/10 14:26:15 michiel Exp $
+ * @version $Id: MmxfGetString.java,v 1.15 2008/06/10 15:46:11 michiel Exp $
* @since MMBase-1.8
*/
@@ -38,7 +38,7 @@
public static String MODE_SHOWBROKEN =
"org.mmbase.richtext.wiki.show_broken";
public static String MODE_LOADRELATIONS =
"org.mmbase.richtext.wiki.load_relations";
public static String MODE_UNDECORATEIDS =
"org.mmbase.richtext.wiki.undecorateids";
- public static String MODE_IGNOREBRS =
"org.mmbase.richtext.wiki.ignorebrs";
+ public static String MODE_BRS = "org.mmbase.richtext.wiki.brs";
private static final Logger log =
Logging.getLoggerInstance(MmxfGetString.class);
Index: MmxfSetString.java
===================================================================
RCS file:
/var/cvs/applications/richtext/src/org/mmbase/richtext/processors/xml/MmxfSetString.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- MmxfSetString.java 10 Jun 2008 14:26:15 -0000 1.23
+++ MmxfSetString.java 10 Jun 2008 15:46:11 -0000 1.24
@@ -24,7 +24,7 @@
* Set-processing for an `mmxf' field. This is the counterpart and inverse of
[EMAIL PROTECTED] MmxfGetString}, for more
* information see the javadoc of that class.
* @author Michiel Meeuwissen
- * @version $Id: MmxfSetString.java,v 1.23 2008/06/10 14:26:15 michiel Exp $
+ * @version $Id: MmxfSetString.java,v 1.24 2008/06/10 15:46:11 michiel Exp $
* @since MMBase-1.8
*/
@@ -33,11 +33,12 @@
private static final long serialVersionUID = 1L;
- private static XmlField xmlField = new XmlField(XmlField.WIKI);
- private static XmlField xmlFieldBrs = new XmlField(XmlField.WIKIBRS);
- private static Kupu kupu = new Kupu();
- private static DocBook docbook = new DocBook();
- private static Wiki wiki = new Wiki();
+ private static final XmlField xmlField = new XmlField(XmlField.WIKI);
+ private static final XmlField xmlFieldBrs = new XmlField(XmlField.WIKIBRS);
+ private static final XmlField xmlFieldBr = new XmlField(XmlField.WIKIBR);
+ private static final Kupu kupu = new Kupu();
+ private static final DocBook docbook = new DocBook();
+ private static final Wiki wiki = new Wiki();
@@ -57,10 +58,15 @@
if (log.isTraceEnabled()) {
log.trace("Handling wiki-input: " + value);
}
- String xml =
-
"true".equals(node.getCloud().getProperty(MmxfGetString.MODE_IGNOREBRS)) ?
- xmlField.transformBack(Util.toString(value).trim()) :
- xmlFieldBrs.transformBack(Util.toString(value).trim());
+ String xml;
+ Object brsMode =
node.getCloud().getProperty(MmxfGetString.MODE_BRS);
+ if ("none".equals(brsMode)) {
+ xml = xmlField.transformBack(Util.toString(value).trim());
+ } else if ("single".equals(brsMode)) {
+ xml =
xmlFieldBr.transformBack(Util.toString(value).trim());
+ } else {
+ xml =
xmlFieldBrs.transformBack(Util.toString(value).trim());
+ }
if (log.isDebugEnabled()) {
log.debug("XML: " + xml);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
