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/12/29 21:11:37 UTC
juneau git commit: Styles and scripts can be duplicated in HTML views.
Repository: juneau
Updated Branches:
refs/heads/master 39b3fc169 -> 14c41fe54
Styles and scripts can be duplicated in HTML views.
Project: http://git-wip-us.apache.org/repos/asf/juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/juneau/commit/14c41fe5
Tree: http://git-wip-us.apache.org/repos/asf/juneau/tree/14c41fe5
Diff: http://git-wip-us.apache.org/repos/asf/juneau/diff/14c41fe5
Branch: refs/heads/master
Commit: 14c41fe54ae30b0eda5af36fbe9414dffdbe24bc
Parents: 39b3fc1
Author: JamesBognar <ja...@apache.org>
Authored: Fri Dec 29 16:11:33 2017 -0500
Committer: JamesBognar <ja...@apache.org>
Committed: Fri Dec 29 16:11:33 2017 -0500
----------------------------------------------------------------------
.../juneau/html/HtmlDocSerializerSession.java | 20 +++++++++++++-------
.../juneau/html/HtmlDocTemplateBasic.java | 17 ++++++++---------
.../org/apache/juneau/rest/HtmlDocBuilder.java | 2 +-
3 files changed, 22 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juneau/blob/14c41fe5/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 07cf5a3..3ee1da9 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
@@ -14,6 +14,8 @@ package org.apache.juneau.html;
import static org.apache.juneau.html.HtmlDocSerializer.*;
+import java.util.*;
+
import org.apache.juneau.*;
import org.apache.juneau.serializer.*;
@@ -29,7 +31,8 @@ import org.apache.juneau.serializer.*;
public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
private final String noResultsMessage;
- private final String[] style, stylesheet, script, navlinks, head, header, nav, aside, footer;
+ private final String[] navlinks, head, header, nav, aside, footer;
+ private final Set<String> style, stylesheet, script;
private final boolean nowrap;
private final HtmlDocTemplate template;
@@ -49,9 +52,12 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
aside = getProperty(HTMLDOC_aside, String[].class, ctx.aside);
footer = getProperty(HTMLDOC_footer, String[].class, ctx.footer);
navlinks = getProperty(HTMLDOC_navlinks, String[].class, ctx.navlinks);
- style = getProperty(HTMLDOC_style, String[].class, ctx.style);
- stylesheet = getProperty(HTMLDOC_stylesheet, String[].class, ctx.stylesheet);
- script = getProperty(HTMLDOC_script, String[].class, ctx.script);
+
+ // These can contain dups after variable resolution, so de-dup them with hashsets.
+ style = new LinkedHashSet<>(Arrays.asList(getProperty(HTMLDOC_style, String[].class, ctx.style)));
+ stylesheet = new LinkedHashSet<>(Arrays.asList(getProperty(HTMLDOC_stylesheet, String[].class, ctx.stylesheet)));
+ script = new LinkedHashSet<>(Arrays.asList(getProperty(HTMLDOC_script, String[].class, ctx.script)));
+
head = getProperty(HTMLDOC_head, String[].class, ctx.head);
nowrap = getProperty(HTMLDOC_nowrap, boolean.class, ctx.nowrap);
noResultsMessage = getProperty(HTMLDOC_noResultsMessage, String.class, ctx.noResultsMessage);
@@ -85,7 +91,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
* An empty array if not specified.
* Never <jk>null</jk>.
*/
- public final String[] getStyle() {
+ public final Set<String> getStyle() {
return style;
}
@@ -97,7 +103,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
* An empty array if not specified.
* Never <jk>null</jk>.
*/
- public final String[] getStylesheet() {
+ public final Set<String> getStylesheet() {
return stylesheet;
}
@@ -109,7 +115,7 @@ public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
* An empty array if not specified.
* Never <jk>null</jk>.
*/
- public final String[] getScript() {
+ public final Set<String> getScript() {
return script;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/14c41fe5/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplateBasic.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplateBasic.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplateBasic.java
index 86044b2..1869306 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplateBasic.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplateBasic.java
@@ -44,23 +44,22 @@ public class HtmlDocTemplateBasic implements HtmlDocTemplate {
@Override /* HtmlDocTemplate */
public void style(HtmlDocSerializerSession session, HtmlWriter w, Object o) throws Exception {
- String[] stylesheet = session.getStylesheet();
- for (int i = 0; i < stylesheet.length; i++)
- w.sIf(i > 0).append(3, "@import ").q().append(session.resolveUri(stylesheet[i])).q().appendln(";");
+ int i = 0;
+ for (String s : session.getStylesheet())
+ w.sIf(i++ > 0).append(3, "@import ").q().append(session.resolveUri(s)).q().appendln(";");
if (session.isNoWrap())
w.appendln(3, "div.data * {white-space:nowrap;} ");
- String[] style = session.getStyle();
- for (int i = 0; i < style.length; i++)
- w.sIf(i > 0 || stylesheet.length > 0).appendln(3, style[i]);
+ for (String s : session.getStyle())
+ w.sIf(i > 0).appendln(3, s);
}
@Override /* HtmlDocTemplate */
public void script(HtmlDocSerializerSession session, HtmlWriter w, Object o) throws Exception {
- String[] script = session.getScript();
- for (int i = 0; i < script.length; i++)
- w.sIf(i > 0).appendln(3, script[i]);
+ int i = 0;
+ for (String s : session.getScript())
+ w.sIf(i++ > 0).appendln(3, s);
}
@Override /* HtmlDocTemplate */
http://git-wip-us.apache.org/repos/asf/juneau/blob/14c41fe5/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HtmlDocBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HtmlDocBuilder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HtmlDocBuilder.java
index bdd5760..3e54ff0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HtmlDocBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HtmlDocBuilder.java
@@ -487,7 +487,7 @@ public class HtmlDocBuilder {
}
private static String[] resolveList(Object[] value, String[] prev) {
- List<String> set = new LinkedList<>();
+ Set<String> set = new LinkedHashSet<>();
for (Object v : value) {
String s = StringUtils.toString(v);
if ("INHERIT".equals(s)) {