You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/10/08 18:13:08 UTC
incubator-juneau git commit: More cleanup.
Repository: incubator-juneau
Updated Branches:
refs/heads/master 247a3531e -> d767cb658
More cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/d767cb65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/d767cb65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/d767cb65
Branch: refs/heads/master
Commit: d767cb658a983c625a6d2d65319c3a2903da5465
Parents: 247a353
Author: JamesBognar <ja...@apache.org>
Authored: Sun Oct 8 14:13:06 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Sun Oct 8 14:13:06 2017 -0400
----------------------------------------------------------------------
.../juneau/html/HtmlDocSerializerSession.java | 40 ++++++--------------
1 file changed, 12 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d767cb65/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
index e7ffa6b..bd59d78 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
@@ -47,34 +47,18 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
super(ctx, args);
ObjectMap p = getProperties();
- // TODO - Change this to p.containsKeyPrefix(PREFIX)
- if (p.isEmpty()) {
- header = ctx.header;
- nav = ctx.nav;
- aside = ctx.aside;
- footer = ctx.footer;
- navlinks = ctx.navlinks;
- style = ctx.style;
- stylesheet = ctx.stylesheet;
- script = ctx.script;
- head = ctx.head;
- nowrap = ctx.nowrap;
- noResultsMessage = ctx.noResultsMessage;
- template = ClassUtils.newInstance(HtmlDocTemplate.class, ctx.template);
- } else {
- header = p.getString(HTMLDOC_header, ctx.nav);
- nav = p.getString(HTMLDOC_nav, ctx.nav);
- aside = p.getString(HTMLDOC_aside, ctx.aside);
- footer = p.getString(HTMLDOC_footer, ctx.footer);
- navlinks = p.getStringArray(HTMLDOC_navlinks, ctx.navlinks);
- style = p.getStringArray(HTMLDOC_style, ctx.style);
- stylesheet = p.getStringArray(HTMLDOC_stylesheet, ctx.stylesheet);
- script = p.getStringArray(HTMLDOC_script, ctx.script);
- head = p.getStringArray(HTMLDOC_head, ctx.head);
- nowrap = p.getBoolean(HTMLDOC_nowrap, ctx.nowrap);
- noResultsMessage = p.getString(HTMLDOC_noResultsMessage, ctx.noResultsMessage);
- template = ClassUtils.newInstance(HtmlDocTemplate.class, p.getWithDefault(HTMLDOC_template, ctx.template));
- }
+ header = p.getString(HTMLDOC_header, ctx.nav);
+ nav = p.getString(HTMLDOC_nav, ctx.nav);
+ aside = p.getString(HTMLDOC_aside, ctx.aside);
+ footer = p.getString(HTMLDOC_footer, ctx.footer);
+ navlinks = p.getStringArray(HTMLDOC_navlinks, ctx.navlinks);
+ style = p.getStringArray(HTMLDOC_style, ctx.style);
+ stylesheet = p.getStringArray(HTMLDOC_stylesheet, ctx.stylesheet);
+ script = p.getStringArray(HTMLDOC_script, ctx.script);
+ head = p.getStringArray(HTMLDOC_head, ctx.head);
+ nowrap = p.getBoolean(HTMLDOC_nowrap, ctx.nowrap);
+ noResultsMessage = p.getString(HTMLDOC_noResultsMessage, ctx.noResultsMessage);
+ template = ClassUtils.newInstance(HtmlDocTemplate.class, p.getWithDefault(HTMLDOC_template, ctx.template));
}
@Override /* Session */