Author: ludovic
Date: 2007-12-24 22:57:14 +0100 (Mon, 24 Dec 2007)
New Revision: 6458

Modified:
   
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
   
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
   
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceManagerPluginApi.java
Log:
CURRIKI-1179 Renamed isMember api

Modified: 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
 2007-12-24 21:56:45 UTC (rev 6457)
+++ 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
 2007-12-24 21:57:14 UTC (rev 6458)
@@ -317,7 +317,7 @@
      * @return
      * @throws SpaceManagerException
      */
-    public boolean userIsMember(String spaceName, String user, XWikiContext 
context) throws SpaceManagerException;
+    public boolean isMember(String spaceName, String user, XWikiContext 
context) throws SpaceManagerException;
 
     /**
      *

Modified: 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
    2007-12-24 21:56:45 UTC (rev 6457)
+++ 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
    2007-12-24 21:57:14 UTC (rev 6458)
@@ -643,9 +643,9 @@
     }
 
     
-    public boolean userIsMember(String spaceName, String username, 
XWikiContext context) throws SpaceManagerException {
+    public boolean isMember(String spaceName, String username, XWikiContext 
context) throws SpaceManagerException {
         try {
-            return isMember(username, getMemberGroupName(spaceName), context);
+            return isMemberOfGroup(username, getMemberGroupName(spaceName), 
context);
         } catch (XWikiException e) {
             throw new SpaceManagerException(e);
         }
@@ -675,7 +675,7 @@
     }
 
 
-    private boolean isMember(String username, String groupname, XWikiContext 
context) throws XWikiException {
+    private boolean isMemberOfGroup(String username, String groupname, 
XWikiContext context) throws XWikiException {
         Collection coll = 
context.getWiki().getGroupService(context).getAllGroupsNamesForMember(username, 
0, 0, context);
         Iterator it = coll.iterator();
         while (it.hasNext()) {
@@ -695,7 +695,7 @@
     private void addUserToGroup(String username, String groupName, 
XWikiContext context) throws XWikiException
     {
         // don't add if he is already a member
-        if (isMember(username, groupName, context))
+        if (isMemberOfGroup(username, groupName, context))
          return;
 
         XWiki xwiki = context.getWiki();

Modified: 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceManagerPluginApi.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceManagerPluginApi.java
     2007-12-24 21:56:45 UTC (rev 6457)
+++ 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceManagerPluginApi.java
     2007-12-24 21:57:14 UTC (rev 6458)
@@ -381,4 +381,9 @@
     public int countSpaces() throws SpaceManagerException {
         return getSpaceManager().countSpaces(context);
     }
+
+    public boolean isMember(String spaceName, String username) throws 
SpaceManagerException {
+        return getSpaceManager().isMember(spaceName, username, context);
+    }
+
 }

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to