X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fparts%2FUserBatchUpdateWizard.java;h=31b2042b6ec14d2ec91eabefc5f43d2af0697c50;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=5edcfbd4b9dea31e5dbbab67de56ed41c55ea354;hpb=f0be5ec381492eff23d4576ee4122734af4ad877;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java index 5edcfbd4b..31b2042b6 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java @@ -10,14 +10,14 @@ import javax.transaction.UserTransaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.ArgeoException; +import org.argeo.cms.CmsException; import org.argeo.cms.auth.AuthConstants; +import org.argeo.cms.util.useradmin.UserAdminUtils; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.jcr.ArgeoNames; import org.argeo.osgi.useradmin.LdifName; -import org.argeo.security.ui.admin.internal.UiAdminUtils; import org.argeo.security.ui.admin.internal.UserAdminWrapper; import org.argeo.security.ui.admin.internal.providers.CommonNameLP; import org.argeo.security.ui.admin.internal.providers.DomainNameLP; @@ -97,7 +97,7 @@ public class UserBatchUpdateWizard extends Wizard { + "are you sure you want to proceed ?")) return false; } catch (SystemException e) { - throw new ArgeoException("Cannot get user transaction state " + throw new CmsException("Cannot get user transaction state " + "before user batch update", e); } @@ -110,7 +110,7 @@ public class UserBatchUpdateWizard extends Wizard { if (CMD_UPDATE_PASSWORD.equals(chooseCommandPage.getCommand())) { char[] newValue = chooseCommandPage.getPwdValue(); if (newValue == null) - throw new ArgeoException( + throw new CmsException( "Password cannot be null or an empty string"); ResetPassword job = new ResetPassword(userAdminWrapper, userListPage.getSelectedUsers(), newValue); @@ -139,18 +139,16 @@ public class UserBatchUpdateWizard extends Wizard { @SuppressWarnings("unchecked") protected void doUpdate() { - UserTransaction userTransaction = userAdminWrapper - .beginTransactionIfNeeded(); + userAdminWrapper.beginTransactionIfNeeded(); try { for (User user : usersToUpdate) { // the char array is emptied after being used. user.getCredentials().put(null, newPwd.clone()); } - userTransaction.commit(); - UiAdminUtils.notifyTransactionStateChange(userTransaction); + userAdminWrapper.commitOrNotifyTransactionStateChange(); } catch (Exception e) { - throw new ArgeoException( - "Cannot perform batch update on users", e); + throw new CmsException("Cannot perform batch update on users", + e); } finally { UserTransaction ut = userAdminWrapper.getUserTransaction(); try { @@ -182,9 +180,9 @@ public class UserBatchUpdateWizard extends Wizard { // log.info("Add/Remove to group actions are not yet implemented"); // // TODO implement this // // try { - // // throw new ArgeoException("Not yet implemented"); + // // throw new CmsException("Not yet implemented"); // // } catch (RepositoryException re) { - // // throw new ArgeoException( + // // throw new CmsException( // // "Unable to update boolean value for node " + node, re); // // } // } @@ -222,7 +220,7 @@ public class UserBatchUpdateWizard extends Wizard { // } // userAdminWrapper.getUserTransaction().commit(); // } catch (Exception e) { - // throw new ArgeoException( + // throw new CmsException( // "Cannot perform batch update on users", e); // } finally { // UserTransaction ut = userAdminWrapper.getUserTransaction(); @@ -417,7 +415,7 @@ public class UserBatchUpdateWizard extends Wizard { 200)); // Only show technical DN to admin - if (UiAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN)) + if (UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN)) columnDefs.add(new ColumnDefinition(new UserNameLP(), "Distinguished Name", 300)); @@ -455,7 +453,7 @@ public class UserBatchUpdateWizard extends Wizard { private static final long serialVersionUID = 5080437561015853124L; private final String[] knownProps = { LdifName.uid.name(), LdifName.dn.name(), LdifName.cn.name(), - LdifName.givenname.name(), LdifName.sn.name(), + LdifName.givenName.name(), LdifName.sn.name(), LdifName.mail.name() }; public ChooseUserTableViewer(Composite parent, int style) { @@ -470,7 +468,7 @@ public class UserBatchUpdateWizard extends Wizard { StringBuilder builder = new StringBuilder(); StringBuilder tmpBuilder = new StringBuilder(); - if (UiAdminUtils.notNull(filter)) + if (EclipseUiUtils.notEmpty(filter)) for (String prop : knownProps) { tmpBuilder.append("("); tmpBuilder.append(prop); @@ -494,14 +492,14 @@ public class UserBatchUpdateWizard extends Wizard { roles = userAdminWrapper.getUserAdmin().getRoles( builder.toString()); } catch (InvalidSyntaxException e) { - throw new ArgeoException( - "Unable to get roles with filter: " + filter, e); + throw new CmsException("Unable to get roles with filter: " + + filter, e); } List users = new ArrayList(); for (Role role : roles) // Prevent current logged in user to perform batch on // himself - if (!UiAdminUtils.isCurrentUser((User) role)) + if (!UserAdminUtils.isCurrentUser((User) role)) users.add((User) role); return users; } @@ -531,7 +529,7 @@ public class UserBatchUpdateWizard extends Wizard { columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 200)); // Only show technical DN to admin - if (UiAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN)) + if (UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN)) columnDefs.add(new ColumnDefinition(new UserNameLP(), "Distinguished Name", 300)); userTableCmp = new ChosenUsersTableViewer(pageCmp, SWT.MULTI