Author: tmortagne
Date: 2007-12-20 14:30:57 +0100 (Thu, 20 Dec 2007)
New Revision: 6441
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageGroupsApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageRightsApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageUsersApi.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerPluginApi.java
Log:
Improve codestyle/javadoc.
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageGroupsApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageGroupsApi.java
2007-12-20 13:30:34 UTC (rev 6440)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageGroupsApi.java
2007-12-20 13:30:57 UTC (rev 6441)
@@ -20,6 +20,7 @@
package com.xpn.xwiki.plugin.rightsmanager;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -56,11 +57,6 @@
RightsManagerPluginApi.CONTEXT_LASTEXCEPTION;
/**
- * Quote symbol.
- */
- public static final String QUOTE = RightsManagerPluginApi.QUOTE;
-
- /**
* The logging toolkit.
*/
protected static final Log LOG =
LogFactory.getLog(RightsManageGroupsApi.class);
@@ -157,7 +153,8 @@
RightsManager.getInstance().countAllWikiUsersOrGroups(false,
wikiName,
RightsManagerPluginApi.createMatchingTable(matchFields),
this.context);
} catch (RightsManagerException e) {
- logError("Try to count all groups in wiki " + QUOTE + wikiName +
QUOTE, e);
+ logError(MessageFormat.format("Try to count all groups in wiki
[{0}]",
+ new Object[] {wikiName}), e);
}
return count;
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageRightsApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageRightsApi.java
2007-12-20 13:30:34 UTC (rev 6440)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageRightsApi.java
2007-12-20 13:30:57 UTC (rev 6441)
@@ -20,6 +20,8 @@
package com.xpn.xwiki.plugin.rightsmanager;
+import java.text.MessageFormat;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -46,13 +48,8 @@
* Field name of the last api exception inserted in context.
*/
public static final String CONTEXT_LASTEXCEPTION =
RightsManagerPluginApi.CONTEXT_LASTEXCEPTION;
-
+
/**
- * Quote symbol.
- */
- public static final String QUOTE = RightsManagerPluginApi.QUOTE;
-
- /**
* The logging toolkit.
*/
protected static final Log LOG =
LogFactory.getLog(RightsManageRightsApi.class);
@@ -102,7 +99,8 @@
parent = xdoc.newDocument(context);
}
} catch (RightsManagerException e) {
- logError("Try to get parent rights preference for " + QUOTE +
spaceOrPage + QUOTE, e);
+ logError(MessageFormat.format("Try to get parent rights preference
for [{0}]",
+ new Object[] {spaceOrPage}), e);
}
return parent;
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageUsersApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageUsersApi.java
2007-12-20 13:30:34 UTC (rev 6440)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManageUsersApi.java
2007-12-20 13:30:57 UTC (rev 6441)
@@ -20,6 +20,7 @@
package com.xpn.xwiki.plugin.rightsmanager;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -56,11 +57,6 @@
RightsManagerPluginApi.CONTEXT_LASTEXCEPTION;
/**
- * Quote symbol.
- */
- public static final String QUOTE = RightsManagerPluginApi.QUOTE;
-
- /**
* The logging toolkit.
*/
protected static final Log LOG =
LogFactory.getLog(RightsManageUsersApi.class);
@@ -157,7 +153,8 @@
RightsManager.getInstance().countAllWikiUsersOrGroups(true,
wikiName,
RightsManagerPluginApi.createMatchingTable(matchFields),
this.context);
} catch (RightsManagerException e) {
- logError("Try to count all users in wiki " + QUOTE + wikiName +
QUOTE, e);
+ logError(MessageFormat.format("Try to count all users in wiki
[{0}]",
+ new Object[] {wikiName}), e);
}
return count;
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerPluginApi.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerPluginApi.java
2007-12-20 13:30:34 UTC (rev 6440)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerPluginApi.java
2007-12-20 13:30:57 UTC (rev 6441)
@@ -20,6 +20,7 @@
package com.xpn.xwiki.plugin.rightsmanager;
+import java.text.MessageFormat;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -70,11 +71,6 @@
public static final String RIGHTS_UI_VALUE_NEW = "new";
/**
- * Quote symbol.
- */
- public static final String QUOTE = "\"";
-
- /**
* The logging toolkit.
*/
protected static final Log LOG =
LogFactory.getLog(RightsManagerPluginApi.class);
@@ -244,8 +240,8 @@
RightsManager.getInstance()
.getAllGroupsNamesForMember(member, 0, 0, this.context);
} catch (RightsManagerException e) {
- logError("Try to get all groups containing user " + QUOTE + member
+ QUOTE
- + ") users from local wiki", e);
+ logError(MessageFormat.format("Try to get all groups containing
user [{0}]",
+ new Object[] {member}), e);
}
return userList;
@@ -282,7 +278,8 @@
RightsManager.getInstance().getAllMembersNamesForGroup(group,
nb, start,
this.context);
} catch (RightsManagerException e) {
- logError("Try to get all user group " + QUOTE + group + QUOTE + ")
contains", e);
+ logError(MessageFormat.format("Try to get all user group [{0}]
contains",
+ new Object[] {group}), e);
}
return userList;
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
