svn commit: [jahia] r17735 - /trunk/core/src/java/org/jahia/params/ProcessingContext.java

[tdraier]

Author: tdraier
Date: Mon Jun 25 14:24:55 2007
New Revision: 17735

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17735&repname=
=3Djahia
Log:
add constructor with loadrequest ( backport 17279 )

Modified:
    trunk/core/src/java/org/jahia/params/ProcessingContext.java

Modified: trunk/core/src/java/org/jahia/params/ProcessingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/params/ProcessingContext.java&rev=3D17735&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/java/org/jahia/params/ProcessingContext.java (original)
+++ trunk/core/src/java/org/jahia/params/ProcessingContext.java Mon Jun 25 =
14:24:55 2007
@@ -356,6 +356,17 @@
                              final ContentPage aContentPage)
             throws JahiaPageNotFoundException, JahiaSessionExpirationExcep=
tion,
             JahiaSiteNotFoundException, JahiaException {
+        this(jSettings, aStartTime, aSite, user, aContentPage, new EntryLo=
adRequest(EntryLoadRequest.STAGED));
+    }
+
+    public ProcessingContext(final SettingsBean jSettings,
+                             final long aStartTime,
+                             final JahiaSite aSite,
+                             final JahiaUser user,
+                             final ContentPage aContentPage,
+                             final EntryLoadRequest loadRequest)
+            throws JahiaPageNotFoundException, JahiaSessionExpirationExcep=
tion,
+            JahiaSiteNotFoundException, JahiaException {
         Jahia.setThreadParamBean(this);
         // default vars
         setEngineName(CORE_ENGINE_NAME);
@@ -368,7 +379,7 @@
             setSiteID(aSite.getID());
             setSiteKey(aSite.getSiteKey());
         }
-        setEntryLoadRequest(new EntryLoadRequest(EntryLoadRequest.STAGED));
+        entryLoadRequest =3D loadRequest;
 =

         setSessionState(new BasicSessionState(Long.toString(System.current=
TimeMillis())));
 =

@@ -980,7 +991,7 @@
         }
         if (!locales.get(0).toString().equals(ContentField.SHARED_LANGUAGE=
)) {
             locales.add(0, new Locale(ContentField.SHARED_LANGUAGE, ""));
-        }        =

+        }
         if (locales.size() =3D=3D 0
                 || !(locales.get(0)).toString().equals(
                         ContentField.SHARED_LANGUAGE)) {
@@ -1813,7 +1824,7 @@
      */
     public String composeUrl(final String pageUrlKey, final String params)=
 throws JahiaException {
         return composeUrl(pageUrlKey, "", 0, null, params);
-    } // end composeUrl        =

+    } // end composeUrl
 =

     //--------------------------------------------------------------------=
-----
     // EV   20 Nov. 2000 : Original implementation

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list