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

[Christian Bauer]

  User: cbauer  
  Date: 07/11/20 03:05:10

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum    
                        ForumQuery.java ReplyHome.java TopicHome.java
  Added:       examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum    
                        ForumPreferences.java
  Log:
  First import of the seamframework.org theme
  
  Revision  Changes    Path
  1.2       +7 -3      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumQuery.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ForumQuery.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumQuery.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ForumQuery.java	9 Nov 2007 15:00:28 -0000	1.1
  +++ ForumQuery.java	20 Nov 2007 08:05:09 -0000	1.2
  @@ -22,9 +22,12 @@
   
       private Pager pager;
   
  +    @In
  +    ForumPreferences forumPreferences;
  +
       @RequestParameter
       public void setPage(Integer page) {
  -        if (pager == null) pager = new Pager(2l);
  +        if (pager == null) pager = new Pager(forumPreferences.getTopicsPerPage());
           pager.setPage(page);
       }
   
  @@ -57,8 +60,9 @@
           return forumInfo;
       }
   
  -    @Observer(value = {"Forum.forumListRefresh", "org.jboss.seam.postAuthenticate"}, create = false)
  +    @Observer(value = {"Forum.forumListRefresh", "PersistenceContext.filterReset"}, create = false)
       public void loadForums() {
  +
           forums = forumDAO.findForums(currentDirectory);
           forumInfo = forumDAO.findForumInfo(currentDirectory);
   
  @@ -87,7 +91,7 @@
           return topics;
       }
   
  -    @Observer(value = {"Forum.topicPersisted", "org.jboss.seam.postAuthenticate"}, create = false)
  +    @Observer(value = {"Forum.topicPersisted", "PersistenceContext.filterReset"}, create = false)
       public void loadTopics() {
           pager.setNumOfRecords( forumDAO.findTopicCount(currentDirectory) );
           topics = pager.getNumOfRecords() > 0
  
  
  
  1.2       +0 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ReplyHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReplyHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ReplyHome.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ReplyHome.java	9 Nov 2007 15:00:28 -0000	1.1
  +++ ReplyHome.java	20 Nov 2007 08:05:10 -0000	1.2
  @@ -4,7 +4,6 @@
   import org.jboss.seam.wiki.core.model.Comment;
   import org.jboss.seam.wiki.core.model.Document;
   import org.jboss.seam.wiki.core.model.User;
  -import org.jboss.seam.wiki.core.dao.FeedDAO;
   import org.jboss.seam.wiki.util.WikiUtil;
   import org.jboss.seam.annotations.*;
   import org.jboss.seam.ScopeType;
  
  
  
  1.2       +10 -0     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/TopicHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TopicHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/TopicHome.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TopicHome.java	9 Nov 2007 15:00:28 -0000	1.1
  +++ TopicHome.java	20 Nov 2007 08:05:10 -0000	1.2
  @@ -6,6 +6,7 @@
   import org.jboss.seam.wiki.core.action.NodeHome;
   import org.jboss.seam.wiki.core.engine.WikiLinkResolver;
   import org.jboss.seam.wiki.core.model.Directory;
  +import org.jboss.seam.wiki.core.model.User;
   import org.jboss.seam.wiki.core.dao.FeedDAO;
   
   import static javax.faces.application.FacesMessage.SEVERITY_INFO;
  @@ -23,6 +24,7 @@
   
       private boolean showForm = false;
       private String formContent;
  +    private User user;
   
       /* -------------------------- Basic Overrides ------------------------------ */
   
  @@ -59,6 +61,10 @@
           formContent = wikiLinkResolver.convertFromWikiProtocol(dir.getAreaNumber(), getInstance().getContentWithoutMacros());
       }
   
  +    protected User getCurrentUser() {
  +        return user; // Return user from this persistence context
  +    }
  +
       /* -------------------------- Messages ------------------------------ */
   
       protected void createdMessage() {
  @@ -100,6 +106,10 @@
   
           // Get a fresh parent directory instance into the current persistence context
           setParentDirectory(loadParentDirectory(getParentDirectory().getId()));
  +
  +        // Get a fresh user instance into the current persistence context
  +        user = getUserDAO().findUser(currentUser.getId());
  +
       }
   
       @End
  
  
  
  1.1      date: 2007/11/20 08:05:10;  author: cbauer;  state: Exp;jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumPreferences.java
  
  Index: ForumPreferences.java
  ===================================================================
  package org.jboss.seam.wiki.plugin.forum;
  
  import org.jboss.seam.wiki.preferences.PreferenceSupport;
  import org.jboss.seam.wiki.preferences.PreferenceVisibility;
  import org.jboss.seam.wiki.preferences.Preference;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Observer;
  import org.jboss.seam.annotations.AutoCreate;
  import org.jboss.seam.ScopeType;
  import org.hibernate.validator.NotNull;
  import org.hibernate.validator.Range;
  
  import java.io.Serializable;
  
  @Name("forumPreferences")
  @Scope(ScopeType.CONVERSATION)
  @AutoCreate
  @Preference(description = "Plugin: Forum", visibility = PreferenceVisibility.USER)
  public class ForumPreferences extends PreferenceSupport implements Serializable {
  
      public String getCurrentUserVariable() { return "currentUser"; }
      public String getCurrentInstanceVariable() { return "currentDocument"; }
  
      @Observer("PreferenceEditor.refresh.forumPreferences")
      public void refreshProperties() { super.refreshProperties(); }
  
      @Preference(description = "01. Number of topics per page", visibility = PreferenceVisibility.USER)
      @Range(min = 1l, max = 999l)
      @NotNull
      private Long topicsPerPage;
  
      public Long getTopicsPerPage() {
          return topicsPerPage;
      }
  }