[MMBASE CVS] contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext RichTextSetProcessor.java RichText.java

[kbettinger]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext
In directory 
james.mmbase.org:/tmp/cvs-serv949/cmsc/richtext/src/java/com/finalist/cmsc/richtext

Modified Files:
        RichTextSetProcessor.java RichText.java 
Log Message:
CMSC-1204 - adding replaceParagraphs flag


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext
See also: http://www.mmbase.org/jira/browse/CMSC-1204


Index: RichTextSetProcessor.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichTextSetProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- RichTextSetProcessor.java   16 May 2008 11:46:32 -0000      1.4
+++ RichTextSetProcessor.java   24 Dec 2008 13:08:23 -0000      1.5
@@ -33,12 +33,13 @@
 
    public Processor createProcessor(Parameters parameters) {
        final boolean replaceHeaders = 
Boolean.parseBoolean(parameters.get("replaceHeaders").toString());
+       final boolean replaceParagraphs = 
Boolean.parseBoolean(parameters.get("replaceParagraphs").toString());
        return new Processor() {
 
            public Object process(Node node, Field field, Object value) {
               if (value instanceof String) {
                  String in = (String) value;
-                 String out = RichText.cleanRichText(in, replaceHeaders);
+                 String out = RichText.cleanRichText(in, replaceHeaders, 
replaceParagraphs);
                  if (log.isDebugEnabled() && !out.equals(in)) {
                     log.debug("Replaced " + field.getName() + " value \"" + in 
+ "\"\n \t by \n\"" + out + "\"");
                  }


Index: RichText.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/RichText.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- RichText.java       25 Jul 2008 15:54:10 -0000      1.8
+++ RichText.java       24 Dec 2008 13:08:23 -0000      1.9
@@ -65,13 +65,13 @@
    }
 
 
-   public final static String cleanRichText(String originalValue, boolean 
replaceHeaders) {
+   public final static String cleanRichText(String originalValue, boolean 
replaceHeaders, boolean replaceParagraphs) {
       // if string is null or empty, (re)set it's value to empty string
       String newValue = "";
       if (originalValue != null && !"".equals(originalValue.trim())) {
          // Edited value: clean.
          log.debug("before cleaning: " + originalValue);
-         newValue = WordHtmlCleaner.cleanHtml(originalValue, replaceHeaders);
+         newValue = WordHtmlCleaner.cleanHtml(originalValue, replaceHeaders, 
replaceParagraphs);
          log.debug("after cleaning: " + newValue);
       }
       return newValue;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs