Author: sshyrkov
Date: Tue May 22 13:05:40 2007
New Revision: 17342
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17342&repname=
=3Djahia
Log:
Declaration of the 'includes' moved to the static part
Modified:
trunk/core/src/webapp/jsp/jahia/engines/engine.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/engine.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/engine.jsp&rev=3D17342&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
--- trunk/core/src/webapp/jsp/jahia/engines/engine.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/engine.jsp Tue May 22 13:05:40 =
2007
@@ -40,18 +40,12 @@
<%!
private static final org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger("jsp.jahia.engines.engine");
-%>
-
-<%
- final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
- final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
- final String engineUrl =3D (String) engineMap.get("engineUrl");
- final String theScreen =3D (String) engineMap.get("screen");
=
// include pages
- final Properties includes =3D new Properties();
+ private final static Properties includes =3D new Properties();
=
- // shared jsp
+ static {
+ // shared jsp
includes.setProperty("close", "/jsp/jahi=
a/engines/shared/close.jsp");
includes.setProperty("cancel", "/jsp/jahi=
a/engines/shared/cancel.jsp");
includes.setProperty("apply", "/jsp/jahi=
a/engines/shared/apply.jsp");
@@ -138,6 +132,14 @@
includes.setProperty("contentdefinition_forward", "/views/en=
gines/contentdefinition/index.jsp");
=
includes.setProperty("CustomizeSaveSearchView", "/jsp/jahi=
a/engines/search/customizesavesearchview.jsp");
+ }
+%>
+
+<%
+ final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
+ final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ final String engineUrl =3D (String) engineMap.get("engineUrl");
+ final String theScreen =3D (String) engineMap.get("screen");
=
request.setAttribute("includes", includes);
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
