[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/util ...

[Christian Bauer]

  User: cbauer  
  Date: 07/08/30 12:51:00

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/util 
                        WikiUtil.java
  Log:
  Finished Blosxom importer (not perfect though) and minor bugfixes
  
  Revision  Changes    Path
  1.13      +4 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- WikiUtil.java	25 Aug 2007 17:59:27 -0000	1.12
  +++ WikiUtil.java	30 Aug 2007 16:51:00 -0000	1.13
  @@ -146,7 +146,7 @@
           return string.replaceAll("@", wikiPrefs.getAtSymbolReplacement());
       }
   
  -    public static String escapeHtml(String string) {
  +    public static String escapeHtml(String string, boolean convertNewlines) {
           if (string == null) return null;
           StringBuilder sb = new StringBuilder();
           String htmlEntity;
  @@ -166,6 +166,9 @@
                   sb.append(c);
               }
           }
  +        if (convertNewlines) {
  +            return sb.toString().replaceAll("\n", "<br/>");
  +        }
           return sb.toString();
       }