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

[Christian Bauer]

  User: cbauer  
  Date: 08/01/10 19:09:17

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/util 
                        WikiUtil.java
  Log:
  Improved macro handling in documents and URL rendering
  
  Revision  Changes    Path
  1.25      +3 -3      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.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- WikiUtil.java	30 Dec 2007 02:33:27 -0000	1.24
  +++ WikiUtil.java	11 Jan 2008 00:09:17 -0000	1.25
  @@ -88,13 +88,12 @@
       public static String renderPermURL(WikiNode node) {
           if (node == null || node.getId() == null) return "";
           WikiPreferences prefs = (WikiPreferences)Preferences.getInstance("Wiki");
  -        return prefs.getBaseUrl() + node.getPermURL(prefs.getPermlinkSuffix());
  +        return Component.getInstance("basePath") + "/" + node.getPermURL(prefs.getPermlinkSuffix());
       }
   
       public static String renderWikiURL(WikiNode node) {
           if (node == null || node.getId() == null) return "";
  -        WikiPreferences prefs = (WikiPreferences)Preferences.getInstance("Wiki");
  -        return prefs.getBaseUrl() + node.getWikiURL();
  +        return Component.getInstance("basePath") + "/" + node.getWikiURL();
       }
   
       public static boolean showEmailAddress() {
  @@ -166,6 +165,7 @@
           return sb.toString();
       }
   
  +    // TODO: Ouch...
       public static String removeMacros(String string) {
           String REGEX_MACRO = Pattern.quote("[") + "<=[a-z]{1}?[a-zA-Z0-9]+?" + Pattern.quote("]");
           return string.replaceAll(REGEX_MACRO, "");