♻ #12615

src/main/java/org/b3log/solo/processor/CategoryProcessor.java

@@ -49,7 +49,7 @@ import java.util.Map;
  * Category processor.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.1.5, Sep 21, 2018
+ * @version 1.0.1.6, Jan 5, 2019
  * @since 2.0.0
  */
 @RequestProcessor
@@ -109,9 +109,7 @@ public class CategoryProcessor {
      */
     @RequestProcessing(value = "/category/{categoryURI}", method = HttpMethod.GET)
     public void showCategoryArticles(final RequestContext context) {
-        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context);
-        context.setRenderer(renderer);
-        renderer.setTemplateName("category-articles.ftl");
+        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "category-articles.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
 
         final HttpServletRequest request = context.getRequest();

src/main/java/org/b3log/solo/processor/IndexProcessor.java

@@ -52,7 +52,7 @@ import java.util.Map;
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="mailto:385321165@qq.com">DASHU</a>
- * @version 1.2.4.11, Dec 2, 2018
+ * @version 1.2.4.12, Jan 5, 2019
  * @since 0.3.1
  */
 @RequestProcessor
@@ -97,9 +97,7 @@ public class IndexProcessor {
     public void showIndex(final RequestContext context) {
         final HttpServletRequest request = context.getRequest();
         final HttpServletResponse response = context.getResponse();
-        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context);
-        context.setRenderer(renderer);
-        renderer.setTemplateName("index.ftl");
+        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "index.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
         try {
             final int currentPageNum = Paginator.getPage(request);
@@ -147,11 +145,7 @@ public class IndexProcessor {
     @RequestProcessing(value = "/kill-browser", method = HttpMethod.GET)
     public void showKillBrowser(final RequestContext context) {
         final HttpServletRequest request = context.getRequest();
-        final HttpServletResponse response = context.getResponse();
-        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context);
-        context.setRenderer(renderer);
-        renderer.setTemplateName("kill-browser.ftl");
-
+        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "kill-browser.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
         try {
             final Map<String, String> langs = langPropsService.getAll(Locales.getLocale(request));
@@ -175,12 +169,7 @@ public class IndexProcessor {
      */
     @RequestProcessing(value = "/register", method = HttpMethod.GET)
     public void showRegister(final RequestContext context) {
-        final HttpServletRequest request = context.getRequest();
-        final HttpServletResponse response = context.getResponse();
-        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context);
-        context.setRenderer(renderer);
-        renderer.setTemplateName("register.ftl");
-
+        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "register.ftl");
         final Map<String, Object> dataModel = renderer.getDataModel();
         try {
             final Map<String, String> langs = langPropsService.getAll(Latkes.getLocale());

src/main/java/org/b3log/solo/processor/LoginProcessor.java

@@ -62,7 +62,7 @@ import java.util.Map;
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="mailto:dongxu.wang@acm.org">Dongxu Wang</a>
  * @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
- * @version 1.1.1.16, Dec 3, 2018
+ * @version 1.1.1.17, Jan 5, 2019
  * @since 0.3.1
  */
 @RequestProcessor
@@ -415,10 +415,7 @@ public class LoginProcessor {
      */
     private void renderPage(final RequestContext context, final String pageTemplate, final String destinationURL,
                             final HttpServletRequest request) {
-        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context);
-        renderer.setTemplateName(pageTemplate);
-        context.setRenderer(renderer);
-
+        final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, pageTemplate);
         final Map<String, Object> dataModel = renderer.getDataModel();
         final Map<String, String> langs = langPropsService.getAll(Latkes.getLocale());
         final JSONObject preference = preferenceQueryService.getPreference();

src/main/java/org/b3log/solo/processor/SkinRenderer.java

@@ -33,7 +33,7 @@ import java.util.Map;
  * Skin renderer.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.0.2, Nov 28, 2018
+ * @version 1.0.0.3, Jan 5, 2019
  * @since 2.9.1
  */
 public final class SkinRenderer extends AbstractFreeMarkerRenderer {
@@ -44,12 +44,15 @@ public final class SkinRenderer extends AbstractFreeMarkerRenderer {
     private final RequestContext context;
 
     /**
-     * Constructs a skin renderer with the specified HTTP servlet request.
+     * Constructs a skin renderer with the specified request context and template name.
      *
-     * @param context the specified HTTP servlet request context
+     * @param context      the specified request context
+     * @param templateName the specified template name
      */
-    public SkinRenderer(final RequestContext context) {
+    public SkinRenderer(final RequestContext context, final String templateName) {
         this.context = context;
+        this.context.setRenderer(this);
+        setTemplateName(templateName);
     }
 
     @Override