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

[Christian Bauer]

  User: cbauer  
  Date: 07/07/06 10:38:38

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/dao 
                        FeedDAO.java
  Log:
  Compiles and runs on latest Seam CVS
  
  Revision  Changes    Path
  1.10      +8 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FeedDAO.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- FeedDAO.java	8 May 2007 17:58:32 -0000	1.9
  +++ FeedDAO.java	6 Jul 2007 14:38:38 -0000	1.10
  @@ -6,6 +6,7 @@
   import org.jboss.seam.wiki.core.engine.WikiTextParser;
   import org.jboss.seam.wiki.core.engine.WikiTextRenderer;
   import org.jboss.seam.wiki.core.engine.WikiLink;
  +import org.jboss.seam.wiki.core.engine.WikiLinkResolver;
   import org.jboss.seam.wiki.core.action.prefs.WikiPreferences;
   import org.jboss.seam.Component;
   import org.jboss.seam.log.Log;
  @@ -71,7 +72,7 @@
           }
       }
   
  -    public void updateFeedEntry(boolean pushOnSiteFeed, Document document) {
  +    public void updateFeedEntry(Document document, boolean pushOnSiteFeed) {
           restrictedEntityManager.joinTransaction();
   
           try {
  @@ -137,6 +138,12 @@
           // Use the WikiTextParser to resolve macros
           WikiTextParser parser = new WikiTextParser(wikiText, true, true);
   
  +        // TODO: hotfix
  +        parser.setCurrentDocument((Document)Component.getInstance("currentDocument"));
  +        parser.setCurrentDirectory((Directory)Component.getInstance("currentDirectory"));
  +
  +        parser.setResolver((WikiLinkResolver)Component.getInstance("wikiLinkResolver"));
  +
           // Set a customized renderer for parser macro callbacks
           parser.setRenderer(
               new WikiTextRenderer() {