• R/O
  • SSH
  • HTTPS

blogs: コミット


コミットメタ情報

リビジョン100 (tree)
日時2019-09-28 11:17:25
作者hirukawa_ryo

ログメッセージ

* flexmark-ext-inline-tags 0.1.4
flexmark 0.40.24 → flexmark 0.50.40 に変更しました。flexmarkのパッケージ名やメソッド名などAPIに変更があったため下位互換性を失っています。

変更サマリ

差分

--- flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/kbd/Kbd.java (revision 99)
+++ flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/kbd/Kbd.java (revision 100)
@@ -1,9 +1,9 @@
11 package net.osdn.blogs.flexmark.ext.kbd;
22
3-import com.vladsch.flexmark.util.ast.CustomNode;
3+import com.vladsch.flexmark.util.ast.Node;
44 import com.vladsch.flexmark.util.sequence.BasedSequence;
55
6-public class Kbd extends CustomNode {
6+public class Kbd extends Node {
77 protected BasedSequence openingMarker = BasedSequence.NULL;
88 protected BasedSequence text = BasedSequence.NULL;
99 protected BasedSequence closingMarker = BasedSequence.NULL;
--- flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/kbd/KbdExtension.java (revision 99)
+++ flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/kbd/KbdExtension.java (revision 100)
@@ -1,12 +1,12 @@
11 package net.osdn.blogs.flexmark.ext.kbd;
22
3-import com.vladsch.flexmark.Extension;
43 import com.vladsch.flexmark.html.HtmlRenderer;
54 import com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension;
65 import com.vladsch.flexmark.parser.Parser;
76 import com.vladsch.flexmark.parser.Parser.ParserExtension;
8-import com.vladsch.flexmark.util.options.MutableDataHolder;
97
8+import com.vladsch.flexmark.util.builder.Extension;
9+import com.vladsch.flexmark.util.data.MutableDataHolder;
1010 import net.osdn.blogs.flexmark.ext.kbd.internal.KbdInlineParserExtension;
1111 import net.osdn.blogs.flexmark.ext.kbd.internal.KbdNodeRenderer;
1212
--- flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/kbd/internal/KbdInlineParserExtension.java (revision 99)
+++ flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/kbd/internal/KbdInlineParserExtension.java (revision 100)
@@ -7,6 +7,7 @@
77 import com.vladsch.flexmark.parser.InlineParser;
88 import com.vladsch.flexmark.parser.InlineParserExtension;
99 import com.vladsch.flexmark.parser.InlineParserExtensionFactory;
10+import com.vladsch.flexmark.parser.LightInlineParser;
1011 import com.vladsch.flexmark.util.sequence.BasedSequence;
1112
1213 import net.osdn.blogs.flexmark.ext.kbd.Kbd;
@@ -14,19 +15,19 @@
1415 public class KbdInlineParserExtension implements InlineParserExtension {
1516 private final Pattern PATTERN = Pattern.compile("\\['([^']*)'\\]");
1617
17- public KbdInlineParserExtension(final InlineParser inlineParser) {
18+ public KbdInlineParserExtension(LightInlineParser inlineParser) {
1819 }
1920
2021 @Override
21- public void finalizeDocument(final InlineParser inlineParser) {
22+ public void finalizeDocument(InlineParser inlineParser) {
2223 }
2324
2425 @Override
25- public void finalizeBlock(final InlineParser inlineParser) {
26+ public void finalizeBlock(InlineParser inlineParser) {
2627 }
2728
2829 @Override
29- public boolean parse(final InlineParser inlineParser) {
30+ public boolean parse(LightInlineParser inlineParser) {
3031 if (inlineParser.peek(1) == '\'') {
3132 BasedSequence input = inlineParser.getInput();
3233 Matcher matcher = inlineParser.matcher(PATTERN);
@@ -59,12 +60,19 @@
5960 return null;
6061 }
6162
63+ /*
6264 @Override
6365 public InlineParserExtension create(final InlineParser inlineParser) {
6466 return new KbdInlineParserExtension(inlineParser);
6567 }
68+ */
6669
6770 @Override
71+ public InlineParserExtension apply(LightInlineParser inlineParser) {
72+ return new KbdInlineParserExtension(inlineParser);
73+ }
74+
75+ @Override
6876 public boolean affectsGlobalScope() {
6977 return false;
7078 }
--- flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/kbd/internal/KbdNodeRenderer.java (revision 99)
+++ flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/kbd/internal/KbdNodeRenderer.java (revision 100)
@@ -9,8 +9,8 @@
99 import com.vladsch.flexmark.html.renderer.NodeRendererContext;
1010 import com.vladsch.flexmark.html.renderer.NodeRendererFactory;
1111 import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
12-import com.vladsch.flexmark.util.options.DataHolder;
1312
13+import com.vladsch.flexmark.util.data.DataHolder;
1414 import net.osdn.blogs.flexmark.ext.kbd.Kbd;
1515
1616 public class KbdNodeRenderer implements NodeRenderer {
@@ -38,7 +38,7 @@
3838
3939 public static class Factory implements NodeRendererFactory {
4040 @Override
41- public NodeRenderer create(final DataHolder options) {
41+ public NodeRenderer apply(DataHolder options) {
4242 return new KbdNodeRenderer(options);
4343 }
4444 }
--- flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/samp_button/SampButton.java (revision 99)
+++ flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/samp_button/SampButton.java (revision 100)
@@ -1,9 +1,9 @@
11 package net.osdn.blogs.flexmark.ext.samp_button;
22
3-import com.vladsch.flexmark.util.ast.CustomNode;
3+import com.vladsch.flexmark.util.ast.Node;
44 import com.vladsch.flexmark.util.sequence.BasedSequence;
55
6-public class SampButton extends CustomNode {
6+public class SampButton extends Node {
77 protected BasedSequence openingMarker = BasedSequence.NULL;
88 protected BasedSequence text = BasedSequence.NULL;
99 protected BasedSequence closingMarker = BasedSequence.NULL;
--- flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/samp_button/SampButtonExtension.java (revision 99)
+++ flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/samp_button/SampButtonExtension.java (revision 100)
@@ -1,12 +1,12 @@
11 package net.osdn.blogs.flexmark.ext.samp_button;
22
3-import com.vladsch.flexmark.Extension;
43 import com.vladsch.flexmark.html.HtmlRenderer;
54 import com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension;
65 import com.vladsch.flexmark.parser.Parser;
76 import com.vladsch.flexmark.parser.Parser.ParserExtension;
8-import com.vladsch.flexmark.util.options.MutableDataHolder;
97
8+import com.vladsch.flexmark.util.builder.Extension;
9+import com.vladsch.flexmark.util.data.MutableDataHolder;
1010 import net.osdn.blogs.flexmark.ext.samp_button.internal.SampButtonInlineParserExtension;
1111 import net.osdn.blogs.flexmark.ext.samp_button.internal.SampButtonNodeRenderer;
1212
--- flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/samp_button/internal/SampButtonInlineParserExtension.java (revision 99)
+++ flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/samp_button/internal/SampButtonInlineParserExtension.java (revision 100)
@@ -7,6 +7,7 @@
77 import com.vladsch.flexmark.parser.InlineParser;
88 import com.vladsch.flexmark.parser.InlineParserExtension;
99 import com.vladsch.flexmark.parser.InlineParserExtensionFactory;
10+import com.vladsch.flexmark.parser.LightInlineParser;
1011 import com.vladsch.flexmark.util.sequence.BasedSequence;
1112
1213 import net.osdn.blogs.flexmark.ext.samp_button.SampButton;
@@ -14,19 +15,20 @@
1415 public class SampButtonInlineParserExtension implements InlineParserExtension {
1516 private final Pattern PATTERN = Pattern.compile("\\[\"([^\"]*)\"\\]");
1617
17- public SampButtonInlineParserExtension(final InlineParser inlineParser) {
18+ public SampButtonInlineParserExtension(LightInlineParser inlineParser) {
1819 }
1920
21+
2022 @Override
21- public void finalizeDocument(final InlineParser inlineParser) {
23+ public void finalizeDocument(InlineParser inlineParser) {
2224 }
2325
2426 @Override
25- public void finalizeBlock(final InlineParser inlineParser) {
27+ public void finalizeBlock(InlineParser inlineParser) {
2628 }
2729
2830 @Override
29- public boolean parse(final InlineParser inlineParser) {
31+ public boolean parse(LightInlineParser inlineParser) {
3032 if (inlineParser.peek(1) == '"') {
3133 BasedSequence input = inlineParser.getInput();
3234 Matcher matcher = inlineParser.matcher(PATTERN);
@@ -60,7 +62,7 @@
6062 }
6163
6264 @Override
63- public InlineParserExtension create(final InlineParser inlineParser) {
65+ public InlineParserExtension apply(LightInlineParser inlineParser) {
6466 return new SampButtonInlineParserExtension(inlineParser);
6567 }
6668
--- flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/samp_button/internal/SampButtonNodeRenderer.java (revision 99)
+++ flexmark-ext-inline-tags/trunk/src/main/java/net/osdn/blogs/flexmark/ext/samp_button/internal/SampButtonNodeRenderer.java (revision 100)
@@ -9,8 +9,8 @@
99 import com.vladsch.flexmark.html.renderer.NodeRendererContext;
1010 import com.vladsch.flexmark.html.renderer.NodeRendererFactory;
1111 import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
12-import com.vladsch.flexmark.util.options.DataHolder;
1312
13+import com.vladsch.flexmark.util.data.DataHolder;
1414 import net.osdn.blogs.flexmark.ext.samp_button.SampButton;
1515
1616 public class SampButtonNodeRenderer implements NodeRenderer {
@@ -39,7 +39,7 @@
3939
4040 public static class Factory implements NodeRendererFactory {
4141 @Override
42- public NodeRenderer create(final DataHolder options) {
42+ public NodeRenderer apply(DataHolder options) {
4343 return new SampButtonNodeRenderer(options);
4444 }
4545 }
旧リポジトリブラウザで表示