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

[Christian Bauer]

  User: cbauer  
  Date: 07/09/15 13:06:19

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/action    
                        Menu.java DocumentHome.java DirectoryHome.java
                        AdminHome.java
  Log:
  Various updates (tests still broken)
  
  Revision  Changes    Path
  1.11      +1 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Menu.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Menu.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/Menu.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- Menu.java	25 Aug 2007 17:59:24 -0000	1.10
  +++ Menu.java	15 Sep 2007 17:06:19 -0000	1.11
  @@ -25,7 +25,7 @@
    * @author Christian Bauer
    */
   @Name("menu")
  - at Scope(ScopeType.CONVERSATION)
  + at Scope(ScopeType.PAGE)
   public class Menu implements Serializable {
   
       @In
  
  
  
  1.27      +2 -0      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.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- DocumentHome.java	6 Sep 2007 15:54:28 -0000	1.26
  +++ DocumentHome.java	15 Sep 2007 17:06:19 -0000	1.27
  @@ -15,8 +15,10 @@
   import org.jboss.seam.wiki.core.dao.FeedDAO;
   import org.jboss.seam.wiki.core.dao.UserRoleAccessFactory;
   import org.jboss.seam.wiki.core.action.prefs.DocumentEditorPreferences;
  +import org.jboss.seam.wiki.preferences.PreferenceSupport;
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  +import org.jboss.seam.core.Conversation;
   import org.jboss.seam.log.Log;
   import org.jboss.seam.contexts.Contexts;
   
  
  
  
  1.17      +31 -7     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DirectoryHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/DirectoryHome.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- DirectoryHome.java	1 Sep 2007 19:05:09 -0000	1.16
  +++ DirectoryHome.java	15 Sep 2007 17:06:19 -0000	1.17
  @@ -7,18 +7,16 @@
   package org.jboss.seam.wiki.core.action;
   
   import org.jboss.seam.annotations.*;
  +import org.jboss.seam.annotations.Observer;
   import org.jboss.seam.annotations.security.Restrict;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.wiki.core.model.Directory;
  -import org.jboss.seam.wiki.core.model.Node;
  -import org.jboss.seam.wiki.core.model.Document;
  -import org.jboss.seam.wiki.core.model.Feed;
  +import org.jboss.seam.wiki.core.model.*;
  +import org.jboss.seam.wiki.core.dao.WikiTreeNodeAdapter;
   import org.jboss.seam.wiki.util.WikiUtil;
  +import org.richfaces.model.TreeNode;
   
   import javax.faces.application.FacesMessage;
  -import java.util.List;
  -import java.util.ArrayList;
  -import java.util.Date;
  +import java.util.*;
   
   @Name("directoryHome")
   @Scope(ScopeType.CONVERSATION)
  @@ -142,6 +140,32 @@
   
       /* -------------------------- Public Features ------------------------------ */
   
  +    @In(required=false)
  +    @Out(required = false, scope=ScopeType.PAGE)
  +    WikiTreeNodeAdapter directoryTree;
  +
  +    public TreeNode getTree() {
  +        if (directoryTree == null) {
  +            directoryTree = new WikiTreeNodeAdapter(getInstance(), getNodeDAO().getComparatorDisplayPosition(), 2l);
  +            directoryTree.loadChildren();
  +        }
  +        return directoryTree;
  +        /*
  +        TreeNode root = new TreeNodeImpl();
  +        TreeNode bar = new TreeNodeImpl();
  +        TreeNode baz = new TreeNodeImpl();
  +        TreeNode faz  = new TreeNodeImpl();
  +        root.setData("Foo");
  +        bar.setData("bar");
  +        baz.setData("baz");
  +        faz.setData("faz");
  +        root.addChild("1", bar);
  +        root.addChild("2", baz);
  +        root.addChild("3", faz);
  +        return root;
  +        */
  +    }
  +
       private boolean hasFeed;
   
       public boolean isHasFeed() {
  
  
  
  1.9       +1 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/AdminHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AdminHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/AdminHome.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- AdminHome.java	9 Jul 2007 16:37:40 -0000	1.8
  +++ AdminHome.java	15 Sep 2007 17:06:19 -0000	1.9
  @@ -161,7 +161,7 @@
           EntityManager em = (EntityManager) Component.getInstance("entityManager");
   
           for (SearchableEntity indexedEntity : indexedEntities) {
  -            DirectoryProvider dirProvider = ((FullTextSession)em.getDelegate()).getSearchFactory().getDirectoryProvider(indexedEntity.getClazz());
  +            DirectoryProvider dirProvider = ((FullTextSession)em.getDelegate()).getSearchFactory().getDirectoryProviders(indexedEntity.getClazz())[0];
               IndexReader reader = IndexReader.open(dirProvider.getDirectory());
   
               indexedEntity.setNumOfIndexedDocuments(reader.numDocs());