Renamed MasterPage to PageDecorator.

rapidoid · Sep 1, 2016 · 3165a04 · 3165a04
1 parent 5fe4434
commit 3165a04
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/rapidoid-commons/src/main/resources/rapidoid-classes.txt b/rapidoid-commons/src/main/resources/rapidoid-classes.txt
@@ -298,7 +298,7 @@ org.rapidoid.http.customize.defaults.DefaultErrorHandler
 org.rapidoid.http.customize.defaults.DefaultJsonRequestBodyParser
 org.rapidoid.http.customize.defaults.DefaultJsonResponseRenderer
 org.rapidoid.http.customize.defaults.DefaultLoginProvider
-org.rapidoid.http.customize.defaults.DefaultMasterPage
+org.rapidoid.http.customize.defaults.DefaultPageDecorator
 org.rapidoid.http.customize.defaults.DefaultRolesProvider
 org.rapidoid.http.customize.defaults.Defaults
 org.rapidoid.http.customize.defaults.DefaultSessionManager
@@ -311,7 +311,7 @@ org.rapidoid.http.customize.ErrorHandler
 org.rapidoid.http.customize.JsonRequestBodyParser
 org.rapidoid.http.customize.JsonResponseRenderer
 org.rapidoid.http.customize.LoginProvider
-org.rapidoid.http.customize.MasterPage
+org.rapidoid.http.customize.PageDecorator
 org.rapidoid.http.customize.ResourceLoader
 org.rapidoid.http.customize.RolesProvider
 org.rapidoid.http.customize.SessionManager

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/Resp.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/Resp.java
@@ -132,7 +132,7 @@ public interface Resp {
 	String view();
 
 	/**
-	 * Disables the view rendering for the target MVC route. The master page rendering remains enabled.
+	 * Disables the view rendering for the target MVC route. The page decorator remains enabled.
 	 */
 	Resp noView();
 

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/Customization.java
@@ -51,7 +51,7 @@ public class Customization extends RapidoidThing {
 
 	private volatile ViewResolver viewResolver;
 
-	private volatile MasterPage masterPage;
+	private volatile PageDecorator pageDecorator;
 
 	private volatile JsonResponseRenderer jsonResponseRenderer;
 
@@ -92,7 +92,7 @@ public synchronized void reset() {
 		staticFilesPath = null;
 		errorHandler = null;
 		viewResolver = null;
-		masterPage = null;
+		pageDecorator = null;
 		jsonResponseRenderer = null;
 		beanParameterFactory = null;
 		loginProvider = null;
@@ -184,12 +184,12 @@ public Customization viewResolver(ViewResolver viewResolver) {
 		return this;
 	}
 
-	public MasterPage masterPage() {
+	public PageDecorator pageDecorator() {
-		return masterPage != null || defaults == null ? masterPage : defaults.masterPage();
+		return pageDecorator != null || defaults == null ? pageDecorator : defaults.pageDecorator();
 	}
 
-	public Customization masterPage(MasterPage masterPage) {
+	public Customization pageDecorator(PageDecorator pageDecorator) {
-		this.masterPage = masterPage;
+		this.pageDecorator = pageDecorator;
 		return this;
 	}
 

diff --git a/...g/rapidoid/http/customize/MasterPage.java → ...apidoid/http/customize/PageDecorator.java b/...g/rapidoid/http/customize/MasterPage.java → ...apidoid/http/customize/PageDecorator.java
@@ -28,7 +28,7 @@
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.2.0")
-public interface MasterPage {
+public interface PageDecorator {
 
 	void renderPage(Req req, String content, OutputStream out) throws Exception;
 

diff --git a/...customize/defaults/DefaultMasterPage.java → ...tomize/defaults/DefaultPageDecorator.java b/...customize/defaults/DefaultMasterPage.java → ...tomize/defaults/DefaultPageDecorator.java
@@ -6,7 +6,7 @@
 import org.rapidoid.gui.GUI;
 import org.rapidoid.http.Req;
 import org.rapidoid.http.Resp;
-import org.rapidoid.http.customize.MasterPage;
+import org.rapidoid.http.customize.PageDecorator;
 import org.rapidoid.u.U;
 import org.rapidoid.util.StreamUtils;
 import org.rapidoid.web.Screen;
@@ -36,7 +36,7 @@
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.2.0")
-public class DefaultMasterPage extends RapidoidThing implements MasterPage {
+public class DefaultPageDecorator extends RapidoidThing implements PageDecorator {
 
 	private static final String FULL_PAGE_REGEX = "(?s)^(?:\\s*(<!--(?:.*?)-->)*?)*?<(!DOCTYPE\\s+html|html)>";
 

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/defaults/Defaults.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/customize/defaults/Defaults.java
@@ -49,7 +49,7 @@ public class Defaults extends RapidoidThing {
 
 	private static final RolesProvider rolesProvider = new DefaultRolesProvider();
 
-	private static final MasterPage masterPage = new DefaultMasterPage();
+	private static final PageDecorator pageDecorator = new DefaultPageDecorator();
 
 	private static final ResourceLoader templateLoader = new DefaultTemplateLoader(Templates.DEFAULT_PATH);
 
@@ -95,8 +95,8 @@ public static RolesProvider rolesProvider() {
 		return rolesProvider;
 	}
 
-	public static MasterPage masterPage() {
+	public static PageDecorator pageDecorator() {
-		return masterPage;
+		return pageDecorator;
 	}
 
 	public static ViewResolver viewResolver() {

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/ResponseRenderer.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/ResponseRenderer.java
@@ -31,7 +31,7 @@
 import org.rapidoid.http.Resp;
 import org.rapidoid.http.View;
 import org.rapidoid.http.customize.Customization;
-import org.rapidoid.http.customize.MasterPage;
+import org.rapidoid.http.customize.PageDecorator;
 import org.rapidoid.http.customize.ViewResolver;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Msc;
@@ -123,13 +123,13 @@ public static String renderView(ReqImpl req, Resp resp, Object result) {
 
 	public static byte[] renderPage(ReqImpl req, String content) {
 
-		MasterPage masterPage = Customization.of(req).masterPage();
+		PageDecorator pageDecorator = Customization.of(req).pageDecorator();
-		U.must(masterPage != null, "A page renderer wasn't configured!");
+		U.must(pageDecorator != null, "A page decorator wasn't configured!");
 
 		ByteArrayOutputStream out = Msc.locals().pageRenderingStream();
 
 		try {
-			masterPage.renderPage(req, content, out);
+			pageDecorator.renderPage(req, content, out);
 
 		} catch (Exception e) {
 			throw U.rte("Error while rendering page!", e);

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java b/rapidoid-http-fast/src/main/java/org/rapidoid/setup/My.java
@@ -44,7 +44,7 @@ public static void reset() {
 			GLOBAL.staticFilesPath(Defaults.staticFilesPath());
 			GLOBAL.errorHandler(Defaults.errorHandler());
 			GLOBAL.viewResolver(Defaults.viewResolver());
-			GLOBAL.masterPage(Defaults.masterPage());
+			GLOBAL.pageDecorator(Defaults.pageDecorator());
 			GLOBAL.jsonResponseRenderer(Defaults.jsonResponseRenderer());
 			GLOBAL.jsonRequestBodyParser(Defaults.jsonRequestBodyParser());
 			GLOBAL.beanParameterFactory(Defaults.beanParameterFactory());
@@ -113,8 +113,8 @@ public static void rolesProvider(RolesProvider rolesProvider) {
 		GLOBAL.rolesProvider(rolesProvider);
 	}
 
-	public static void masterPage(MasterPage masterPage) {
+	public static void pageDecorator(PageDecorator pageDecorator) {
-		GLOBAL.masterPage(masterPage);
+		GLOBAL.pageDecorator(pageDecorator);
 	}
 
 	public static void viewResolver(ViewResolver viewResolver) {
@@ -149,8 +149,8 @@ public static RolesProvider rolesProvider() {
 		return GLOBAL.rolesProvider();
 	}
 
-	public static MasterPage masterPage() {
+	public static PageDecorator pageDecorator() {
-		return GLOBAL.masterPage();
+		return GLOBAL.pageDecorator();
 	}
 
 	public static ViewResolver viewResolver() {