From f6adb38a306cf2c0610fbb1d5434ded0ee8a9078 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Thu, 24 Sep 2015 20:29:47 +0000
Subject: [PATCH] Small enhancements

git-svn-id: https://svn.argeo.org/commons/trunk@8449 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../ui/admin/internal/UserAdminWrapper.java   | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
index 41efefa65..d2ad472b3 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
@@ -4,14 +4,9 @@ import java.util.ArrayList;
 import java.util.Dictionary;
 import java.util.List;
 
-import javax.naming.InvalidNameException;
-import javax.naming.ldap.LdapName;
-import javax.naming.ldap.Rdn;
 import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.osgi.useradmin.UserAdminConf;
 import org.osgi.framework.ServiceReference;
@@ -21,7 +16,7 @@ import org.osgi.service.useradmin.UserAdminListener;
 
 /** Simplifies the interaction with the UserAdmin in this bundle */
 public class UserAdminWrapper {
-	private Log log = LogFactory.getLog(UserAdminWrapper.class);
+	// private Log log = LogFactory.getLog(UserAdminWrapper.class);
 
 	private UserAdmin userAdmin;
 	private ServiceReference<UserAdmin> userAdminServiceReference;
@@ -100,23 +95,23 @@ public class UserAdminWrapper {
 		return dns;
 	}
 
-//	// Returns the human friendly domain name give a dn.
-//	public String getDomainName(String dn) {
-//		if (dn.endsWith("ou=roles, ou=node"))
-//			return "System roles";
-//		try {
-//
-//			LdapName name;
-//			name = new LdapName(dn);
-//			List<Rdn> rdns = name.getRdns();
-//
-//			String penultimate = (String) rdns.get(rdns.size() - 2).getValue();
-//			String last = (String) rdns.get(rdns.size() - 1).getValue();
-//			return (penultimate + '.' + last);
-//		} catch (InvalidNameException e) {
-//			throw new ArgeoException("Unable to get domain name for " + dn, e);
-//		}
-//	}
+	// // Returns the human friendly domain name give a dn.
+	// public String getDomainName(String dn) {
+	// if (dn.endsWith("ou=roles, ou=node"))
+	// return "System roles";
+	// try {
+	//
+	// LdapName name;
+	// name = new LdapName(dn);
+	// List<Rdn> rdns = name.getRdns();
+	//
+	// String penultimate = (String) rdns.get(rdns.size() - 2).getValue();
+	// String last = (String) rdns.get(rdns.size() - 1).getValue();
+	// return (penultimate + '.' + last);
+	// } catch (InvalidNameException e) {
+	// throw new ArgeoException("Unable to get domain name for " + dn, e);
+	// }
+	// }
 
 	public void setUserTransaction(UserTransaction userTransaction) {
 		this.userTransaction = userTransaction;
-- 
2.30.2