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

[Christian Bauer]

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

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action  
                        DocumentHome.java Authenticator.java
  Log:
  Improved macro handling in documents and URL rendering
  
  Revision  Changes    Path
  1.42      +1 -4      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DocumentHome.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -b -r1.41 -r1.42
  --- DocumentHome.java	9 Jan 2008 15:59:24 -0000	1.41
  +++ DocumentHome.java	11 Jan 2008 00:09:16 -0000	1.42
  @@ -282,21 +282,18 @@
           getInstance().setTagsCommaSeparated(tagString);
       }
   
  -    private void syncMacros(WikiDocument doc) {
  +    public void syncMacros(WikiDocument doc) {
           if (doc.getHeader() != null) {
               MacroWikiTextRenderer renderer = MacroWikiTextRenderer.renderMacros(doc.getHeader());
               doc.setHeaderMacros(renderer.getMacros());
  -            doc.setHeaderMacrosString(renderer.getMacrosString());
           }
           if (doc.getContent() != null) {
               MacroWikiTextRenderer renderer = MacroWikiTextRenderer.renderMacros(doc.getContent());
               doc.setContentMacros(renderer.getMacros());
  -            doc.setContentMacrosString(renderer.getMacrosString());
           }
           if (doc.getFooter() != null) {
               MacroWikiTextRenderer renderer = MacroWikiTextRenderer.renderMacros(doc.getFooter());
               doc.setFooterMacros(renderer.getMacros());
  -            doc.setFooterMacrosString(renderer.getMacrosString());
           }
       }
   
  
  
  
  1.18      +0 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Authenticator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Authenticator.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- Authenticator.java	10 Jan 2008 08:37:45 -0000	1.17
  +++ Authenticator.java	11 Jan 2008 00:09:16 -0000	1.18
  @@ -169,7 +169,6 @@
   
           MacroWikiTextRenderer renderer = MacroWikiTextRenderer.renderMacros(homePage.getContent());
           homePage.setContentMacros(renderer.getMacros());
  -        homePage.setContentMacrosString(renderer.getMacrosString());
   
           homePage.setParent(homeDirectory);
           homeDirectory.setDefaultFile(homePage);