Update of
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/org/mmbase/applications/wordfilter
In directory
james.mmbase.org:/tmp/cvs-serv789/cmsc/richtext/src/java/org/mmbase/applications/wordfilter
Modified Files:
Tag: b1_5
WordHtmlCleaner.java
Log Message:
CMSC-1204 - adding replaceParagraphs flag
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/richtext/src/java/org/mmbase/applications/wordfilter
See also: http://www.mmbase.org/jira/browse/CMSC-1204
Index: WordHtmlCleaner.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/org/mmbase/applications/wordfilter/WordHtmlCleaner.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- WordHtmlCleaner.java 9 Jun 2008 21:23:24 -0000 1.15
+++ WordHtmlCleaner.java 24 Dec 2008 13:07:26 -0000 1.15.2.1
@@ -105,6 +105,21 @@
* @return clean html code
*/
public static String cleanHtml(String textStr, boolean replaceHeaders) {
+ /* replaceParagraphs - is set to true, to keep old functionality working
*/
+ boolean replaceParagraphs = true;
+ return cleanHtml(textStr, replaceHeaders, replaceParagraphs);
+ }
+
+ /**
+ * Cleans html code
+ *
+ * @param textStr
+ * ugly html code
+ * @param replaceHeaders
+ * @param replaceParagraphs
+ * @return clean html code
+ */
+ public static String cleanHtml(String textStr, boolean replaceHeaders,
boolean replaceParagraphs) {
log.debug("old value : " + textStr);
if (textStr != null) {
try {
@@ -117,7 +132,10 @@
xmlStr = removeHtmlIfComments(xmlStr);
xmlStr = fixBR(xmlStr);
xmlStr = removeEmptyFonts(xmlStr);
+
+ if (replaceParagraphs) {
xmlStr = replaceParagraph(xmlStr);
+ }
if (replaceHeaders) {
xmlStr = replaceHeaders(xmlStr);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
