[xwiki-notifications] r7112 - in xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki: api user/api

[SVN]

Author: sdumitriu
Date: 2008-01-28 19:05:13 +0100 (Mon, 28 Jan 2008)
New Revision: 7112

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/User.java
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
Log:
Move code from the API to the wrapped class.


Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/User.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/User.java  
    2008-01-28 17:50:15 UTC (rev 7111)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/User.java  
    2008-01-28 18:05:13 UTC (rev 7112)
@@ -21,14 +21,11 @@
 package com.xpn.xwiki.api;
 
 import java.text.MessageFormat;
-import java.util.Collection;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.user.api.XWikiGroupService;
 import com.xpn.xwiki.user.api.XWikiUser;
 
 /**
@@ -83,14 +80,7 @@
     public boolean isUserInGroup(String groupName)
     {
         try {
-            if (user != null && StringUtils.isEmpty(user.getUser())) {
-                XWikiGroupService groupService =
-                    
getXWikiContext().getWiki().getGroupService(getXWikiContext());
-                Collection groups =
-                    groupService.getAllGroupsNamesForMember(user.getUser(), 0, 
0,
-                        getXWikiContext());
-                return groups.contains(groupName);
-            }
+            return user.isUserInGroup(groupName, getXWikiContext());
         } catch (Exception ex) {
             LOG.warn(new MessageFormat("Unhandled exception checking if user 
{0}"
                 + " belongs to group {1}").format(new String[] 
{user.getUser(), groupName}), ex);

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
    2008-01-28 17:50:15 UTC (rev 7111)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
    2008-01-28 18:05:13 UTC (rev 7112)
@@ -21,6 +21,13 @@
 
 package com.xpn.xwiki.user.api;
 
+import java.util.Collection;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.XWikiException;
+
 public class XWikiUser
 {
     private String user;
@@ -48,6 +55,26 @@
         this.user = user;
     }
 
+    /**
+     * Check if the user belongs to a group or not.
+     * 
+     * @param groupName The group to check.
+     * @param context The current [EMAIL PROTECTED] XWikiContext context}.
+     * @return <tt>true</tt> if the user does belong to the specified group, 
false otherwise or if
+     *         an exception occurs.
+     *
+     * @throws XWikiException If an error occurs when checking the groups.
+     */
+    public boolean isUserInGroup(String groupName, XWikiContext context) 
throws XWikiException
+    {
+        if (!StringUtils.isEmpty(getUser())) {
+            XWikiGroupService groupService = 
context.getWiki().getGroupService(context);
+            Collection groups = 
groupService.getAllGroupsNamesForMember(getUser(), 0, 0, context);
+            return groups.contains(groupName);
+        }
+        return false;
+    }
+
     public boolean isMain()
     {
         return main;

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications