Skip to content

Commit 67f8405

Browse files
committed
Make list holder classes innner classes
1 parent 2753bf2 commit 67f8405

File tree

4 files changed

+48
-58
lines changed

4 files changed

+48
-58
lines changed

commonmark/src/main/java/org/commonmark/internal/renderer/text/BulletListHolder.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

commonmark/src/main/java/org/commonmark/internal/renderer/text/ListHolder.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

commonmark/src/main/java/org/commonmark/internal/renderer/text/OrderedListHolder.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

commonmark/src/main/java/org/commonmark/renderer/text/CoreTextContentNodeRenderer.java

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package org.commonmark.renderer.text;
22

3-
import org.commonmark.internal.renderer.text.BulletListHolder;
4-
import org.commonmark.internal.renderer.text.ListHolder;
5-
import org.commonmark.internal.renderer.text.OrderedListHolder;
63
import org.commonmark.node.*;
74
import org.commonmark.renderer.NodeRenderer;
85

@@ -288,4 +285,52 @@ private static String repeat(String s, int count) {
288285
}
289286
return sb.toString();
290287
}
288+
289+
private static class BulletListHolder extends ListHolder {
290+
private final String marker;
291+
292+
public BulletListHolder(ListHolder parent, BulletList list) {
293+
super(parent);
294+
marker = list.getMarker();
295+
}
296+
297+
public String getMarker() {
298+
return marker;
299+
}
300+
}
301+
302+
private abstract static class ListHolder {
303+
private final ListHolder parent;
304+
305+
ListHolder(ListHolder parent) {
306+
this.parent = parent;
307+
}
308+
309+
public ListHolder getParent() {
310+
return parent;
311+
}
312+
}
313+
314+
private static class OrderedListHolder extends ListHolder {
315+
private final String delimiter;
316+
private int counter;
317+
318+
public OrderedListHolder(ListHolder parent, OrderedList list) {
319+
super(parent);
320+
delimiter = list.getMarkerDelimiter() != null ? list.getMarkerDelimiter() : ".";
321+
counter = list.getMarkerStartNumber() != null ? list.getMarkerStartNumber() : 1;
322+
}
323+
324+
public String getDelimiter() {
325+
return delimiter;
326+
}
327+
328+
public int getCounter() {
329+
return counter;
330+
}
331+
332+
public void increaseCounter() {
333+
counter++;
334+
}
335+
}
291336
}

0 commit comments

Comments
 (0)