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

[Christian Bauer]

  User: cbauer  
  Date: 08/01/10 19:09:15

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum  
                        ForumHome.java TopicHome.java
  Log:
  Improved macro handling in documents and URL rendering
  
  Revision  Changes    Path
  1.4       +10 -5     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ForumHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumHome.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ForumHome.java	20 Dec 2007 12:23:04 -0000	1.3
  +++ ForumHome.java	11 Jan 2008 00:09:15 -0000	1.4
  @@ -70,19 +70,24 @@
               // Default document is topic list
               WikiDocumentDefaults topicListDefaults =
                   new WikiDocumentDefaults() {
  -                    public String getDefaultName() {
  +                    @Override
  +                    public String getName() {
                           return getInstance().getName() + " " + Messages.instance().get("forum.label.Forum");
                       }
  -                    public String[] getDefaultHeaderMacros() {
  +                    @Override
  +                    public String[] getHeaderMacrosAsString() {
                           return new String[] {"clearBackground", "hideControls", "hideComments", "hideTags", "hideCreatorHistory"};
                       }
  -                    public String[] getDefaultContentMacros() {
  +                    @Override
  +                    public String[] getContentMacrosAsString() {
                           return new String[] {"forumTopics"};
                       }
  -                    public String getDefaultContent() {
  +                    @Override
  +                    public String getContentText() {
                           return "";
                       }
  -                    public void setDefaults(WikiDocument document) {
  +                    @Override
  +                    public void setOptions(WikiDocument document) {
                           document.setAreaNumber(getInstance().getAreaNumber());
                           document.setWikiname(WikiUtil.convertToWikiName(document.getName()));
                           document.setNameAsTitle(true);
  
  
  
  1.5       +18 -10    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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- TopicHome.java	4 Jan 2008 22:28:51 -0000	1.4
  +++ TopicHome.java	11 Jan 2008 00:09:15 -0000	1.5
  @@ -11,6 +11,7 @@
   import org.jboss.seam.wiki.core.model.WikiDirectory;
   import org.jboss.seam.wiki.core.model.WikiDocument;
   import org.jboss.seam.wiki.core.model.WikiDocumentDefaults;
  +import org.jboss.seam.wiki.core.engine.WikiMacro;
   import org.jboss.seam.wiki.preferences.Preferences;
   
   import static javax.faces.application.FacesMessage.SEVERITY_INFO;
  @@ -55,21 +56,25 @@
   
           WikiDocumentDefaults newTopicDefaults =
                   new WikiDocumentDefaults() {
  -                    public String getDefaultName() {
  +                    @Override
  +                    public String getName() {
                           return Messages.instance().get("forum.label.NewTopic");
                       }
  -                    public String[] getDefaultHeaderMacros() {
  +                    @Override
  +                    public String[] getHeaderMacrosAsString() {
                           return new String[] { "clearBackground", "hideControls", "hideComments",
                                                 "hideTags", "hideCreatorHistory", "disableContentMacros", "forumPosting" };
                       }
  -                    public String getDefaultContent() {
  +                    @Override
  +                    public String getContentText() {
                           return Messages.instance().get("lacewiki.msg.wikiTextEditor.EditThisTextPreviewUpdatesAutomatically");
                       }
  -
  -                    public String[] getDefaultFooterMacros() {
  +                    @Override
  +                    public String[] getFooterMacrosAsString() {
                           return new String[] { "forumReplies" };
                       }
  -                    public void setDefaults(WikiDocument newTopic) {
  +                    @Override
  +                    public void setOptions(WikiDocument newTopic) {
                           newTopic.setNameAsTitle(false);
                           newTopic.setEnableComments(true);
                           newTopic.setEnableCommentForm(true);
  @@ -86,10 +91,13 @@
       @Override
       protected boolean beforePersist() {
           // TODO: Use macro parameters for "sticky" and "notify" options instead of additional macros
  -        if (isSticky())
  -            getInstance().replaceHeaderMacro("forumPosting", "forumStickyPosting");
  -        if (isNotifyReplies())
  -            getInstance().addHeaderMacro(TOPIC_NOTIFY_ME_MACRO);
  +        if (isSticky()) {
  +            getInstance().removeHeaderMacros("forumPosting");
  +            getInstance().addHeaderMacro(new WikiMacro("forumStickyPosting"));
  +        }
  +        if (isNotifyReplies()) {
  +            getInstance().addHeaderMacro(new WikiMacro(TOPIC_NOTIFY_ME_MACRO));
  +        }
           return super.beforePersist();
       }