X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=legacy%2Fargeo-commons%2Forg.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fuseradmin%2Fparts%2FGroupMainPage.java;h=2706bea1bdc8cbdbd9f9d381070389dc2dcaec95;hb=fbde11e8a342318876a4744c4676d3618bdf8583;hp=9318555a57cee7b66da124659d3e2b5016f5fc9e;hpb=2728afed20a95052f93c41ec641808ec5f01f4fb;p=gpl%2Fargeo-slc.git

diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
index 9318555a5..2706bea1b 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
@@ -1,9 +1,9 @@
 package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 
-import static org.argeo.api.NodeInstance.WORKGROUP;
+import static org.argeo.api.cms.CmsData.WORKGROUP;
 import static org.argeo.cms.auth.UserAdminUtils.setProperty;
-import static org.argeo.naming.LdapAttrs.businessCategory;
-import static org.argeo.naming.LdapAttrs.description;
+import static org.argeo.util.naming.LdapAttrs.businessCategory;
+import static org.argeo.util.naming.LdapAttrs.description;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -16,12 +16,12 @@ import javax.jcr.Session;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.api.NodeInstance;
-import org.argeo.api.NodeUtils;
+import org.argeo.api.cms.CmsData;
 import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.UserAdminUtils;
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.workbench.CmsWorkbenchStyles;
 import org.argeo.cms.ui.workbench.internal.useradmin.SecurityAdminImages;
 import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
@@ -36,8 +36,8 @@ import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.naming.LdapAttrs;
 import org.argeo.osgi.transaction.WorkTransaction;
+import org.argeo.util.naming.LdapAttrs;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -85,12 +85,12 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 	final static String ID = "GroupEditor.mainPage";
 
 	private final UserEditor editor;
-	private final NodeInstance nodeInstance;
+	private final CmsData nodeInstance;
 	private final UserAdminWrapper userAdminWrapper;
 	private final Session session;
 
 	public GroupMainPage(FormEditor editor, UserAdminWrapper userAdminWrapper, Repository repository,
-			NodeInstance nodeInstance) {
+			CmsData nodeInstance) {
 		super(editor, ID, "Main");
 		try {
 			session = repository.login();
@@ -175,7 +175,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 				// dnTxt.setText(group.getName());
 				// cnTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
 				descTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.description.name()));
-				Node workgroupHome = NodeUtils.getGroupHome(session, cn);
+				Node workgroupHome = CmsJcrUtils.getGroupHome(session, cn);
 				if (workgroupHome == null)
 					markAsWorkgroupLk.setText("<a>Mark as workgroup</a>");
 				else
@@ -194,7 +194,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 				boolean confirmed = MessageDialog.openConfirm(parent.getShell(), "Mark as workgroup",
 						"Are you sure you want to mark " + cn + " as being a workgroup? ");
 				if (confirmed) {
-					Node workgroupHome = NodeUtils.getGroupHome(session, cn);
+					Node workgroupHome = CmsJcrUtils.getGroupHome(session, cn);
 					if (workgroupHome != null)
 						return; // already marked as workgroup, do nothing
 					else
@@ -501,7 +501,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 		Text text = toolkit.createText(parent, value, SWT.NONE);
 		text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		text.setEditable(false);
-		CmsUiUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT);
+		CmsSwtUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT);
 		return text;
 	}