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

[Christian Bauer]

  User: cbauer  
  Date: 07/12/29 21:33:25

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory      
                        BlogDirectory.java
  Added:       examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory      
                        BlogPreferences.java BlogPreferencesSupport.java
  Removed:     examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory      
                        BlogRecentEntriesPreferences.java
                        BlogDirectoryPreferences.java
                        BlogArchivePreferences.java
  Log:
  Complete overhaul of the preferences system
  
  Revision  Changes    Path
  1.21      +4 -5      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BlogDirectory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogDirectory.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- BlogDirectory.java	19 Dec 2007 04:29:19 -0000	1.20
  +++ BlogDirectory.java	30 Dec 2007 02:33:25 -0000	1.21
  @@ -7,7 +7,6 @@
   package org.jboss.seam.wiki.plugin.blogdirectory;
   
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Component;
   import org.jboss.seam.annotations.*;
   import org.jboss.seam.annotations.Observer;
   import org.jboss.seam.annotations.web.RequestParameter;
  @@ -16,6 +15,7 @@
   import org.jboss.seam.wiki.core.model.WikiDirectory;
   import org.jboss.seam.wiki.core.model.WikiDocument;
   import org.jboss.seam.wiki.util.WikiUtil;
  +import org.jboss.seam.wiki.preferences.Preferences;
   
   import java.io.Serializable;
   import java.util.*;
  @@ -84,10 +84,9 @@
   
       // Lazier than @In, would be too many injections because of c:forEach iteration on blog entry list
       private void initializePreferences() {
  -        pageSize = 
  -                ((BlogDirectoryPreferences) Component.getInstance("blogDirectoryPreferences")).getPageSize();
  -        recentBlogEntriesCount =
  -                ((BlogRecentEntriesPreferences)Component.getInstance("blogRecentEntriesPreferences")).getRecentHeadlines();
  +        // TODO: Uhm, we have several macros that use this backend bean... that doesn't work
  +        pageSize = ((BlogPreferences) Preferences.getInstance("Blog", "currentMacro")).getPageSize();
  +        recentBlogEntriesCount = ((BlogPreferences) Preferences.getInstance("Blog", "currentMacro")).getRecentEntriesItems();
       }
   
       private void queryNumOfBlogEntries() {
  
  
  
  1.1      date: 2007/12/30 02:33:25;  author: cbauer;  state: Exp;jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogPreferences.java
  
  Index: BlogPreferences.java
  ===================================================================
  /*
   * JBoss, Home of Professional Open Source
   *
   * Distributable under LGPL license.
   * See terms of license at gnu.org.
   */
  package org.jboss.seam.wiki.plugin.blogdirectory;
  
  import org.jboss.seam.wiki.preferences.annotations.Preferences;
  import org.jboss.seam.wiki.preferences.annotations.PreferenceProperty;
  import org.jboss.seam.wiki.preferences.PreferenceVisibility;
  import org.hibernate.validator.Range;
  import org.hibernate.validator.NotNull;
  
  import java.io.Serializable;
  
  /**
   * @author Christian Bauer
   */
  @Preferences(name = "Blog", description = "#{messages['blog.preferences.Name']}")
  public class BlogPreferences implements Serializable {
  
      @PreferenceProperty(
          description = "#{messages['blog.preferences.PageSize']}",
          visibility = {PreferenceVisibility.SYSTEM, PreferenceVisibility.INSTANCE},
          editorIncludeName = "NumberRange"
      )
      @Range(min = 3l, max = 25l)
      @NotNull
      private Long pageSize;
  
      @PreferenceProperty(
          description = "#{messages['blog.preferences.ArchiveSubscribeIcon']}",
          visibility = {PreferenceVisibility.SYSTEM, PreferenceVisibility.INSTANCE}
      )
      @NotNull
      private Boolean archiveSubscribeIcon;
  
      @PreferenceProperty(
          description = "#{messages['blog.preferences.RecentEntriesItems']}",
          visibility = {PreferenceVisibility.SYSTEM, PreferenceVisibility.INSTANCE},
          editorIncludeName = "NumberRange"
      )
      @Range(min = 3l, max = 100l)
      @NotNull
      private Long recentEntriesItems;
  
      @PreferenceProperty(
          description = "#{messages['blog.preferences.RecentEntriesTruncateTitle']}",
          visibility = {PreferenceVisibility.SYSTEM, PreferenceVisibility.INSTANCE},
          editorIncludeName = "NumberRange"
      )
      @Range(min = 3l, max = 100l)
      @NotNull
      private Long recentEntriesTruncateTitle;
  
      @PreferenceProperty(
          description = "#{messages['blog.preferences.RecentEntriesSubscribeIcon']}",
          visibility = {PreferenceVisibility.SYSTEM, PreferenceVisibility.INSTANCE}
      )
      @NotNull
      private Boolean recentEntriesSubscribeIcon;
  
      public Long getPageSize() {
          return pageSize;
      }
  
      public Boolean getArchiveSubscribeIcon() {
          return archiveSubscribeIcon;
      }
  
      public Long getRecentEntriesItems() {
          return recentEntriesItems;
      }
  
      public Long getRecentEntriesTruncateTitle() {
          return recentEntriesTruncateTitle;
      }
  
      public Boolean getRecentEntriesSubscribeIcon() {
          return recentEntriesSubscribeIcon;
      }
  }
  
  
  
  1.1      date: 2007/12/30 02:33:25;  author: cbauer;  state: Exp;jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/blogdirectory/BlogPreferencesSupport.java
  
  Index: BlogPreferencesSupport.java
  ===================================================================
  /*
   * JBoss, Home of Professional Open Source
   *
   * Distributable under LGPL license.
   * See terms of license at gnu.org.
   */
  package org.jboss.seam.wiki.plugin.blogdirectory;
  
  import org.jboss.seam.wiki.preferences.metamodel.PreferencesSupport;
  import org.jboss.seam.wiki.preferences.metamodel.PreferenceEntity;
  import org.jboss.seam.annotations.Name;
  
  import java.util.HashSet;
  import java.util.Set;
  
  /**
   * @author Christian Bauer
   */
  @Name("blogPreferencesSupport")
  public class BlogPreferencesSupport extends PreferencesSupport {
  
      public Set<PreferenceEntity> getPreferenceEntities() {
          return new HashSet<PreferenceEntity>() {{
              add( createPreferenceEntity(BlogPreferences.class) );
          }};
      }
  
  }