Commit 308e28e6 authored by Brian Major's avatar Brian Major
Browse files

t72306 - Display first and last name in admin user list

parent 10121b0b
Loading
Loading
Loading
Loading
+34 −8
Original line number Diff line number Diff line
@@ -72,9 +72,11 @@ package ca.nrc.cadc.ac.admin;
import java.security.AccessControlException;
import java.security.Principal;
import java.util.Collection;
import java.util.Set;

import org.apache.log4j.Logger;

import ca.nrc.cadc.ac.PersonalDetails;
import ca.nrc.cadc.ac.User;
import ca.nrc.cadc.net.TransientException;

@@ -96,9 +98,33 @@ public abstract class AbstractListUsers extends AbstractCommand

        for (User<Principal> user : users)
        {
            this.systemOut.println(user.getUserID().getName());
            this.systemOut.println(getUserString(user));
        }

        this.systemOut.println("Number of users = " + users.size());
    }

    private String getUserString(User user)
    {
        StringBuilder sb = new StringBuilder(user.getUserID().getName());

        Set<PersonalDetails> detailSet = user.getDetails(PersonalDetails.class);
        if (detailSet.size() > 0)
        {
            sb.append(" [");
            PersonalDetails details = detailSet.iterator().next();
            sb.append(details.getFirstName());
            sb.append(" ");
            sb.append(details.getLastName());
            sb.append("]");
            if (details.institute != null)
            {
                sb.append(" [");
                sb.append(details.institute);
                sb.append("]");
            }
        }
        return sb.toString();

    }
}