X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fparts%2FGroupMainPage.java;h=4a441a1a2d4a3c19651d7dfef7ba4e28528150bb;hb=d01cf8af884e44c3ddc6482a9dca4ac73bb8e93a;hp=62583b5112d87977b78810b06d8c1bbb7429c964;hpb=13f4c2a07b6913bc8248bcba82c073873ebaae55;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
index 62583b511..4a441a1a2 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
@@ -19,13 +19,13 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+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.SecurityAdminImages;
-import org.argeo.security.ui.admin.internal.UiAdminUtils;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.argeo.security.ui.admin.internal.parts.UserEditor.GroupChangeListener;
 import org.argeo.security.ui.admin.internal.parts.UserEditor.MainInfoListener;
@@ -101,17 +101,17 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 	}
 
 	/** Creates the general section */
-	protected void appendOverviewPart(Composite parent, final Group group) {
+	protected void appendOverviewPart(final Composite parent, final Group group) {
 		FormToolkit tk = getManagedForm().getToolkit();
 		Composite body = addSection(tk, parent, "Main information");
 		GridLayout layout = new GridLayout(2, false);
 		body.setLayout(layout);
 
-		final Text dnTxt = createLT(body, "DN",group.getName());
+		final Text dnTxt = createLT(body, "DN", group.getName());
 		dnTxt.setEnabled(false);
 
 		final Text cnTxt = createLT(body, "Common Name",
-				UiAdminUtils.getProperty(group, LdifName.cn.name()));
+				UserAdminUtils.getProperty(group, LdifName.cn.name()));
 		cnTxt.setEnabled(false);
 
 		Label descLbl = new Label(body, SWT.LEAD);
@@ -131,7 +131,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 			@Override
 			public void initialize(IManagedForm form) {
 				super.initialize(form);
-				listener = editor.new MainInfoListener(this);
+				listener = editor.new MainInfoListener(parent.getDisplay(), this);
 				userAdminWrapper.addListener(listener);
 			}
 
@@ -155,9 +155,9 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 			public void refresh() {
 				refreshFormTitle(group);
 				dnTxt.setText(group.getName());
-				cnTxt.setText(UiAdminUtils.getProperty(group,
+				cnTxt.setText(UserAdminUtils.getProperty(group,
 						LdifName.cn.name()));
-				descTxt.setText(UiAdminUtils.getProperty(group,
+				descTxt.setText(UserAdminUtils.getProperty(group,
 						LdifName.description.name()));
 				super.refresh();
 			}
@@ -175,14 +175,12 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 		Section section = tk.createSection(parent, Section.TITLE_BAR);
 		section.setLayoutData(EclipseUiUtils.fillAll());
 
-		// Composite body = tk.createComposite(section, SWT.NONE);
 		Composite body = new Composite(section, SWT.NO_FOCUS);
 		section.setClient(body);
 		body.setLayoutData(EclipseUiUtils.fillAll());
 
 		LdifUsersTable userTableViewerCmp = createMemberPart(body, group);
 
-		// create form part (controller)
 		SectionPart part = new GroupMembersPart(section, userTableViewerCmp,
 				group);
 		getManagedForm().addPart(part);
@@ -191,6 +189,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 
 	public LdifUsersTable createMemberPart(Composite parent, Group group) {
 		parent.setLayout(EclipseUiUtils.noSpaceGridLayout());
+
 		// Define the displayed columns
 		List<ColumnDefinition> columnDefs = new ArrayList<ColumnDefinition>();
 		columnDefs.add(new ColumnDefinition(new RoleIconLP(), "", 0, 24));
@@ -221,7 +220,6 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 	}
 
 	// Local viewers
-
 	private class MyUserTableViewer extends LdifUsersTable {
 		private static final long serialVersionUID = 8467999509931900367L;
 
@@ -299,7 +297,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 			// StringBuilder builder = new StringBuilder();
 			while (it.hasNext()) {
 				User currUser = it.next();
-				// String groupName = UiAdminUtils.getUsername(currGroup);
+				// String groupName = UserAdminUtils.getUsername(currGroup);
 				// builder.append(groupName).append("; ");
 				users.add(currUser);
 			}
@@ -330,7 +328,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 		@Override
 		public void initialize(IManagedForm form) {
 			super.initialize(form);
-			listener = editor.new GroupChangeListener(GroupMembersPart.this);
+			listener = editor.new GroupChangeListener(userViewer.getDisplay(), GroupMembersPart.this);
 			userAdminWrapper.addListener(listener);
 		}
 
@@ -345,7 +343,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 			refreshFormTitle(group);
 			getSection().setText(
 					"Members of group "
-							+ UiAdminUtils.getProperty(group,
+							+ UserAdminUtils.getProperty(group,
 									LdifName.cn.name()));
 			userViewer.refresh();
 			super.refresh();
@@ -382,7 +380,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 
 		@Override
 		public void drop(DropTargetEvent event) {
-			// TODO Is there an opportunity to perform ceck before?
+			// TODO Is there an opportunity to perform the check before?
 
 			String newUserName = (String) event.data;
 			UserAdmin myUserAdmin = userAdminWrapper.getUserAdmin();
@@ -441,7 +439,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 	// LOCAL HELPERS
 	private void refreshFormTitle(Group group) {
 		getManagedForm().getForm().setText(
-				UiAdminUtils.getProperty(group, LdifName.cn.name()));
+				UserAdminUtils.getProperty(group, LdifName.cn.name()));
 	}
 
 	private Composite addSection(FormToolkit tk, Composite parent, String title) {