You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/02/11 17:11:52 UTC
directory-fortress-core git commit: FC-62 - console sort
sessionPermissions lists returned
Repository: directory-fortress-core
Updated Branches:
refs/heads/master c49e1ad3d -> 5651d4e8c
FC-62 - console sort sessionPermissions lists returned
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/5651d4e8
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/5651d4e8
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/5651d4e8
Branch: refs/heads/master
Commit: 5651d4e8cc8caed19a0a9a76dd31a0d8c506320f
Parents: c49e1ad
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Feb 11 10:11:40 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Feb 11 10:11:40 2015 -0600
----------------------------------------------------------------------
.../directory/fortress/core/AccessMgrConsole.java | 10 ++++++++++
.../fortress/core/DelegatedAccessMgrConsole.java | 12 ++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5651d4e8/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
index e13b166..41e9403 100755
--- a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
@@ -26,6 +26,8 @@ import org.apache.directory.fortress.core.rbac.Session;
import org.apache.directory.fortress.core.rbac.User;
import org.apache.directory.fortress.core.rbac.UserRole;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Enumeration;
import java.util.List;
@@ -74,6 +76,14 @@ class AccessMgrConsole
//List list = rm.findPermissions(pe);
if (list != null)
{
+ Collections.sort( list, new Comparator<Permission>()
+ {
+ @Override
+ public int compare(Permission p1, Permission p2)
+ {
+ return p1.getAbstractName().compareTo( p2.getAbstractName() );
+ }
+ } );
int i = 0;
for (Permission pe : list)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5651d4e8/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
index caa7651..946e9a2 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
@@ -29,6 +29,8 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Enumeration;
import java.util.List;
@@ -223,10 +225,16 @@ class DelegatedAccessMgrConsole
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, "DelegatedAccessMgrConsole.sessionPermissions");
ReaderUtil.clearScreen();
List<Permission> list = dAmgr.sessionPermissions(session);
-
- //List list = rm.findPermissions(pe);
if (list != null)
{
+ Collections.sort(list, new Comparator<Permission>()
+ {
+ @Override
+ public int compare(Permission p1, Permission p2)
+ {
+ return p1.getAbstractName().compareTo( p2.getAbstractName() );
+ }
+ });
int i = 0;
for (Permission pe : list)
{