Author: bpapez
Date: Thu Dec 13 14:50:29 2007
New Revision: 19368
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19368&repname=
=3Djahia
Log:
MEY-42: CMNet Meyrin / Gestion des droits des groupes
- Prevent NPE in SelectPage_Engine
Modified:
trunk/core/src/java/org/jahia/engines/selectpage/SelectPage_Engine.java
Modified: trunk/core/src/java/org/jahia/engines/selectpage/SelectPage_Engin=
e.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/selectpage/SelectPage_Engine.java&rev=3D19368&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/engines/selectpage/SelectPage_Engine.java=
(original)
+++ trunk/core/src/java/org/jahia/engines/selectpage/SelectPage_Engine.java=
Thu Dec 13 14:50:29 2007
@@ -206,20 +206,19 @@
*/
public EngineValidationHelper handleActions(final ProcessingContext jP=
arams, JahiaData jData)
throws JahiaException {
-
- final PagesFilter pagesFilter =3D JahiaSiteMapService.getCurrentPa=
gesFilter(
- (JahiaField)((Map)jParams.getSessionState().getAttribute("=
jahia_session_engineMap")).
- get("theField"), jParams); =
-
- final HashMap engineMap =3D new HashMap();
- engineMap.put("tabOptions", (pagesFilter !=3D null && pagesFilter.=
isSearchTabRequired() ? tabOptions : tabOptionsBasic));
+ Map engineMap =3D (Map)jParams.getSessionState().getAttribute("jah=
ia_session_engineMap");
+ JahiaField theField =3D engineMap !=3D null ? (JahiaField)engineMa=
p.get("theField") : null; =
+ PagesFilter pagesFilter =3D JahiaSiteMapService.getCurrentPagesFil=
ter(theField, jParams);
+ =
+ final HashMap newEngineMap =3D new HashMap();
+ newEngineMap.put("tabOptions", (pagesFilter !=3D null && pagesFilt=
er.isSearchTabRequired() ? tabOptions : tabOptionsBasic));
final String actionScreen =3D jParams.getParameter("screen");
int hpi;
final String homepageID =3D jParams.getParameter("homepageID");//p=
aram to set virtual site to map
final String callbackvalue =3D jParams.getParameter("cond");// spe=
cific param for contentpick
if(callbackvalue!=3Dnull && !callbackvalue.equalsIgnoreCase("")) {
logger.debug("found cond parameter:"+callbackvalue);
- engineMap.put("cond",callbackvalue);//store in enginemap
+ newEngineMap.put("cond",callbackvalue);//store in enginemap
}
if (homepageID !=3D null && !homepageID.equalsIgnoreCase(""))
hpi =3D Integer.parseInt(homepageID);
@@ -240,7 +239,7 @@
} else {
String selectPageOperation =3D (String) selectedPageParams=
.get(OPERATION);
if (!possibleOperations.contains(selectPageOperation)) {
- engineMap.put("engineError", selectPageOperation);
+ newEngineMap.put("engineError", selectPageOperation);
}
}
// Get a site map helper for the site home page.
@@ -259,11 +258,11 @@
=
jParams.setAttribute("org.jahia.data.JahiaData",
jData);
- engineMap.put("activeTabOption", new Integer(
+ newEngineMap.put("activeTabOption", new Integer(
SiteMapViewHelper.SEARCH_VIEW));
} else if (tabOptions[SiteMapViewHelper.TREE_VIEW].equals(disp=
lay)) {
lastDisplay =3D tabOptions[SiteMapViewHelper.TREE_VIEW]; =
=
- engineMap.put("activeTabOption", new Integer(SiteMapViewHe=
lper.TREE_VIEW));
+ newEngineMap.put("activeTabOption", new Integer(SiteMapVie=
wHelper.TREE_VIEW));
} else if (tabOptions[SiteMapViewHelper.FLAT_VIEW].equals(disp=
lay) && Jahia.getSettings().isEnableSelectPageFlatView()) {
lastDisplay =3D tabOptions[SiteMapViewHelper.FLAT_VIEW]; =
=
final JahiaSiteMapService siteMapService =3D ServicesRegis=
try.getInstance().
@@ -274,8 +273,8 @@
getFlatSiteMapViewHelper(jParams, jParams.getUser(=
), contentPage,
jParams.getSessionID(), pageInfosFlag, nul=
l,
SiteMapViewHelper.DISPLAY_ALL_LEVEL, pages=
Filter);
- engineMap.put("flatJahiaSiteMap", siteMapViewHelper);
- engineMap.put("activeTabOption", new Integer(SiteMapViewHe=
lper.FLAT_VIEW));
+ newEngineMap.put("flatJahiaSiteMap", siteMapViewHelper);
+ newEngineMap.put("activeTabOption", new Integer(SiteMapVie=
wHelper.FLAT_VIEW));
// Has the user made a site map handling (collapse, expand=
...)...
final String siteMapParam =3D jParams.getParameter("sitema=
p");
if (siteMapParam !=3D null) {
@@ -286,22 +285,22 @@
}
// Save the form selection to the session.
storeSelectedPageParameters(jParams);
- engineMap.put("jspSource", SELECT_PAGE_JSP);
+ newEngineMap.put("jspSource", SELECT_PAGE_JSP);
jParams.setAttribute("engineTitle", "Select Page"); // Display=
ed in 'engine.jsp'
// screen =3D save
} else if ("save".equals(actionScreen)) {
logger.debug("closing selectpage...");
// Save the form selection to the session.
storeSelectedPageParameters(jParams);
- engineMap.put("jspSource", CLOSE_JSP);
- engineMap.put(SelectPage_Engine.OPERATION, jParams.getParamete=
r(SelectPage_Engine.OPERATION));
+ newEngineMap.put("jspSource", CLOSE_JSP);
+ newEngineMap.put(SelectPage_Engine.OPERATION, jParams.getParam=
eter(SelectPage_Engine.OPERATION));
}
=
- engineMap.put("screen", actionScreen);
- engineMap.put(RENDER_TYPE_PARAM, new Integer(JahiaEngine.RENDERTYP=
E_FORWARD));
- engineMap.put(ENGINE_NAME_PARAM, ENGINE_NAME);
- engineMap.put(ENGINE_URL_PARAM, jParams.composeEngineUrl(ENGINE_NA=
ME));
- toolBox.displayScreen(jParams, engineMap);
+ newEngineMap.put("screen", actionScreen);
+ newEngineMap.put(RENDER_TYPE_PARAM, new Integer(JahiaEngine.RENDER=
TYPE_FORWARD));
+ newEngineMap.put(ENGINE_NAME_PARAM, ENGINE_NAME);
+ newEngineMap.put(ENGINE_URL_PARAM, jParams.composeEngineUrl(ENGINE=
_NAME));
+ toolBox.displayScreen(jParams, newEngineMap);
=
return null;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
