X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fuseradmin%2Fparts%2FGroupMainPage.java;h=6fe6e1ab29466f71b3334ccb011878a47f18f88f;hb=4153677129487fe302e0c89171179faba4e563e1;hp=0c8e55593b8cb04e7cb2e10d58ce9e765a723600;hpb=23b7a170cae60b500e9d45551f26b5075eba73a4;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
index 0c8e55593..6fe6e1ab2 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
@@ -32,12 +32,12 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.RoleIconLP;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserFilter;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
 import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener;
-import org.argeo.cms.util.useradmin.UserAdminUtils;
+import org.argeo.cms.util.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
+import org.argeo.naming.LdapAttrs;
 import org.argeo.node.ArgeoNames;
-import org.argeo.osgi.useradmin.LdifName;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -114,7 +114,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 		dnTxt.setEnabled(false);
 
 		final Text cnTxt = createLT(body, "Common Name",
-				UserAdminUtils.getProperty(group, LdifName.cn.name()));
+				UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
 		cnTxt.setEnabled(false);
 
 		Label descLbl = new Label(body, SWT.LEAD);
@@ -147,7 +147,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 
 			@SuppressWarnings("unchecked")
 			public void commit(boolean onSave) {
-				group.getProperties().put(LdifName.description.name(),
+				group.getProperties().put(LdapAttrs.description.name(),
 						descTxt.getText());
 				// Enable common name ?
 				// editor.setProperty(UserAdminConstants.KEY_CN,
@@ -160,9 +160,9 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 				refreshFormTitle(group);
 				dnTxt.setText(group.getName());
 				cnTxt.setText(UserAdminUtils.getProperty(group,
-						LdifName.cn.name()));
+						LdapAttrs.cn.name()));
 				descTxt.setText(UserAdminUtils.getProperty(group,
-						LdifName.description.name()));
+						LdapAttrs.description.name()));
 				super.refresh();
 			}
 		};
@@ -347,7 +347,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 			getSection().setText(
 					"Members of group "
 							+ UserAdminUtils.getProperty(group,
-									LdifName.cn.name()));
+									LdapAttrs.cn.name()));
 			userViewer.refresh();
 			super.refresh();
 		}
@@ -450,7 +450,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 	// LOCAL HELPERS
 	private void refreshFormTitle(Group group) {
 		getManagedForm().getForm().setText(
-				UserAdminUtils.getProperty(group, LdifName.cn.name()));
+				UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
 	}
 
 	private Composite addSection(FormToolkit tk, Composite parent, String title) {
@@ -474,4 +474,4 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		return text;
 	}
-}
\ No newline at end of file
+}