[jboss-cvs] JBossBlog SVN: r206 - in trunk: src/action/org/jboss/blog/session/xml/velocity/tools and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: adamw
Date: 2008-02-08 06:17:30 -0500 (Fri, 08 Feb 2008)
New Revision: 206

Removed:
   trunk/src/action/org/jboss/blog/session/feed/posts/PostAuthorServiceBean.java
Modified:
   trunk/src/action/org/jboss/blog/session/xml/velocity/tools/XmlTools.java
   trunk/src/model/org/jboss/blog/model/Post.java
   trunk/view/common/post.xhtml
   trunk/view/manage/template/template_mod.xhtml
Log:


Deleted: trunk/src/action/org/jboss/blog/session/feed/posts/PostAuthorServiceBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/posts/PostAuthorServiceBean.java	2008-02-08 11:10:59 UTC (rev 205)
+++ trunk/src/action/org/jboss/blog/session/feed/posts/PostAuthorServiceBean.java	2008-02-08 11:17:30 UTC (rev 206)
@@ -1,30 +0,0 @@
-package org.jboss.blog.session.feed.posts;
-
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.ScopeType;
-import org.jboss.blog.model.Post;
-import org.jboss.blog.tools.StringTools;
-
-/**
- * @author <a href="mailto:adam at warski.org">Adam Warski</a>
- */
- at Name("postAuthorService")
- at Scope(ScopeType.STATELESS)
-public class PostAuthorServiceBean {
-    public String getAuthor(Post post) {
-        String postAuthor = post.getAuthor();
-        switch (post.getFeed().getPostAuthorType()) {
-            case POST_AUTHOR:
-                return postAuthor == null ? "" : postAuthor;
-
-            case BLOG_AUTHOR:
-                return post.getFeed().getAuthor();
-
-            case BLOG_AUTHOR_IF_MISSING:
-                return StringTools.isEmpty(postAuthor) ? post.getFeed().getAuthor() : postAuthor;
-        }
-
-        return null;
-    }
-}

Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/tools/XmlTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/tools/XmlTools.java	2008-02-08 11:10:59 UTC (rev 205)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/tools/XmlTools.java	2008-02-08 11:17:30 UTC (rev 206)
@@ -4,7 +4,6 @@
 import org.jboss.blog.model.Post;
 import org.jboss.blog.model.XmlType;
 import org.jboss.blog.session.view.LinkServiceBean;
-import org.jboss.blog.session.feed.posts.PostAuthorServiceBean;
 import org.jboss.seam.Component;
 
 import java.text.SimpleDateFormat;
@@ -46,8 +45,4 @@
     public String postLink(Post post) {
         return getLinkService().generatePostLink(post);
     }
-
-    public String postAuthor(Post post) {
-        return ((PostAuthorServiceBean) Component.getInstance("postAuthorService")).getAuthor(post);
-    }
 }

Modified: trunk/src/model/org/jboss/blog/model/Post.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/Post.java	2008-02-08 11:10:59 UTC (rev 205)
+++ trunk/src/model/org/jboss/blog/model/Post.java	2008-02-08 11:17:30 UTC (rev 206)
@@ -173,6 +173,23 @@
         this.feed = feed;
     }
 
+    @Transient
+    public String getEffectiveAuthor() {
+        String postAuthor = getAuthor();
+        switch (getFeed().getPostAuthorType()) {
+            case POST_AUTHOR:
+                return postAuthor == null ? "" : postAuthor;
+
+            case BLOG_AUTHOR:
+                return getFeed().getAuthor();
+
+            case BLOG_AUTHOR_IF_MISSING:
+                return StringTools.isEmpty(postAuthor) ? getFeed().getAuthor() : postAuthor;
+        }
+
+        return null;
+    }
+
     public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof Post)) return false;

Modified: trunk/view/common/post.xhtml
===================================================================
--- trunk/view/common/post.xhtml	2008-02-08 11:10:59 UTC (rev 205)
+++ trunk/view/common/post.xhtml	2008-02-08 11:17:30 UTC (rev 206)
@@ -16,7 +16,7 @@
     </h3>
 
     <p class="blogauthortag">
-        Published on #{post.published} by #{postAuthorService.getAuthor(post)} #{additionalHeader}
+        Published on #{post.published} by #{post.effectiveAuthor} #{additionalHeader}
         [ <a href="#{post.link}">View original post</a> ]
     </p>
 

Modified: trunk/view/manage/template/template_mod.xhtml
===================================================================
--- trunk/view/manage/template/template_mod.xhtml	2008-02-08 11:10:59 UTC (rev 205)
+++ trunk/view/manage/template/template_mod.xhtml	2008-02-08 11:17:30 UTC (rev 206)
@@ -95,7 +95,6 @@
                         a link to a feed of the given type</li>
                     <li>$tools.postLink(org.jboss.blog.model.Post) - generates a link to the html version of the
                         given post</li>
-                    <li>$tools.postAuthor(org.jboss.blog.model.Post) - generates the author of the given post</li>
                 </ul>
             </li>
         </ul>