[Openutils-svn] SF.net SVN: openutils:[3782] magnoliamodules/trunk/ openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/ mgnlcontextmenu/tags

[<fg...@us...>]

Revision: 3782
          http://openutils.svn.sourceforge.net/openutils/?rev=3782&view=rev
Author:   fgiust
Date:     2012-03-10 22:30:37 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
remove dependency from compatibility taglib

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java	2012-03-10 22:22:36 UTC (rev 3781)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java	2012-03-10 22:30:37 UTC (rev 3782)
@@ -20,7 +20,9 @@
 package net.sourceforge.openutils.mgnlcontextmenu.tags;
 
 import info.magnolia.cms.core.Content;
+import info.magnolia.cms.security.Permission;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -110,8 +112,8 @@
     @Override
     public int doStartTag() throws JspException
     {
-        Content node = this.node != null ? this.node : CmsFunctions.currentParagraph();
-        boolean readonly = this.readonly || !CmsFunctions.canEdit();
+        Content node = this.node != null ? this.node : currentParagraph();
+        boolean readonly = this.readonly || !canEdit();
         if (!readonly)
         {
             if (StringUtils.isEmpty(wrapper))
@@ -153,8 +155,8 @@
     @Override
     public int doEndTag() throws JspException
     {
-        Content node = this.node != null ? this.node : CmsFunctions.currentParagraph();
-        boolean readonly = this.readonly || !CmsFunctions.canEdit();
+        Content node = this.node != null ? this.node : currentParagraph();
+        boolean readonly = this.readonly || !canEdit();
         if (!readonly)
         {
             try
@@ -194,6 +196,16 @@
         return info;
     }
 
+    private boolean canEdit()
+    {
+        return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
+    }
+
+    private Content currentParagraph()
+    {
+        return MgnlContext.getAggregationState().getCurrentContent();
+    }
+
     /**
      * {@inheritDoc}
      */

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java	2012-03-10 22:22:36 UTC (rev 3781)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java	2012-03-10 22:30:37 UTC (rev 3782)
@@ -19,7 +19,9 @@
 
 package net.sourceforge.openutils.mgnlcontextmenu.tags;
 
+import info.magnolia.cms.security.Permission;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
 
 import java.io.IOException;
 
@@ -64,7 +66,7 @@
     public int doStartTag() throws JspException
     {
         String ctx = MgnlContext.getContextPath();
-        boolean canEdit = CmsFunctions.canEdit();
+        boolean canEdit = canEdit();
         JspWriter out = pageContext.getOut();
         try
         {
@@ -110,6 +112,11 @@
         return EVAL_PAGE;
     }
 
+    private boolean canEdit()
+    {
+        return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
+    }
+
     /**
      * {@inheritDoc}
      */

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java	2012-03-10 22:22:36 UTC (rev 3781)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java	2012-03-10 22:30:37 UTC (rev 3782)
@@ -19,7 +19,9 @@
 
 package net.sourceforge.openutils.mgnlcontextmenu.tags;
 
+import info.magnolia.cms.security.Permission;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.jcr.util.NodeUtil;
 
 import java.io.IOException;
 import java.util.List;
@@ -48,7 +50,7 @@
     @Override
     public int doStartTag() throws JspException
     {
-        if (CmsFunctions.canEdit())
+        if (canEdit())
         {
             JspWriter out = pageContext.getOut();
             try
@@ -146,4 +148,9 @@
         return "{" + sb + "}";
     }
 
+    private boolean canEdit()
+    {
+        return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);
+    }
+
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.