Skip to content

Commit f7b8dde

Browse files
committed
style: Format code
1 parent b6f166c commit f7b8dde

2 files changed

Lines changed: 30 additions & 26 deletions

File tree

src/main/java/com/elovirta/dita/markdown/SpecializeFilter.java

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,16 @@ private enum TaskState {
6161
private boolean inChoicetableHead = false;
6262

6363
private static final Map<String, DitaClass> TASK_SECTIONS = Map.of(
64-
TASK_PREREQ.localName, TASK_PREREQ,
65-
TASK_CONTEXT.localName, TASK_CONTEXT,
66-
TASK_RESULT.localName, TASK_RESULT,
67-
TASK_POSTREQ.localName, TASK_POSTREQ,
68-
TASK_TASKTROUBLESHOOTING.localName, TASK_TASKTROUBLESHOOTING
64+
TASK_PREREQ.localName,
65+
TASK_PREREQ,
66+
TASK_CONTEXT.localName,
67+
TASK_CONTEXT,
68+
TASK_RESULT.localName,
69+
TASK_RESULT,
70+
TASK_POSTREQ.localName,
71+
TASK_POSTREQ,
72+
TASK_TASKTROUBLESHOOTING.localName,
73+
TASK_TASKTROUBLESHOOTING
6974
);
7075

7176
private final Deque<String> elementStack = new ArrayDeque<>();
@@ -173,7 +178,7 @@ private void startElementTask(String uri, String localName, String qName, Attrib
173178
break;
174179
case "section":
175180
if (depth == DEPTH_IN_BODY) {
176-
closeImplicitSection(uri);
181+
closeImplicitSection();
177182
final String outputclass = atts.getValue(ATTRIBUTE_NAME_OUTPUTCLASS);
178183
if (outputclass != null) {
179184
final DitaClass sectionClass = TASK_SECTIONS.get(outputclass.trim());
@@ -190,12 +195,12 @@ private void startElementTask(String uri, String localName, String qName, Attrib
190195
break;
191196
case "ol":
192197
if (depth == DEPTH_IN_BODY) {
193-
closeImplicitSection(uri);
198+
closeImplicitSection();
194199
taskState = TaskState.STEPS;
195200
renameStartElement(Constants.TASK_STEPS, atts);
196201
} else if (depth == 5 && (taskState == TaskState.STEP || taskState == TaskState.INFO)) {
197202
if (taskState == TaskState.INFO) {
198-
doEndElement(NULL_NS_URI, TASK_INFO.localName, TASK_INFO.localName);
203+
doEndElement(TASK_INFO);
199204
}
200205
taskState = TaskState.SUBSTEPS;
201206
renameStartElement(TASK_SUBSTEPS, atts);
@@ -205,12 +210,12 @@ private void startElementTask(String uri, String localName, String qName, Attrib
205210
break;
206211
case "ul":
207212
if (depth == DEPTH_IN_BODY) {
208-
closeImplicitSection(uri);
213+
closeImplicitSection();
209214
taskState = TaskState.STEPS;
210215
renameStartElement(TASK_STEPS_UNORDERED, atts);
211216
} else if (depth == 5 && (taskState == TaskState.STEP || taskState == TaskState.INFO)) {
212217
if (taskState == TaskState.INFO) {
213-
doEndElement(NULL_NS_URI, TASK_INFO.localName, TASK_INFO.localName);
218+
doEndElement(TASK_INFO);
214219
}
215220
taskState = TaskState.CHOICES;
216221
renameStartElement(TASK_CHOICES, atts);
@@ -234,7 +239,7 @@ private void startElementTask(String uri, String localName, String qName, Attrib
234239
case "simpletable":
235240
if (depth == 5 && (taskState == TaskState.STEP || taskState == TaskState.INFO)) {
236241
if (taskState == TaskState.INFO) {
237-
doEndElement(NULL_NS_URI, TASK_INFO.localName, TASK_INFO.localName);
242+
doEndElement(TASK_INFO);
238243
}
239244
taskState = TaskState.CHOICETABLE;
240245
choicetableColumn = 0;
@@ -352,12 +357,12 @@ private void startElementTask(String uri, String localName, String qName, Attrib
352357
}
353358
}
354359

355-
private void closeImplicitSection(String uri) throws SAXException {
360+
private void closeImplicitSection() throws SAXException {
356361
if (taskState == TaskState.CONTEXT) {
357-
doEndElement(uri, TASK_CONTEXT.localName, TASK_CONTEXT.localName);
362+
doEndElement(TASK_CONTEXT);
358363
taskState = stepsCompleted ? TaskState.POST_STEPS : TaskState.BODY;
359364
} else if (taskState == TaskState.RESULT) {
360-
doEndElement(uri, TASK_RESULT.localName, TASK_RESULT.localName);
365+
doEndElement(TASK_RESULT);
361366
taskState = TaskState.POST_STEPS;
362367
}
363368
}
@@ -404,7 +409,7 @@ private void endElementTask(String uri, String localName, String qName) throws S
404409
break;
405410
case "li":
406411
if (taskState == TaskState.SUBINFO && depth == 6) {
407-
doEndElement(NULL_NS_URI, TASK_INFO.localName, TASK_INFO.localName);
412+
doEndElement(TASK_INFO);
408413
taskState = TaskState.SUBSTEP;
409414
}
410415
if (taskState == TaskState.SUBSTEP && depth == 6) {

src/main/java/com/elovirta/dita/markdown/renderer/TopicRenderer.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,20 +117,21 @@ public class TopicRenderer extends AbstractRenderer {
117117
* Task section names (prereq, context, etc.) are preserved in outputclass
118118
* so the SpecializeFilter can detect and rename them.
119119
*/
120-
private static final Set<String> SECTION_CLASSES_TO_STRIP = Set.of(
121-
TOPIC_SECTION.localName,
122-
TOPIC_EXAMPLE.localName
123-
);
120+
private static final Set<String> SECTION_CLASSES_TO_STRIP = Set.of(TOPIC_SECTION.localName, TOPIC_EXAMPLE.localName);
124121

125122
/**
126123
* Default heading titles that map to task section elements without
127124
* requiring explicit class attributes.
128125
*/
129126
private static final Map<String, String> DEFAULT_TASK_SECTION_TITLES = Map.of(
130-
"prerequisites", TASK_PREREQ.localName,
131-
"about this task", TASK_CONTEXT.localName,
132-
"verification", TASK_RESULT.localName,
133-
"next steps", TASK_POSTREQ.localName
127+
"prerequisites",
128+
TASK_PREREQ.localName,
129+
"about this task",
130+
TASK_CONTEXT.localName,
131+
"verification",
132+
TASK_RESULT.localName,
133+
"next steps",
134+
TASK_POSTREQ.localName
134135
);
135136

136137
static {
@@ -618,9 +619,7 @@ private void render(final Heading node, final NodeRendererContext context, final
618619
final Collection<String> classes = new ArrayList<>(header.classes);
619620
classes.removeAll(SECTION_CLASSES_TO_STRIP);
620621
if (Collections.disjoint(classes, DEFAULT_TASK_SECTION_TITLES.values())) {
621-
final String defaultClass = DEFAULT_TASK_SECTION_TITLES.get(
622-
node.getText().toString().trim().toLowerCase()
623-
);
622+
final String defaultClass = DEFAULT_TASK_SECTION_TITLES.get(node.getText().toString().trim().toLowerCase());
624623
if (defaultClass != null) {
625624
classes.add(defaultClass);
626625
}

0 commit comments

Comments
 (0)