Major refactoring of Argeo CMS UI

[lgpl/argeo-commons.git] / org.argeo.cms.e4 / src / org / argeo / cms / e4 / users / GroupEditor.java

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java
index a4d8317b2f4d6d4b669df2a2c363406101f38937..2521612c765dcf16b7f1a6f434269b0fafccb5d0 100644 (file)
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/GroupEditor.java
@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.cms.e4.users;
 
 import static org.argeo.api.NodeInstance.WORKGROUP;
@@ -32,25 +17,25 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
-import javax.transaction.UserTransaction;
 
 import org.argeo.api.NodeConstants;
 import org.argeo.api.NodeInstance;
-import org.argeo.api.NodeUtils;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.UserAdminUtils;
 import org.argeo.cms.e4.users.providers.CommonNameLP;
 import org.argeo.cms.e4.users.providers.MailLP;
 import org.argeo.cms.e4.users.providers.RoleIconLP;
 import org.argeo.cms.e4.users.providers.UserFilter;
+import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.eclipse.forms.AbstractFormPart;
 import org.argeo.cms.ui.eclipse.forms.IManagedForm;
-import org.argeo.cms.ui.util.CmsUiUtils;
 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.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
@@ -161,7 +146,7 @@ public class GroupEditor extends AbstractRoleEditor {
                // GridLayout layout = new GridLayout(5, false);
                GridLayout layout = new GridLayout(2, false);
                body.setLayout(layout);
-               body.setLayoutData(CmsUiUtils.fillWidth());
+               body.setLayoutData(CmsSwtUtils.fillWidth());
 
                String cn = UserAdminUtils.getProperty(group, LdapAttrs.cn.name());
                createReadOnlyLT(body, "Name", cn);
@@ -212,7 +197,7 @@ public class GroupEditor extends AbstractRoleEditor {
                                // dnTxt.setText(group.getName());
                                // cnTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
                                descTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.description.name()));
-                               Node workgroupHome = NodeUtils.getGroupHome(groupsSession, cn);
+                               Node workgroupHome = CmsJcrUtils.getGroupHome(groupsSession, cn);
                                if (workgroupHome == null)
                                        markAsWorkgroupLk.setText("<a>Mark as workgroup</a>");
                                else
@@ -231,7 +216,7 @@ public class GroupEditor extends AbstractRoleEditor {
                                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(groupsSession, cn);
+                                       Node workgroupHome = CmsJcrUtils.getGroupHome(groupsSession, cn);
                                        if (workgroupHome != null)
                                                return; // already marked as workgroup, do nothing
                                        else
@@ -302,7 +287,7 @@ public class GroupEditor extends AbstractRoleEditor {
 
                ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
                ToolBar toolBar = toolBarManager.createControl(body);
-               toolBar.setLayoutData(CmsUiUtils.fillWidth());
+               toolBar.setLayoutData(CmsSwtUtils.fillWidth());
 
                toolBarManager.add(action);
                toolBarManager.update(true);
@@ -529,7 +514,7 @@ public class GroupEditor extends AbstractRoleEditor {
                                userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, myGroup));
                        } else if (role.getType() == Role.USER) {
                                // TODO check if the group is already member of this group
-                               UserTransaction transaction = userAdminWrapper.beginTransactionIfNeeded();
+                               WorkTransaction transaction = userAdminWrapper.beginTransactionIfNeeded();
                                User user = (User) role;
                                myGroup.addMember(user);
                                if (UserAdminWrapper.COMMIT_ON_SAVE)