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

[Christian Bauer]

  User: cbauer  
  Date: 07/12/18 23:29:32

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirMenu 
                        DirMenu.java
  Log:
  Major rewrite of the most of the application
  
  Revision  Changes    Path
  1.3       +10 -10    jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirMenu/DirMenu.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DirMenu.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/dirMenu/DirMenu.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- DirMenu.java	25 Aug 2007 17:59:21 -0000	1.2
  +++ DirMenu.java	19 Dec 2007 04:29:32 -0000	1.3
  @@ -10,10 +10,9 @@
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Observer;
  -import org.jboss.seam.wiki.core.model.Directory;
  -import org.jboss.seam.wiki.core.model.Node;
  -import org.jboss.seam.wiki.core.dao.NodeDAO;
  -import org.jboss.seam.wiki.core.nestedset.NestedSetNodeWrapper;
  +import org.jboss.seam.wiki.core.nestedset.query.NestedSetNodeWrapper;
  +import org.jboss.seam.wiki.core.dao.WikiNodeDAO;
  +import org.jboss.seam.wiki.core.model.WikiDirectory;
   import org.jboss.seam.ScopeType;
   
   import java.io.Serializable;
  @@ -28,17 +27,17 @@
   public class DirMenu implements Serializable {
   
       @In
  -    Directory currentDirectory;
  +    WikiDirectory currentDirectory;
   
       @In
  -    NodeDAO nodeDAO;
  +    WikiNodeDAO wikiNodeDAO;
   
       @In
       DirMenuPreferences dirMenuPreferences;
  +/*
  +    NestedSetNodeWrapper<WikiDirectoryNSDelegate> root;
   
  -    NestedSetNodeWrapper<Node> root;
  -
  -    public NestedSetNodeWrapper<Node> getRoot() {
  +    public NestedSetNodeWrapper<WikiDirectoryNSDelegate> getRoot() {
           if (root == null) {
               refreshRoot();
           }
  @@ -47,6 +46,7 @@
   
       @Observer("PreferenceComponent.refresh.dirMenuPreferences")
       public void refreshRoot() {
  -        root = nodeDAO.findMenuItems(currentDirectory, dirMenuPreferences.getMenuDepth(), dirMenuPreferences.getMenuLevels(), false);
  +        root = wikiNodeDAO.findWikiDirectoryTree(currentDirectory, dirMenuPreferences.getMenuDepth(), dirMenuPreferences.getMenuLevels(), false);
       }
  +    */
   }