From 0e63622a5907a19e8dab9bafee2e470c0bb3cf19 Mon Sep 17 00:00:00 2001 From: liach Date: Thu, 24 Dec 2020 17:39:07 -0600 Subject: [PATCH] 0.2.2 Update html class reference to that of java 15 include js only once each class page Signed-off-by: liach --- .../mappingpoet/jd/MappingTaglet.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/filament/src/main/java/net/fabricmc/filament/mappingpoet/jd/MappingTaglet.java b/filament/src/main/java/net/fabricmc/filament/mappingpoet/jd/MappingTaglet.java index 3abaa57ce2..1e0ff278bf 100644 --- a/filament/src/main/java/net/fabricmc/filament/mappingpoet/jd/MappingTaglet.java +++ b/filament/src/main/java/net/fabricmc/filament/mappingpoet/jd/MappingTaglet.java @@ -63,34 +63,39 @@ public final class MappingTaglet implements Taglet { public String toString(List tags, Element element) { boolean typeDecl = element instanceof TypeElement; // means it's a class, itf, enum, etc. StringBuilder builder = new StringBuilder(); - builder.append("

Mapping data

\n"); - builder.append("\n"); + builder.append("
Mappings:
\n"); + // Java 15 required for style consistency + builder.append("
\n"); builder.append("\n"); - builder.append("\n"); - builder.append("\n"); + builder.append("\n"); + builder.append("\n"); if (!typeDecl) { - builder.append("\n"); + builder.append("\n"); } builder.append("\n"); builder.append("\n"); + boolean altColor = true; for (DocTree each : tags) { String body = ((UnknownBlockTagTree) each).getContent().stream().map(t -> ((LiteralTree) t).getBody().getBody()).collect(Collectors.joining()); String[] ans = body.split(":", 3); - builder.append("\n"); - builder.append(String.format("\n", escaped(ans[0]))); - final int bound = typeDecl ? 2 : 3; - for (int i = 1; i < bound; i++) { - builder.append(String.format("\n", escaped(ans[i]))); + builder.append("\n"); + builder.append(String.format("\n", escaped(ans[0]))); + builder.append(String.format("\n", escaped(ans[1]))); + if (!typeDecl) { + builder.append(String.format("\n", escaped(ans[2]))); } builder.append("\n"); + altColor = !altColor; } builder.append("\n"); - builder.append("
NamespaceNameNamespaceNameMixin selectorMixin selector
%s%s
%s%s%s
\n"); - builder.append("\n"); + builder.append("\n"); + if (typeDecl) { + builder.append("\n"); + } return builder.toString(); }