[jboss-cvs] JBossBlog SVN: r40 - in trunk/blog-core: src/java/org/jboss/blog/service/model and 9 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Jan 18 17:25:31 EST 2007


Author: adamw
Date: 2007-01-18 17:25:31 -0500 (Thu, 18 Jan 2007)
New Revision: 40

Modified:
   trunk/blog-core/blog-core.iml
   trunk/blog-core/src/java/org/jboss/blog/service/model/BlogModelService.java
   trunk/blog-core/src/java/org/jboss/blog/service/model/DelegatingModelService.java
   trunk/blog-core/src/java/org/jboss/blog/service/model/StoreModelService.java
   trunk/blog-core/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java
   trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java
   trunk/blog-core/src/java/org/jboss/blog/service/name/BlogNameService.java
   trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java
   trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java
   trunk/blog-core/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java
   trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java
   trunk/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java
   trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java
   trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java
   trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
   trunk/blog-core/src/java/org/jboss/blog/tools/BlogTools.java
   trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java
   trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
   trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java
   trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java
Log:
Fixing issues with 'get' as managed operation name and java 1.4 compatibility

Modified: trunk/blog-core/blog-core.iml
===================================================================
--- trunk/blog-core/blog-core.iml	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/blog-core.iml	2007-01-18 22:25:31 UTC (rev 40)
@@ -2,7 +2,7 @@
 <module version="4" relativePaths="true" type="J2EE_WEB_MODULE">
   <component name="AppServerSpecificValidatorsManager" />
   <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_4" inherit-compiler-output="true">
     <exclude-output />
     <exclude-exploded />
     <content url="file://$MODULE_DIR$">

Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/BlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/BlogModelService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/BlogModelService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -18,5 +18,5 @@
      * @throws org.jboss.blog.model.BlogModelDoesNotExistException If a blog
      * with the given name couldn't be found.
      */
-    public BlogModel getBlogModel(BlogName name) throws BlogModelDoesNotExistException;
+    public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException;
 }

Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/DelegatingModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/DelegatingModelService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/DelegatingModelService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -20,12 +20,12 @@
      * @jmx.managed-operation
      * @jmx.managed-parameter type="org.jboss.blog.BlogName"
      */
-    public BlogModel getBlogModel(BlogName name) throws BlogModelDoesNotExistException {
+    public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
         if (BlogTools.isExternalLink(name.getId())) {
-            return externalDelegateModelService.getBlogModel(name);
+            return externalDelegateModelService.retrieveBlogModel(name);
         }
 
-        return internalDelegateModelService.getBlogModel(name);
+        return internalDelegateModelService.retrieveBlogModel(name);
     }
 
     private BlogModelService externalDelegateModelService;

Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/StoreModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/StoreModelService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/StoreModelService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -19,8 +19,8 @@
      * @jmx.managed-operation
      * @jmx.managed-parameter type="org.jboss.blog.BlogName"
      */
-    public BlogModel getBlogModel(BlogName name) throws BlogModelDoesNotExistException {
-        return storeService.getBlogModel(name);
+    public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
+        return storeService.retrieveBlogModel(name);
     }
 
     private BlogStoreService storeService;

Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -47,7 +47,7 @@
      * @jmx.managed-operation
      * @jmx.managed-parameter type="org.jboss.blog.BlogName"
      */
-    public BlogModel getBlogModel(BlogName name) throws BlogModelDoesNotExistException {
+    public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
         final BlogLock lock = getLock(name);
         long now = System.currentTimeMillis();
 
@@ -55,7 +55,7 @@
             BlogModel ret;
 
             if (now - lock.getLastUpdate() > updateInterval) {
-                ret = delegateModelService.getBlogModel(name);
+                ret = delegateModelService.retrieveBlogModel(name);
                 models.put(name, ret);
 
                 lock.setLastUpdate(now);

Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -49,7 +49,7 @@
      * @jmx.managed-operation
      * @jmx.managed-parameter type="org.jboss.blog.BlogName"
      */
-    public BlogModel getBlogModel(BlogName name) throws BlogModelDoesNotExistException {
+    public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
         if (name.getId() == null) {
             throw new BlogModelDoesNotExistException("No blog selected (null blog id)");
         }

Modified: trunk/blog-core/src/java/org/jboss/blog/service/name/BlogNameService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/name/BlogNameService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/name/BlogNameService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -16,5 +16,5 @@
      * @return Name of the selected blog, which should be displayed/ edited
      * etc.
      */
-    public BlogName getBlogName(Object request);
+    public BlogName retrieveBlogName(Object request);
 }

Modified: trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -15,7 +15,7 @@
      * @jmx.managed-operation
      * @jmx.managed-parameter type="java.lang.Object"
      */
-    public BlogName getBlogName(Object request) {
+    public BlogName retrieveBlogName(Object request) {
         BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
         return new BlogName(BlogTools.getInitParam(getIdName()),
                 BlogTools.getInitParam(getCategoryName()));

Modified: trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -34,7 +34,7 @@
      * @jmx.managed-operation
      * @jmx.managed-parameter type="java.lang.Object"
      */
-    public BlogName getBlogName(Object request) {
+    public BlogName retrieveBlogName(Object request) {
         BlogTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
         
         PortletRequest req = BlogTools.castToPortletRequest(this, request);

Modified: trunk/blog-core/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -23,5 +23,5 @@
      * @return A {@link BlogAuthor} representation of the user represented
      * by the given data, or null, if no such user exists.
      */
-    public BlogAuthor getBlogAuthor(Object data);
+    public BlogAuthor retrieveBlogAuthor(Object data);
 }

Modified: trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -97,7 +97,7 @@
      * @jmx.managed-operation
      * @jmx.managed-parameter type="java.lang.Object"
      */
-    public BlogAuthor getBlogAuthor(Object data) {
+    public BlogAuthor retrieveBlogAuthor(Object data) {
         try {
             if (data instanceof PortletRequest) {
                 return new PortalUserBlogAuthor(um.findUserByUserName(

Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -19,7 +19,7 @@
      * @return A list of {@link org.jboss.blog.BlogName} objects, with a null
      * category name.
      */
-    public List getAllBlogs();
+    public List retrieveAllBlogs();
 
     /**
      * Reads a list of all categories.
@@ -29,7 +29,7 @@
      * part equal to the one passed in the parameter.
      * @throws IllegalArgumentException If blog name is null.
      */
-    public List getAllCategories(BlogName blogName)
+    public List retrieveAllCategories(BlogName blogName)
             throws IllegalArgumentException;
 
     /**
@@ -38,7 +38,7 @@
      * @return True if this blog can be modified using this store service.
      * @throws IllegalArgumentException If blog name is null.
      */
-    public boolean getBlogModifiable(BlogName blogName)
+    public boolean retrieveBlogModifiable(BlogName blogName)
             throws IllegalArgumentException;
 
     /**
@@ -49,7 +49,7 @@
      * @throws BlogModelDoesNotExistException If there is no blog with the
      * specified name.
      */
-    public ModifiableBlogModel getBlogModel(BlogName blogName)
+    public ModifiableBlogModel retrieveBlogModel(BlogName blogName)
             throws BlogModelDoesNotExistException, IllegalArgumentException;
 
     // Blog model operations
@@ -71,7 +71,7 @@
      * Deletes the given blog model (and all posts, if they do not belong to
      * any other blog models).
      * @param model Model to delete. Should be earlier obtained with
-     * {@link BlogStoreService#getBlogModel(org.jboss.blog.BlogName)}.
+     * {@link BlogStoreService#retrieveBlogModel(org.jboss.blog.BlogName)}.
      * @throws IllegalArgumentException If model is null, is a new model
      * or wasn't obtained from this store service.
      */

Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -32,7 +32,7 @@
     private HibernateBlogStoreService storeService;
 
     public HBlogModel() {
-        categories = Collections.emptySet();
+        categories = BlogTools.emptySet();
     }
 
     public Integer getId() {
@@ -50,7 +50,7 @@
     public void setBlogName(BlogName blogName) {
         this.blogName = blogName;
         if (blogName.getCategory() == null) {
-            categories = Collections.emptySet();
+            categories = BlogTools.emptySet();
         } else {
             categories = Collections.singleton(blogName.getCategory());
         }

Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HPortalBlogAuthor.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -17,7 +17,7 @@
     private HibernateBlogStoreService storeService;
 
     private void initUser() {
-        BlogAuthor author = getStoreService().getPermissionsService().getBlogAuthor(jbp_id);
+        BlogAuthor author = getStoreService().getPermissionsService().retrieveBlogAuthor(jbp_id);
 
         if (!(author instanceof PortalUserBlogAuthor)) {
             user = new EmptyPortalUser();

Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -90,7 +90,7 @@
     /**
      * @jmx.managed-operation
      */
-    public List getAllBlogs() {
+    public List retrieveAllBlogs() {
         List ids = sf.getCurrentSession().createQuery(
                 "select distinct model.blogName.id from HBlogModel as model")
                 .list();
@@ -107,7 +107,7 @@
      * @jmx.managed-operation
      * @jmx.managed-parameter type="org.jboss.blog.BlogName"
      */
-    public List getAllCategories(BlogName blogName) {
+    public List retrieveAllCategories(BlogName blogName) {
         assertBlogNameNotNull(blogName);
         return sf.getCurrentSession().createQuery(
                 "select model.blogName from HBlogModel as model " +
@@ -129,7 +129,7 @@
      * @jmx.managed-operation
      * @jmx.managed-parameter type="org.jboss.blog.BlogName"
      */
-    public boolean getBlogModifiable(BlogName blogName) {
+    public boolean retrieveBlogModifiable(BlogName blogName) {
         assertBlogNameNotNull(blogName);
         return blogExists(blogName);
     }
@@ -138,7 +138,7 @@
      * @jmx.managed-operation
      * @jmx.managed-parameter type="org.jboss.blog.BlogName"
      */
-    public ModifiableBlogModel getBlogModel(BlogName blogName)
+    public ModifiableBlogModel retrieveBlogModel(BlogName blogName)
             throws BlogModelDoesNotExistException {
         assertBlogNameNotNull(blogName);
 
@@ -201,7 +201,7 @@
      * @jmx.managed-parameter type="java.lang.Object"
      */
     public BlogAuthor newBlogAuthor(Object request) {
-        BlogAuthor author = permissionsService.getBlogAuthor(request);
+        BlogAuthor author = permissionsService.retrieveBlogAuthor(request);
 
         if (!(author instanceof PortalUserBlogAuthor)) {
             throw new IllegalArgumentException("Invalid author!");

Modified: trunk/blog-core/src/java/org/jboss/blog/tools/BlogTools.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/tools/BlogTools.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/BlogTools.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -6,6 +6,8 @@
 
 import javax.portlet.PortletRequest;
 import javax.faces.context.FacesContext;
+import java.util.Set;
+import java.util.HashSet;
 
 /**
  * Various common and usefull functions.
@@ -147,4 +149,18 @@
         return link.startsWith("http:") || link.startsWith("ftp:")
                 || link.startsWith("https:") || link.startsWith("file:");
     }
+    
+    private static Set emptySet = new HashSet() {
+        public boolean add(Object o) {
+            return false;
+        }
+    };
+
+    /**
+     * Gets an immutable empty set.
+     * @return An immutable empty set.
+     */
+    public static Set emptySet() {
+        return emptySet;
+    }
 }

Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -77,7 +77,7 @@
         BlogModel model;
 
         try {
-            model = BlogTools.getBlogService().getStoreService().getBlogModel(
+            model = BlogTools.getBlogService().getStoreService().retrieveBlogModel(
                     blogView.getBlogName());
         } catch (BlogModelDoesNotExistException e) {
             model = new EmptyBlogModel();
@@ -94,7 +94,7 @@
 
     public String save() {
         try {
-            ModifiableBlogModel mbm = BlogTools.getBlogService().getStoreService().getBlogModel(
+            ModifiableBlogModel mbm = BlogTools.getBlogService().getStoreService().retrieveBlogModel(
                     blogView.getBlogName());
 
             boolean changed = false;
@@ -146,7 +146,7 @@
         try {
             BlogName toDelete = getState().getSelectedBlogName();
 
-            ModifiableBlogModel mbm = BlogTools.getBlogService().getStoreService().getBlogModel(
+            ModifiableBlogModel mbm = BlogTools.getBlogService().getStoreService().retrieveBlogModel(
                     toDelete);
 
             BlogTools.getBlogService().getStoreService().deleteBlogModel(mbm);
@@ -156,7 +156,7 @@
             UITools.addInfoMessage("Blog category deleted.");
 
             // If this was the last category with this id, we must return to the admin panel.
-            if (BlogTools.getBlogService().getStoreService().getAllCategories(toDelete).size() == 0) {
+            if (BlogTools.getBlogService().getStoreService().retrieveAllCategories(toDelete).size() == 0) {
                 return UITools.ADMIN_PANEL;
             } else {
                 return UITools.ID_EDIT;

Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -86,7 +86,7 @@
             // Blog name from the state has precedence over the default one.
             blogName = getState().getSelectedBlogName();
             if (blogName == null) {
-                blogName = BlogTools.getBlogService().getNameService().getBlogName(getRequest());
+                blogName = BlogTools.getBlogService().getNameService().retrieveBlogName(getRequest());
             }
         }
 
@@ -104,7 +104,7 @@
     public BlogModel getBlogModel() {
         if (blogModel == null) {
             try {
-                blogModel = BlogTools.getBlogService().getModelService().getBlogModel(
+                blogModel = BlogTools.getBlogService().getModelService().retrieveBlogModel(
                         getBlogName());
             } catch (BlogModelDoesNotExistException e) {
                 UITools.addMessageBlogDoesntExist(getBlogName());
@@ -171,7 +171,7 @@
     public Boolean getBlogModifiable() {
         if (blogModifiable == null) {
             blogModifiable = Boolean.valueOf(BlogTools.getBlogService().getStoreService().
-                    getBlogModifiable(getBlogName()));
+                    retrieveBlogModifiable(getBlogName()));
         }
 
         return blogModifiable;
@@ -233,7 +233,7 @@
     }
 
     ModifiableBlogModel getModifiableModel() throws BlogModelDoesNotExistException {
-        return BlogTools.getBlogService().getStoreService().getBlogModel(
+        return BlogTools.getBlogService().getStoreService().retrieveBlogModel(
                 getBlogName());
     }
 

Modified: trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -43,7 +43,7 @@
     private void populateRawIds() {
         if (rawIds == null) {
             // TODO: filter with permissions of the logged in person
-            rawIds = BlogTools.getBlogService().getStoreService().getAllBlogs();
+            rawIds = BlogTools.getBlogService().getStoreService().retrieveAllBlogs();
         }
     }
 
@@ -65,7 +65,7 @@
         if (categories == null) {
             // TODO: filter with permissions of the logged in person
             List rawCategories = BlogTools.getBlogService().getStoreService()
-                    .getAllCategories(new BlogName(getState().getSelectedBlogId(), null));
+                    .retrieveAllCategories(new BlogName(getState().getSelectedBlogId(), null));
             categories = new ArrayList();
 
             for (Iterator iter = rawCategories.iterator(); iter.hasNext();) {

Modified: trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java	2007-01-02 19:16:13 UTC (rev 39)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java	2007-01-18 22:25:31 UTC (rev 40)
@@ -95,7 +95,7 @@
 
     public List getBlogs() {
         if (blogs == null) {
-            List blogNames = BlogTools.getBlogService().getStoreService().getAllCategories(
+            List blogNames = BlogTools.getBlogService().getStoreService().retrieveAllCategories(
                     blogView.getBlogName());
             blogs = new ArrayList();
 
@@ -187,7 +187,7 @@
             // Adding the post to all selected categories.
             // TODO permissions for category-level? Both here, save() and post_mod.xhtml
             for (Iterator iter = selectedCategories.iterator(); iter.hasNext();) {
-                ModifiableBlogModel blog = BlogTools.getBlogService().getStoreService().getBlogModel(
+                ModifiableBlogModel blog = BlogTools.getBlogService().getStoreService().retrieveBlogModel(
                         (BlogName) iter.next());
                 blog.addPost(post);
             }
@@ -240,14 +240,14 @@
             // Adding & removing posts from categories.
             for (Iterator iter = addedCategories.iterator(); iter.hasNext();) {
                 changed = true;
-                model = BlogTools.getBlogService().getStoreService().getBlogModel(
+                model = BlogTools.getBlogService().getStoreService().retrieveBlogModel(
                         (BlogName) iter.next());
                 model.addPost(post);
             }
 
             for (Iterator iter = removedCategories.iterator(); iter.hasNext();) {
                 changed = true;
-                model = BlogTools.getBlogService().getStoreService().getBlogModel(
+                model = BlogTools.getBlogService().getStoreService().retrieveBlogModel(
                         (BlogName) iter.next());
                 model.removePost(post);
             }
@@ -268,7 +268,7 @@
 
     public String delete() {
         try {
-            ModifiableBlogModel model = BlogTools.getBlogService().getStoreService().getBlogModel(
+            ModifiableBlogModel model = BlogTools.getBlogService().getStoreService().retrieveBlogModel(
                     blogView.getBlogName());
             ModifiableBlogPost post = model.getModifiableBlogPostByTitleAsId(
                     blogView.getSelectedPostTitleAsId());




More information about the jboss-cvs-commits mailing list