[jboss-cvs] JBossBlog SVN: r306 - in trunk/src: action/org/jboss/blog/session/security/tools and 4 other directories.

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

Author: adamw
Date: 2008-05-08 07:20:01 -0400 (Thu, 08 May 2008)
New Revision: 306

Modified:
   trunk/src/action/org/jboss/blog/session/security/filtering/FeedsSecurity.java
   trunk/src/action/org/jboss/blog/session/security/tools/FeedSecurityTools.java
   trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java
   trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java
   trunk/src/test/org/jboss/blog/session/feed/posts/AggregatedFeedPostsTest.java
   trunk/src/tools/org/jboss/blog/tools/search/bridge/FeedBridge.java
Log:


Modified: trunk/src/action/org/jboss/blog/session/security/filtering/FeedsSecurity.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/security/filtering/FeedsSecurity.java	2008-05-08 11:11:03 UTC (rev 305)
+++ trunk/src/action/org/jboss/blog/session/security/filtering/FeedsSecurity.java	2008-05-08 11:20:01 UTC (rev 306)
@@ -25,7 +25,7 @@
         ArrayList<Feed> ret = new ArrayList<Feed>();
 
         for (Feed feed : feeds) {
-            boolean isFeedRestricted = feed.getRestricted();
+            boolean isFeedRestricted = feed.isRestricted();
             if (!isFeedRestricted || identity.hasPermission("feed", "view", feed)) {
                 ret.add(feed);
             }

Modified: trunk/src/action/org/jboss/blog/session/security/tools/FeedSecurityTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/security/tools/FeedSecurityTools.java	2008-05-08 11:11:03 UTC (rev 305)
+++ trunk/src/action/org/jboss/blog/session/security/tools/FeedSecurityTools.java	2008-05-08 11:20:01 UTC (rev 306)
@@ -9,7 +9,7 @@
  */
 public class FeedSecurityTools {
     public static boolean canViewFeed(RestrictedFeed feed, boolean restricted) {
-        if (!feed.getRestricted()) {
+        if (!feed.isRestricted()) {
             return true;
         }
 

Modified: trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java	2008-05-08 11:11:03 UTC (rev 305)
+++ trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java	2008-05-08 11:20:01 UTC (rev 306)
@@ -44,7 +44,7 @@
         String base = serverAddress + "/" + contextName + "/xml/" + feed.getName()
                 + "?type=" + type.toString().toLowerCase();
         
-        if (feed.getRestricted()) {
+        if (feed.isRestricted()) {
             return base + "&key=" + securityUserKeys.getKeyOfCurrentUser();
         } else {
             return base;

Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java	2008-05-08 11:11:03 UTC (rev 305)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java	2008-05-08 11:20:01 UTC (rev 306)
@@ -99,7 +99,7 @@
 
             Feed feed = feedsService.getFeed(feedName);
 
-            boolean isRestricted = feed.getRestricted();
+            boolean isRestricted = feed.isRestricted();
             if (isRestricted) {
                 SecurityUser su = securityUserKeys.seachForSecurityUserByKey(feedKey);
 

Modified: trunk/src/test/org/jboss/blog/session/feed/posts/AggregatedFeedPostsTest.java
===================================================================
--- trunk/src/test/org/jboss/blog/session/feed/posts/AggregatedFeedPostsTest.java	2008-05-08 11:11:03 UTC (rev 305)
+++ trunk/src/test/org/jboss/blog/session/feed/posts/AggregatedFeedPostsTest.java	2008-05-08 11:20:01 UTC (rev 306)
@@ -8,7 +8,6 @@
 import org.jboss.blog.model.feed.Feed;
 import org.jboss.blog.model.Post;
 import org.jboss.blog.model.RestrictedPost;
-import org.jboss.blog.model.security.RestrictedMode;
 import org.jboss.blog.model.post.PostFilter;
 import org.jboss.blog.service.FeedsService;
 import org.jboss.blog.tools.TestTools;
@@ -103,7 +102,7 @@
 
         // Test
         replay(mockFeedsService);
-        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed1, 0, 2, RestrictedMode.IGNORE);
+        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed1, 0, 2, false);
 
         // Check
         verify(mockFeedsService);
@@ -124,7 +123,7 @@
 
         // Test
         replay(mockFeedsService);
-        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed1, 0, 10, RestrictedMode.IGNORE);
+        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed1, 0, 10, false);
 
         // Check
         verify(mockFeedsService);
@@ -148,7 +147,7 @@
 
         // Test
         replay(mockFeedsService);
-        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed2, 0, 2, RestrictedMode.IGNORE);
+        List<? extends RestrictedPost> posts = aggFeedPosts.getPosts(aggFeed2, 0, 2, false);
 
         // Check
         verify(mockFeedsService);

Modified: trunk/src/tools/org/jboss/blog/tools/search/bridge/FeedBridge.java
===================================================================
--- trunk/src/tools/org/jboss/blog/tools/search/bridge/FeedBridge.java	2008-05-08 11:11:03 UTC (rev 305)
+++ trunk/src/tools/org/jboss/blog/tools/search/bridge/FeedBridge.java	2008-05-08 11:20:01 UTC (rev 306)
@@ -13,7 +13,7 @@
         }
 
         Feed feed = (Feed) object;
-        if (feed.getRestricted()) {
+        if (feed.isRestricted()) {
             return "1";
         } else {
             return "0";