From 43a9c2621b55c1d94b25b74b5181d926cca2b23f Mon Sep 17 00:00:00 2001
From: baka <baka@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 15 Feb 2017 10:34:39 +0000
Subject: [PATCH] Reimplements CategoryAdminContainer to work with ng. It may
 be not the correct way how the permisson is passed to the constructor,
 though. Must be checked for correctness.

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4570 8810af33-2d31-482b-a856-94f89814c4df
---
 ...r.java.off => CategoryAdminContainer.java} | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
 rename ccm-cms/src/main/java/com/arsdigita/cms/ui/category/{CategoryAdminContainer.java.off => CategoryAdminContainer.java} (74%)

diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryAdminContainer.java.off b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryAdminContainer.java
similarity index 74%
rename from ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryAdminContainer.java.off
rename to ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryAdminContainer.java
index 5f6bb4321..befb2c564 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryAdminContainer.java.off
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryAdminContainer.java
@@ -22,34 +22,33 @@ import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
 import com.arsdigita.toolbox.ui.SecurityContainer;
+import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.security.Party;
+import org.libreccm.security.PermissionChecker;
 
 
 /**
  * Container that wraps category admin access checks around UI components.
  *
  * @author Michael Pih (pihman@arsdigita.com)
- * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $
- * @version $Id: CategoryAdminContainer.java 2090 2010-04-17 08:04:14Z pboy $
+ * @author <a href="mailto:yannick.buelter@yabue.de">Yannick Bülter</a>
  */
 public class CategoryAdminContainer extends SecurityContainer {
 
-    private ACSObjectSelectionModel m_object;
-    private PrivilegeDescriptor m_priv;
+    private final ACSObjectSelectionModel m_object;
+    private final String m_priv;
 
     public CategoryAdminContainer(Component c,
                                   ACSObjectSelectionModel object,
-                                  PrivilegeDescriptor priv) {
+                                  String priv) {
         super(c);
         m_object = object;
         m_priv = priv;
     }
 
     public boolean canAccess(Party party, PageState state) {
-        return PermissionService.checkPermission(
-            new PermissionDescriptor(
-                m_priv,
-                (ACSObject) m_object.getSelectedObject(state),
-                party));
+        final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
+        final PermissionChecker permissionChecker = cdiUtil.findBean(PermissionChecker.class);
+        return permissionChecker.isPermitted(m_priv, m_object.getSelectedObject(state));
     }
 }