From 8fa003cc71e4ca7d8bb497846cff6772a8359556 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 7 Jan 2022 10:57:32 +0100 Subject: [PATCH] Rename into CMS Context --- .../useradmin/parts/GroupMainPage.java | 33 ++++++++----------- .../internal/useradmin/parts/UserEditor.java | 6 ++-- .../useradmin/providers/RoleIconLP.java | 4 +-- 3 files changed, 18 insertions(+), 25 deletions(-) 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 2706bea1b..f2956267d 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,6 +1,6 @@ package org.argeo.cms.ui.workbench.internal.useradmin.parts; -import static org.argeo.api.cms.CmsData.WORKGROUP; +import static org.argeo.api.cms.CmsContext.WORKGROUP; import static org.argeo.cms.auth.UserAdminUtils.setProperty; import static org.argeo.util.naming.LdapAttrs.businessCategory; import static org.argeo.util.naming.LdapAttrs.description; @@ -13,10 +13,8 @@ import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import javax.naming.InvalidNameException; -import javax.naming.ldap.LdapName; -import org.argeo.api.cms.CmsData; +import org.argeo.api.cms.CmsContext; import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.auth.UserAdminUtils; @@ -85,12 +83,12 @@ public class GroupMainPage extends FormPage implements ArgeoNames { final static String ID = "GroupEditor.mainPage"; private final UserEditor editor; - private final CmsData nodeInstance; + private final CmsContext nodeInstance; private final UserAdminWrapper userAdminWrapper; private final Session session; public GroupMainPage(FormEditor editor, UserAdminWrapper userAdminWrapper, Repository repository, - CmsData nodeInstance) { + CmsContext nodeInstance) { super(editor, ID, "Main"); try { session = repository.login(); @@ -197,20 +195,15 @@ public class GroupMainPage extends FormPage implements ArgeoNames { Node workgroupHome = CmsJcrUtils.getGroupHome(session, cn); if (workgroupHome != null) return; // already marked as workgroup, do nothing - else - try { - // improve transaction management - userAdminWrapper.beginTransactionIfNeeded(); - nodeInstance.createWorkgroup(new LdapName(group.getName())); - setProperty(group, businessCategory, WORKGROUP); - userAdminWrapper.commitOrNotifyTransactionStateChange(); - userAdminWrapper - .notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, group)); - part.refresh(); - } catch (InvalidNameException e1) { - throw new CmsException("Cannot create Workgroup for " + group.toString(), e1); - } - + else { + // improve transaction management + userAdminWrapper.beginTransactionIfNeeded(); + nodeInstance.createWorkgroup(group.getName()); + setProperty(group, businessCategory, WORKGROUP); + userAdminWrapper.commitOrNotifyTransactionStateChange(); + userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, group)); + part.refresh(); + } } } }); diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java index ae72fb723..306ff5828 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java @@ -5,7 +5,7 @@ import java.util.List; import javax.jcr.Repository; -import org.argeo.api.cms.CmsData; +import org.argeo.api.cms.CmsContext; import org.argeo.cms.CmsException; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; import org.argeo.cms.ui.workbench.internal.useradmin.UiUserAdminListener; @@ -39,7 +39,7 @@ public class UserEditor extends FormEditor { private Repository repository; private UserAdminWrapper userAdminWrapper; private UserAdmin userAdmin; - private CmsData nodeInstance; + private CmsContext nodeInstance; // Context private User user; @@ -207,7 +207,7 @@ public class UserEditor extends FormEditor { this.repository = repository; } - public void setNodeInstance(CmsData nodeInstance) { + public void setNodeInstance(CmsContext nodeInstance) { this.nodeInstance = nodeInstance; } diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java index 7658be866..66eb16a35 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java @@ -2,7 +2,7 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers; import org.argeo.cms.ui.workbench.internal.useradmin.SecurityAdminImages; import org.argeo.util.naming.LdapAttrs; -import org.argeo.api.cms.CmsData; +import org.argeo.api.cms.CmsContext; import org.argeo.api.cms.CmsConstants; import org.argeo.cms.auth.UserAdminUtils; import org.eclipse.swt.graphics.Image; @@ -26,7 +26,7 @@ public class RoleIconLP extends UserAdminAbstractLP { return SecurityAdminImages.ICON_ROLE; else if (user.getType() == Role.GROUP) { String businessCategory = UserAdminUtils.getProperty(user, LdapAttrs.businessCategory); - if (businessCategory != null && businessCategory.equals(CmsData.WORKGROUP)) + if (businessCategory != null && businessCategory.equals(CmsContext.WORKGROUP)) return SecurityAdminImages.ICON_WORKGROUP; return SecurityAdminImages.ICON_GROUP; } else -- 2.39.2