Author: bpapez
Date: Thu Dec 13 14:49:34 2007
New Revision: 19367
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19367&repname=
=3Djahia
Log:
MEY-42: CMNet Meyrin / Gestion des droits des groupes
- Prevent NPE in SelectPage_Engine
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/engines/selectpage/SelectP=
age_Engine.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/engines/selectpage/S=
electPage_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/engines/selectpage/SelectPage_Engine.java&rev=3D193=
67&repname=3Djahia
=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
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/engines/selectpage/SelectP=
age_Engine.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/engines/selectpage/SelectP=
age_Engine.java Thu Dec 13 14:49:34 2007
@@ -181,13 +181,12 @@
*/
public void handleActions(ParamBean jParams, JahiaData jData)
throws JahiaException {
-
- final PagesFilter pagesFilter =3D JahiaSiteMapService.getCurrentPa=
gesFilter(
- (JahiaField)((Map)jParams.getSession().getAttribute("jahia=
_session_engineMap")).
- get("theField"), jParams);
- =
- HashMap engineMap =3D new HashMap();
- engineMap.put("tabOptions", (pagesFilter !=3D null && pagesFilter.=
isSearchTabRequired() ? tabOptions : tabOptionsBasic));
+ Map engineMap =3D (Map)jParams.getSession().getAttribute("jahia_se=
ssion_engineMap");
+ JahiaField theField =3D engineMap !=3D null ? (JahiaField)engineMa=
p.get("theField") : null; =
+ PagesFilter pagesFilter =3D JahiaSiteMapService.getCurrentPagesFil=
ter(theField, jParams);
+ =
+ HashMap newEngineMap =3D new HashMap();
+ newEngineMap.put("tabOptions", (pagesFilter !=3D null && pagesFilt=
er.isSearchTabRequired() ? tabOptions : tabOptionsBasic));
String actionScreen =3D jParams.getParameter("screen");
// screen =3D display
if ("display".equals(actionScreen)) {
@@ -203,7 +202,7 @@
String selectPageOperation =3D (String) selectedPageParams
.get(OPERATION);
if (!possibleOperations.contains(selectPageOperation)) {
- engineMap.put("engineError", selectPageOperation);
+ newEngineMap.put("engineError", selectPageOperation);
}
}
// If tab selected, which one ?
@@ -215,7 +214,7 @@
=
jParams.getRequest().setAttribute("org.jahia.data.JahiaDat=
a",
jData);
- engineMap.put("activeTabOption", new Integer(
+ newEngineMap.put("activeTabOption", new Integer(
SiteMapViewHelper.SEARCH_VIEW));
} else {
int pageInfosFlag =3D ContentPage.ACTIVE_PAGE_INFOS
@@ -240,19 +239,19 @@
.getTreeSiteMapViewHelper(jParams.getUser(), startPage=
s,
jParams.getSessionID(), pageInfosFlag, null,
SiteMapViewHelper.DEFAULT_LEVEL, directPagesOnly, =
pagesFilter, jParams);
- engineMap.put("treeJahiaSiteMap", siteMapViewHelper);
+ newEngineMap.put("treeJahiaSiteMap", siteMapViewHelper);
siteMapViewHelper =3D siteMapService.getFlatSiteMapViewHel=
per(
jParams.getUser(), startPages, jParams.getSessionID(),
pageInfosFlag, null, SiteMapViewHelper.DISPLAY_ALL_LEV=
EL, =
pagesFilter, jParams);
- engineMap.put("flatJahiaSiteMap", siteMapViewHelper);
+ newEngineMap.put("flatJahiaSiteMap", siteMapViewHelper);
// Has the user made a site map handling (collapse,
// expand...)...
String siteMapParam =3D jParams.getParameter("sitemap");
=
if (tabOptions[SiteMapViewHelper.TREE_VIEW].equals(display=
)) {
lastDisplay =3D tabOptions[SiteMapViewHelper.TREE_VIEW=
];
- engineMap.put("activeTabOption", new Integer(
+ newEngineMap.put("activeTabOption", new Integer(
SiteMapViewHelper.TREE_VIEW));
if (siteMapParam !=3D null) {
siteMapService.invokeTreeSiteMapViewHelperMethod(
@@ -263,7 +262,7 @@
} else if (tabOptions[SiteMapViewHelper.FLAT_VIEW]
.equals(display)) {
lastDisplay =3D tabOptions[SiteMapViewHelper.FLAT_VIEW=
];
- engineMap.put("activeTabOption", new Integer(
+ newEngineMap.put("activeTabOption", new Integer(
SiteMapViewHelper.FLAT_VIEW));
if (siteMapParam !=3D null) {
siteMapService.invokeFlatSiteMapViewHelperMethod(
@@ -275,7 +274,7 @@
}
// Save the form selection to the session.
storeSelectedPageParameters(jParams);
- engineMap.put("jspSource", SELECT_PAGE_JSP);
+ newEngineMap.put("jspSource", SELECT_PAGE_JSP);
jParams.getRequest().setAttribute("engineTitle", "Select Page"=
); // Displayed
=
// in
=
// 'engine.jsp'
@@ -283,11 +282,11 @@
} else if ("store".equals(actionScreen)) {
// Save the form selection to the session.
storeSelectedPageParameters(jParams);
- engineMap.put("jspSource", CLOSE_JSP);
+ newEngineMap.put("jspSource", CLOSE_JSP);
}
- engineMap.put(RENDER_TYPE_PARAM, new Integer(
+ newEngineMap.put(RENDER_TYPE_PARAM, new Integer(
JahiaEngine.RENDERTYPE_FORWARD));
- toolBox.displayScreen(jParams, engineMap);
+ toolBox.displayScreen(jParams, newEngineMap);
}
=
/**
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
