From: <luc...@us...> - 2013-10-07 17:14:39
|
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. |