openutils-svn

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

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

Revision: 4310
          http://openutils.svn.sourceforge.net/openutils/?rev=4310&view=rev
Author:   fgiust
Date:     2013-09-15 14:52:07 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
deprecations

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java
    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/configuration/ContextMenuManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -41,6 +41,7 @@
  * @author dschivo
  */
 @Singleton
+@SuppressWarnings("deprecation")
 public class ContextMenuManager extends ObservedManager
 {
 

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogControlUtils.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -19,8 +19,6 @@
 
 package net.sourceforge.openutils.mgnlcontextmenu.dialog;
 
-import info.magnolia.cms.util.RequestFormUtil;
-import info.magnolia.module.ModuleRegistry;
 import info.magnolia.objectfactory.Components;
 
 import javax.jcr.Node;
@@ -42,7 +40,7 @@
 
     public static String getValue(HttpServletRequest request, Node node, String scope)
     {
-        String name = new RequestFormUtil(request).getParameter("entryName");
+        String name = request.getParameter("entryName");
         String value = null;
         if (name != null)
         {

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EditDialogControl.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -31,6 +31,7 @@
  * @author dschivo
  * @version $Id$
  */
+@SuppressWarnings("deprecation")
 public class EditDialogControl extends DialogEdit
 {
 

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/EntrySaveHandler.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -41,6 +41,7 @@
  * @author dschivo
  * @version $Id$
  */
+@SuppressWarnings("deprecation")
 public class EntrySaveHandler implements FieldSaveHandler
 {
 

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/FckEditDialogControl.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -31,6 +31,7 @@
  * @author dschivo
  * @version $Id$
  */
+@SuppressWarnings("deprecation")
 public class FckEditDialogControl extends FckEditorDialog
 {
 

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/MediaDialogControl.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -32,6 +32,7 @@
  * @author dschivo
  * @version $Id$
  */
+@SuppressWarnings("deprecation")
 public class MediaDialogControl extends DialogSelectMedia
 {
 

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/ContextMenuModuleVersionHandler.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -19,9 +19,10 @@
 
 package net.sourceforge.openutils.mgnlcontextmenu.setup;
 
-import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.init.MagnoliaConfigurationProperties;
 import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.Task;
+import info.magnolia.objectfactory.Components;
 import info.magnolia.repository.RepositoryConstants;
 import it.openutils.mgnltasks.CreateMissingPropertyTask;
 import it.openutils.mgnltasks.SimpleModuleVersionHandler;
@@ -49,7 +50,7 @@
     {
         List<Task> tasks = new ArrayList<Task>();
 
-        if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+        if (Components.getComponent(MagnoliaConfigurationProperties.class).getBooleanProperty("magnolia.bootstrap.samples"))
         {
             tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.")
             {

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/setup/FilesExtractionTask.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -38,6 +38,7 @@
  * @author fgiust
  * @author dschivo
  */
+@SuppressWarnings("deprecation")
 public class FilesExtractionTask extends AbstractTask
 {
 

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	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -45,6 +45,7 @@
  * @author dschivo
  * @version $Id$
  */
+@SuppressWarnings("deprecation")
 public class ElementTag extends BodyTagSupport
 {
 

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	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -112,6 +112,7 @@
         return EVAL_PAGE;
     }
 
+    @SuppressWarnings("deprecation")
     private boolean canEdit()
     {
         return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET);

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	2013-09-15 14:47:08 UTC (rev 4309)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java	2013-09-15 14:52:07 UTC (rev 4310)
@@ -148,6 +148,7 @@
         return "{" + sb + "}";
     }
 
+    @SuppressWarnings("deprecation")
     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.

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

[<luc...@us...>]

Revision: 4360
          http://openutils.svn.sourceforge.net/openutils/?rev=4360&view=rev
Author:   lucaboati
Date:     2013-10-07 17:14:35 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
constant mgnlSortList

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java	2013-10-07 17:05:11 UTC (rev 4359)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java	2013-10-07 17:14:35 UTC (rev 4360)
@@ -58,6 +58,8 @@
      */
     private static Logger log = LoggerFactory.getLogger(ContextMenuElFunctions.class);
 
+    public static final String SORT_LIST_KEY = "mgnlSortLists";
+
     private static final String EDIT_MESSAGE_INFOS_KEY = "mgnlEditMessageInfos";
 
     /**
@@ -183,11 +185,11 @@
             list = new ArrayList();
             request.setAttribute(EDIT_MESSAGE_INFOS_KEY, list);
         }
-        List items = (List) request.getAttribute("mgnlSortLists");
+        List items = (List) request.getAttribute(SORT_LIST_KEY);
         if (items == null)
         {
             items = new ArrayList();
-            request.setAttribute("mgnlSortLists", items);
+            request.setAttribute(SORT_LIST_KEY, items);
         }
     }
 

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java	2013-10-07 17:05:11 UTC (rev 4359)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java	2013-10-07 17:14:35 UTC (rev 4360)
@@ -71,7 +71,7 @@
             List<Map<String, String>> items = (List<Map<String, String>>) MgnlContext
                 .getWebContext()
                 .getRequest()
-                .getAttribute("mgnlSortLists");
+                .getAttribute(ContextMenuElFunctions.SORT_LIST_KEY);
             if (items != null)
             {
                 for (Map<String, String> item : items)

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java	2013-10-07 17:05:11 UTC (rev 4359)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java	2013-10-07 17:14:35 UTC (rev 4360)
@@ -107,11 +107,11 @@
             item.put("path", MgnlContext.getAggregationState().getCurrentContent().getHandle());
             item.put("name", orderProperty);
             item.put("order", '[' + order + ']');
-            List items = (List) pageContext.getRequest().getAttribute("mgnlSortLists");
+            List items = (List) pageContext.getRequest().getAttribute(ContextMenuElFunctions.SORT_LIST_KEY);
             if (items == null)
             {
                 items = new ArrayList();
-                pageContext.getRequest().setAttribute("mgnlSortLists", items);
+                pageContext.getRequest().setAttribute(ContextMenuElFunctions.SORT_LIST_KEY, items);
             }
             items.add(item);
         }

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