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 9dab2059468f189abd2ae79a96760c73162ab117 Author: juanpablo <[email protected]> AuthorDate: Sun Mar 15 14:09:20 2020 +0100 make renderers use Context instead of WikiContext --- .../src/main/java/org/apache/wiki/render/CleanTextRenderer.java | 4 ++-- .../src/main/java/org/apache/wiki/render/CreoleRenderer.java | 4 ++-- jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java | 6 +++--- .../main/java/org/apache/wiki/render/WysiwygEditingRenderer.java | 4 ++-- .../src/main/java/org/apache/wiki/render/XHTMLRenderer.java | 4 ++-- .../main/java/org/apache/wiki/render/markdown/MarkdownRenderer.java | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/render/CleanTextRenderer.java b/jspwiki-main/src/main/java/org/apache/wiki/render/CleanTextRenderer.java index dec05ec..e3e9673 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/render/CleanTextRenderer.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/render/CleanTextRenderer.java @@ -18,7 +18,7 @@ */ package org.apache.wiki.render; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.parser.WikiDocument; import org.apache.wiki.util.XmlUtil; @@ -36,7 +36,7 @@ public class CleanTextRenderer extends WikiRenderer { * @param context A WikiContext in which the rendering will take place. * @param doc The WikiDocument which shall be rendered. */ - public CleanTextRenderer( final WikiContext context, final WikiDocument doc ) { + public CleanTextRenderer( final Context context, final WikiDocument doc ) { super( context, doc ); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/render/CreoleRenderer.java b/jspwiki-main/src/main/java/org/apache/wiki/render/CreoleRenderer.java index 93f8255..230f416 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/render/CreoleRenderer.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/render/CreoleRenderer.java @@ -18,7 +18,7 @@ */ package org.apache.wiki.render; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.parser.PluginContent; import org.apache.wiki.parser.WikiDocument; import org.jdom2.Content; @@ -79,7 +79,7 @@ public class CreoleRenderer extends WikiRenderer { /** * Creates a new Creole Renderer. */ - public CreoleRenderer( final WikiContext ctx, final WikiDocument doc ) + public CreoleRenderer( final Context ctx, final WikiDocument doc ) { super( ctx, doc ); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java b/jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java index 0dae868..be627ff 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java @@ -18,7 +18,7 @@ */ package org.apache.wiki.render; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.parser.WikiDocument; import java.io.IOException; @@ -32,7 +32,7 @@ import java.io.IOException; */ public abstract class WikiRenderer { - protected WikiContext m_context; + protected Context m_context; protected WikiDocument m_document; public static final String LINKS_TRANSLATION = "$1#$2"; @@ -44,7 +44,7 @@ public abstract class WikiRenderer { * @param context A WikiContext in which the rendering will take place. * @param doc The WikiDocument which shall be rendered. */ - protected WikiRenderer( final WikiContext context, final WikiDocument doc ) { + protected WikiRenderer( final Context context, final WikiDocument doc ) { m_context = context; m_document = doc; doc.setContext( context ); // Make sure it is set diff --git a/jspwiki-main/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java b/jspwiki-main/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java index bb65bc2..4fc3894 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java @@ -18,7 +18,7 @@ */ package org.apache.wiki.render; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.htmltowiki.XHtmlToWikiConfig; import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.parser.WikiDocument; @@ -52,7 +52,7 @@ public class WysiwygEditingRenderer extends WikiRenderer { * @param context A WikiContext in which the rendering will take place. * @param doc The WikiDocument which shall be rendered. */ - public WysiwygEditingRenderer( final WikiContext context, final WikiDocument doc ) + public WysiwygEditingRenderer( final Context context, final WikiDocument doc ) { super( context, doc ); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/render/XHTMLRenderer.java b/jspwiki-main/src/main/java/org/apache/wiki/render/XHTMLRenderer.java index 5ffe2f9..da5e145 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/render/XHTMLRenderer.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/render/XHTMLRenderer.java @@ -18,7 +18,7 @@ */ package org.apache.wiki.render; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.parser.WikiDocument; import org.jdom2.output.Format; import org.jdom2.output.XMLOutputter; @@ -42,7 +42,7 @@ public class XHTMLRenderer extends WikiRenderer { * @param context A WikiContext in which the rendering will take place. * @param doc The WikiDocument which shall be rendered. */ - public XHTMLRenderer( final WikiContext context, final WikiDocument doc ) + public XHTMLRenderer( final Context context, final WikiDocument doc ) { super( context, doc ); } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/render/markdown/MarkdownRenderer.java b/jspwiki-markdown/src/main/java/org/apache/wiki/render/markdown/MarkdownRenderer.java index 1400b61..410fbc6 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/render/markdown/MarkdownRenderer.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/render/markdown/MarkdownRenderer.java @@ -21,7 +21,7 @@ package org.apache.wiki.render.markdown; import com.vladsch.flexmark.html.HtmlRenderer; 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.parser.MarkupParser; import org.apache.wiki.parser.WikiDocument; import org.apache.wiki.parser.markdown.MarkdownDocument; @@ -39,7 +39,7 @@ public class MarkdownRenderer extends WikiRenderer { private final HtmlRenderer renderer; - public MarkdownRenderer( final WikiContext context, final WikiDocument doc ) { + public MarkdownRenderer( final Context context, final WikiDocument doc ) { super( context, doc ); final MarkupParser mp = context.getEngine() .getManager( RenderingManager.class )
