From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 28 Apr 2015 08:51:30 +0000 (+0000)
Subject: Start preparing refactoring of CmsApplication
X-Git-Tag: argeo-commons-2.1.30~263
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=66cb24a33267ac92a046bca1c907b39af7f8c4a7;p=lgpl%2Fargeo-commons.git

Start preparing refactoring of CmsApplication

git-svn-id: https://svn.argeo.org/commons/trunk@8082 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.cms/src/org/argeo/cms/CmsApplication.java b/org.argeo.cms/src/org/argeo/cms/CmsApplication.java
index 9c7b5b344..fdf2e0270 100644
--- a/org.argeo.cms/src/org/argeo/cms/CmsApplication.java
+++ b/org.argeo.cms/src/org/argeo/cms/CmsApplication.java
@@ -122,8 +122,11 @@ public class CmsApplication implements CmsConstants, ApplicationConfiguration,
 				if (!properties.containsKey(WebClient.BODY_HTML))
 					properties.put(WebClient.BODY_HTML, DEFAULT_LOADING_BODY);
 
+				//
+				// ADD ENTRY POINT
+				//
 				application.addEntryPoint("/" + page, new CmsEntryPointFactory(
-						page), properties);
+						pages.get(page), repository, workspace), properties);
 				log.info("Registered entry point /" + page);
 			}
 
@@ -256,16 +259,21 @@ public class CmsApplication implements CmsConstants, ApplicationConfiguration,
 	}
 
 	private class CmsEntryPointFactory implements EntryPointFactory {
-		private final String page;
+		private final CmsUiProvider page;
+		private final Repository repository;
+		private final String workspace;
 
-		public CmsEntryPointFactory(String page) {
+		public CmsEntryPointFactory(CmsUiProvider page, Repository repository,
+				String workspace) {
 			this.page = page;
+			this.repository = repository;
+			this.workspace = workspace;
 		}
 
 		@Override
 		public EntryPoint create() {
 			CmsEntryPoint entryPoint = new CmsEntryPoint(repository, workspace,
-					pages.get(page));
+					page);
 			entryPoint.setState("");
 			CmsSession.current.set(entryPoint);
 			return entryPoint;