This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 9a017f290b3f9727759583f60deb16bb0ad3d96e Author: juanpablo <[email protected]> AuthorDate: Sun Mar 15 14:09:53 2020 +0100 use Context instead of WikiContext whenever possible throughout jspwiki-markdown --- .../org/apache/wiki/markdown/MarkdownForJSPWikiExtension.java | 6 +++--- .../attributeprovider/ExternalLinkAttributeProviderState.java | 6 +++--- .../attributeprovider/JSPWikiLinkAttributeProvider.java | 6 +++--- .../attributeprovider/JSPWikiLinkAttributeProviderFactory.java | 6 +++--- .../attributeprovider/LocalEditLinkAttributeProviderState.java | 6 +++--- .../LocalFootnoteLinkAttributeProviderState.java | 9 ++++----- .../LocalFootnoteRefLinkAttributeProviderState.java | 9 ++++----- .../attributeprovider/LocalLinkAttributeProviderState.java | 5 +++-- .../attributeprovider/LocalReadLinkAttributeProviderState.java | 9 ++++----- .../postprocessor/ExternalLinkNodePostProcessorState.java | 6 +++--- .../jspwikilinks/postprocessor/JSPWikiLinkNodePostProcessor.java | 6 +++--- .../postprocessor/JSPWikiNodePostProcessorFactory.java | 6 +++--- .../postprocessor/LocalFootnoteLinkNodePostProcessorState.java | 5 +++-- .../LocalFootnoteRefLinkNodePostProcessorState.java | 5 +++-- .../postprocessor/LocalLinkNodePostProcessorState.java | 5 +++-- .../wiki/markdown/renderer/JSPWikiNodeRendererFactory.java | 6 +++--- .../java/org/apache/wiki/parser/markdown/MarkdownDocument.java | 8 ++++---- .../java/org/apache/wiki/parser/markdown/MarkdownParser.java | 4 ++-- 18 files changed, 57 insertions(+), 56 deletions(-) diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/MarkdownForJSPWikiExtension.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/MarkdownForJSPWikiExtension.java index cc93a62..45bc27f 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/MarkdownForJSPWikiExtension.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/MarkdownForJSPWikiExtension.java @@ -22,7 +22,7 @@ import com.vladsch.flexmark.html.HtmlRenderer; import com.vladsch.flexmark.parser.Parser; import com.vladsch.flexmark.util.data.MutableDataHolder; import org.apache.oro.text.regex.Pattern; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProviderFactory; import org.apache.wiki.markdown.extensions.jspwikilinks.postprocessor.JSPWikiNodePostProcessorFactory; import org.apache.wiki.markdown.renderer.JSPWikiNodeRendererFactory; @@ -35,11 +35,11 @@ import java.util.List; */ public class MarkdownForJSPWikiExtension implements Parser.ParserExtension, HtmlRenderer.HtmlRendererExtension { - private final WikiContext context; + private final Context context; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; - public MarkdownForJSPWikiExtension( final WikiContext context, + public MarkdownForJSPWikiExtension( final Context context, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { this.context = context; diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java index 76dc98e..3724a60 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.java @@ -21,7 +21,7 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.html.Attributes; import org.apache.oro.text.regex.Pattern; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; import org.apache.wiki.parser.MarkupParser; @@ -36,12 +36,12 @@ public class ExternalLinkAttributeProviderState implements NodeAttributeProvider private final boolean hasRef; private final boolean m_useRelNofollow; - private final WikiContext wikiContext; + private final Context wikiContext; private final LinkParsingOperations linkOperations; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; - public ExternalLinkAttributeProviderState( final WikiContext wikiContext, + public ExternalLinkAttributeProviderState( final Context wikiContext, final boolean hasRef, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.java index 4d8ba7e..93a51b7 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.java @@ -24,7 +24,7 @@ import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.html.Attributes; import org.apache.commons.lang3.StringUtils; import org.apache.oro.text.regex.Pattern; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; import org.apache.wiki.util.TextUtil; @@ -39,12 +39,12 @@ import java.util.List; */ public class JSPWikiLinkAttributeProvider implements AttributeProvider { - protected final WikiContext wikiContext; + protected final Context wikiContext; protected final LinkParsingOperations linkOperations; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; - public JSPWikiLinkAttributeProvider( final WikiContext wikiContext, + public JSPWikiLinkAttributeProvider( final Context wikiContext, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { this.wikiContext = wikiContext; diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.java index c61a6fc..5883393 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.java @@ -23,7 +23,7 @@ import com.vladsch.flexmark.html.AttributeProviderFactory; import com.vladsch.flexmark.html.IndependentAttributeProviderFactory; import com.vladsch.flexmark.html.renderer.LinkResolverContext; import org.apache.oro.text.regex.Pattern; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import java.util.List; @@ -33,11 +33,11 @@ import java.util.List; */ public class JSPWikiLinkAttributeProviderFactory extends IndependentAttributeProviderFactory { - final WikiContext wikiContext; + final Context wikiContext; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; - public JSPWikiLinkAttributeProviderFactory( final WikiContext wikiContext, + public JSPWikiLinkAttributeProviderFactory( final Context wikiContext, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { this.wikiContext = wikiContext; diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java index f8e0e04..9715b5d 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.java @@ -20,7 +20,7 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.html.Attributes; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.i18n.InternationalizationManager; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.MarkupParser; @@ -35,10 +35,10 @@ import java.util.ResourceBundle; */ public class LocalEditLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { - private final WikiContext wikiContext; + private final Context wikiContext; private final String url; - public LocalEditLinkAttributeProviderState( final WikiContext wikiContext, final String url ) { + public LocalEditLinkAttributeProviderState( final Context wikiContext, final String url ) { this.wikiContext = wikiContext; this.url = url; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java index 95b8e23..e7dafee 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.java @@ -19,21 +19,20 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import com.vladsch.flexmark.util.ast.Node; -import org.apache.wiki.WikiContext; +import com.vladsch.flexmark.util.html.Attributes; +import org.apache.wiki.api.core.Context; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.MarkupParser; -import com.vladsch.flexmark.util.html.Attributes; - /** * {@link NodeAttributeProviderState} which sets the attributes for local footnote links. */ public class LocalFootnoteLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { - final WikiContext wikiContext; + final Context wikiContext; - public LocalFootnoteLinkAttributeProviderState( final WikiContext wikiContext ) { + public LocalFootnoteLinkAttributeProviderState( final Context wikiContext ) { this.wikiContext = wikiContext; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java index eb9491e..cd873f4 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.java @@ -19,21 +19,20 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import com.vladsch.flexmark.util.ast.Node; -import org.apache.wiki.WikiContext; +import com.vladsch.flexmark.util.html.Attributes; +import org.apache.wiki.api.core.Context; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.MarkupParser; -import com.vladsch.flexmark.util.html.Attributes; - /** * {@link NodeAttributeProviderState} which sets the attributes for local footnote reference links. */ public class LocalFootnoteRefLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { - final WikiContext wikiContext; + final Context wikiContext; - public LocalFootnoteRefLinkAttributeProviderState( final WikiContext wikiContext ) { + public LocalFootnoteRefLinkAttributeProviderState( final Context wikiContext ) { this.wikiContext = wikiContext; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java index add256b..afe602b 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.java @@ -23,6 +23,7 @@ import com.vladsch.flexmark.util.html.Attributes; import com.vladsch.flexmark.util.sequence.CharSubSequence; import org.apache.oro.text.regex.Pattern; import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.attachment.AttachmentManager; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; @@ -37,12 +38,12 @@ import java.util.List; public class LocalLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { private final boolean hasRef; - private final WikiContext wikiContext; + private final Context wikiContext; private final LinkParsingOperations linkOperations; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; - public LocalLinkAttributeProviderState( final WikiContext wikiContext, + public LocalLinkAttributeProviderState( final Context wikiContext, final boolean hasRef, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java index 1542ffb..e8c597e 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.java @@ -19,21 +19,20 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider; import com.vladsch.flexmark.util.ast.Node; -import org.apache.wiki.WikiContext; +import com.vladsch.flexmark.util.html.Attributes; +import org.apache.wiki.api.core.Context; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.MarkupParser; -import com.vladsch.flexmark.util.html.Attributes; - /** * {@link NodeAttributeProviderState} which sets the attributes for local read links. */ public class LocalReadLinkAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { - final WikiContext wikiContext; + final Context wikiContext; - public LocalReadLinkAttributeProviderState( final WikiContext wikiContext ) { + public LocalReadLinkAttributeProviderState( final Context wikiContext ) { this.wikiContext = wikiContext; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/ExternalLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/ExternalLinkNodePostProcessorState.java index bd2ee43..531d52d 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/ExternalLinkNodePostProcessorState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/ExternalLinkNodePostProcessorState.java @@ -22,7 +22,7 @@ import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.NodeTracker; import com.vladsch.flexmark.util.sequence.CharSubSequence; import org.apache.oro.text.regex.Pattern; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; import org.apache.wiki.parser.MarkupParser; @@ -35,13 +35,13 @@ import java.util.List; */ public class ExternalLinkNodePostProcessorState implements NodePostProcessorState< JSPWikiLink > { - private final WikiContext wikiContext; + private final Context wikiContext; private final LinkParsingOperations linkOperations; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; private boolean m_useOutlinkImage = true; - public ExternalLinkNodePostProcessorState( final WikiContext wikiContext, + public ExternalLinkNodePostProcessorState( final Context wikiContext, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { this.wikiContext = wikiContext; diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/JSPWikiLinkNodePostProcessor.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/JSPWikiLinkNodePostProcessor.java index 0ee69f1..d490370 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/JSPWikiLinkNodePostProcessor.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/JSPWikiLinkNodePostProcessor.java @@ -26,7 +26,7 @@ import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.NodeTracker; import org.apache.commons.lang3.StringUtils; import org.apache.oro.text.regex.Pattern; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; import org.apache.wiki.parser.MarkupParser; @@ -42,14 +42,14 @@ import java.util.List; */ public class JSPWikiLinkNodePostProcessor extends NodePostProcessor { - protected final WikiContext m_context; + protected final Context m_context; protected final LinkParsingOperations linkOperations; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; protected boolean m_useOutlinkImage = true; protected final Document document; - public JSPWikiLinkNodePostProcessor( final WikiContext m_context, + public JSPWikiLinkNodePostProcessor( final Context m_context, final Document document, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/JSPWikiNodePostProcessorFactory.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/JSPWikiNodePostProcessorFactory.java index d929240..e8a49e0 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/JSPWikiNodePostProcessorFactory.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/JSPWikiNodePostProcessorFactory.java @@ -24,7 +24,7 @@ import com.vladsch.flexmark.parser.block.NodePostProcessorFactory; import com.vladsch.flexmark.util.ast.Document; import com.vladsch.flexmark.util.data.DataHolder; import org.apache.oro.text.regex.Pattern; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import java.util.List; @@ -34,11 +34,11 @@ import java.util.List; */ public class JSPWikiNodePostProcessorFactory extends NodePostProcessorFactory { - private final WikiContext m_context; + private final Context m_context; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; - public JSPWikiNodePostProcessorFactory( final WikiContext m_context, + public JSPWikiNodePostProcessorFactory( final Context m_context, final DataHolder options, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalFootnoteLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalFootnoteLinkNodePostProcessorState.java index 1b697fe..e43abfc 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalFootnoteLinkNodePostProcessorState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalFootnoteLinkNodePostProcessorState.java @@ -4,6 +4,7 @@ import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.NodeTracker; import com.vladsch.flexmark.util.sequence.CharSubSequence; import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.markdown.nodes.JSPWikiLink; @@ -12,9 +13,9 @@ import org.apache.wiki.markdown.nodes.JSPWikiLink; */ public class LocalFootnoteLinkNodePostProcessorState implements NodePostProcessorState< JSPWikiLink > { - final WikiContext wikiContext; + final Context wikiContext; - public LocalFootnoteLinkNodePostProcessorState( final WikiContext wikiContext ) { + public LocalFootnoteLinkNodePostProcessorState( final Context wikiContext ) { this.wikiContext = wikiContext; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalFootnoteRefLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalFootnoteRefLinkNodePostProcessorState.java index e16a98b..a9727e8 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalFootnoteRefLinkNodePostProcessorState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalFootnoteRefLinkNodePostProcessorState.java @@ -23,6 +23,7 @@ import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.NodeTracker; import com.vladsch.flexmark.util.sequence.CharSubSequence; import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.markdown.nodes.JSPWikiLink; @@ -31,9 +32,9 @@ import org.apache.wiki.markdown.nodes.JSPWikiLink; */ public class LocalFootnoteRefLinkNodePostProcessorState implements NodePostProcessorState< JSPWikiLink > { - private final WikiContext wikiContext; + private final Context wikiContext; - public LocalFootnoteRefLinkNodePostProcessorState( final WikiContext wikiContext ) { + public LocalFootnoteRefLinkNodePostProcessorState( final Context wikiContext ) { this.wikiContext = wikiContext; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalLinkNodePostProcessorState.java index b1eca9e..3fd4bff 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalLinkNodePostProcessorState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/LocalLinkNodePostProcessorState.java @@ -24,6 +24,7 @@ import com.vladsch.flexmark.util.ast.NodeTracker; import com.vladsch.flexmark.util.sequence.CharSubSequence; import org.apache.oro.text.regex.Pattern; import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.attachment.AttachmentManager; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; @@ -37,12 +38,12 @@ import java.util.List; */ public class LocalLinkNodePostProcessorState implements NodePostProcessorState< JSPWikiLink > { - private final WikiContext wikiContext; + private final Context wikiContext; private final LinkParsingOperations linkOperations; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; - public LocalLinkNodePostProcessorState( final WikiContext wikiContext, + public LocalLinkNodePostProcessorState( final Context wikiContext, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { this.wikiContext = wikiContext; diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiNodeRendererFactory.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiNodeRendererFactory.java index ce376b9..56e50af 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiNodeRendererFactory.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/renderer/JSPWikiNodeRendererFactory.java @@ -22,7 +22,7 @@ import com.vladsch.flexmark.html.renderer.DelegatingNodeRendererFactory; import com.vladsch.flexmark.html.renderer.NodeRenderer; import com.vladsch.flexmark.html.renderer.NodeRendererFactory; import com.vladsch.flexmark.util.data.DataHolder; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import java.util.Set; @@ -32,9 +32,9 @@ import java.util.Set; */ public class JSPWikiNodeRendererFactory implements DelegatingNodeRendererFactory { - final WikiContext wikiContext; + final Context wikiContext; - public JSPWikiNodeRendererFactory( final WikiContext wikiContext ) { + public JSPWikiNodeRendererFactory( final Context wikiContext ) { this.wikiContext = wikiContext; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownDocument.java b/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownDocument.java index 17eb5fa..84a8097 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownDocument.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownDocument.java @@ -26,8 +26,8 @@ import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.data.MutableDataSet; import com.vladsch.flexmark.util.misc.Extension; import org.apache.oro.text.regex.Pattern; -import org.apache.wiki.WikiContext; -import org.apache.wiki.WikiPage; +import org.apache.wiki.api.core.Context; +import org.apache.wiki.api.core.Page; import org.apache.wiki.markdown.MarkdownForJSPWikiExtension; import org.apache.wiki.parser.JSPWikiMarkupParser; import org.apache.wiki.parser.WikiDocument; @@ -45,7 +45,7 @@ public class MarkdownDocument extends WikiDocument { private final Node md; - public MarkdownDocument( final WikiPage page, final Node md ) { + public MarkdownDocument( final Page page, final Node md ) { super( page ); this.md = md; } @@ -60,7 +60,7 @@ public class MarkdownDocument extends WikiDocument { * @param context current wikicontext * @return configuration options for MarkdownRenderers. */ - public static MutableDataSet options( final WikiContext context, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { + public static MutableDataSet options( final Context context, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { final MutableDataSet options = new MutableDataSet(); options.setFrom( ParserEmulationProfile.COMMONMARK ); // align style of Markdown's footnotes extension with jspwiki footnotes refs diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownParser.java b/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownParser.java index 2c69f09..751f5f9 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownParser.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/parser/markdown/MarkdownParser.java @@ -20,7 +20,7 @@ package org.apache.wiki.parser.markdown; import com.vladsch.flexmark.parser.Parser; import com.vladsch.flexmark.util.ast.Node; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.auth.AuthorizationManager; import org.apache.wiki.auth.UserManager; import org.apache.wiki.parser.MarkupParser; @@ -37,7 +37,7 @@ public class MarkdownParser extends MarkupParser { private final Parser parser; - public MarkdownParser( final WikiContext context, final Reader in ) { + public MarkdownParser( final Context context, final Reader in ) { super( context, in ); if( context.getEngine().getManager( UserManager.class ).getUserDatabase() == null || context.getEngine().getManager( AuthorizationManager.class ) == null ) {
