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 df055a1628c75c0cd9951ae8870585a16190ea2c Author: juanpablo <[email protected]> AuthorDate: Sat Mar 28 00:43:48 2020 +0100 more substitutions of WikiContext constants with ContextEnum ones --- jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java | 4 ++-- .../src/main/java/org/apache/wiki/tags/InsertDiffTag.java | 9 +++++---- jspwiki-main/src/main/java/org/apache/wiki/tags/PageNameTag.java | 6 +++--- jspwiki-main/src/main/java/org/apache/wiki/tags/PageSizeTag.java | 4 ++-- .../src/main/java/org/apache/wiki/tags/ParentPageNameTag.java | 6 +++--- .../attributeprovider/LocalLinkAttributeProviderState.java | 4 ++-- .../postprocessor/NodePostProcessorStateCommonOperations.java | 4 ++-- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java index c278072..1018b1e 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java @@ -18,8 +18,8 @@ */ package org.apache.wiki.tags; -import org.apache.wiki.WikiPage; import org.apache.wiki.api.core.Engine; +import org.apache.wiki.api.core.Page; import org.apache.wiki.i18n.InternationalizationManager; import org.apache.wiki.pages.PageManager; import org.apache.wiki.parser.MarkupParser; @@ -51,7 +51,7 @@ public class AuthorTag extends WikiTagBase { @Override public final int doWikiStartTag() throws IOException { final Engine engine = m_wikiContext.getEngine(); - final WikiPage page = m_wikiContext.getPage(); + final Page page = m_wikiContext.getPage(); String author = page.getAuthor(); if( author != null && author.length() > 0 ) { diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java index 7865639..0b1419b 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java @@ -19,7 +19,7 @@ package org.apache.wiki.tags; import org.apache.log4j.Logger; -import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.api.core.Engine; import org.apache.wiki.diff.DifferenceManager; import org.apache.wiki.pages.PageManager; @@ -77,14 +77,15 @@ public class InsertDiffTag extends WikiTagBase { } /** {@inheritDoc} */ - @Override public final int doWikiStartTag() throws IOException { + @Override + public final int doWikiStartTag() throws IOException { final Engine engine = m_wikiContext.getEngine(); - final WikiContext ctx; + final Context ctx; if( m_pageName == null ) { ctx = m_wikiContext; } else { - ctx = ( WikiContext )m_wikiContext.clone(); + ctx = m_wikiContext.clone(); ctx.setPage( engine.getManager( PageManager.class ).getPage(m_pageName) ); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageNameTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageNameTag.java index 7841a8c..f4d3110 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageNameTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageNameTag.java @@ -18,9 +18,9 @@ */ package org.apache.wiki.tags; -import org.apache.wiki.WikiPage; +import org.apache.wiki.api.core.Attachment; import org.apache.wiki.api.core.Engine; -import org.apache.wiki.attachment.Attachment; +import org.apache.wiki.api.core.Page; import org.apache.wiki.render.RenderingManager; import org.apache.wiki.util.TextUtil; @@ -38,7 +38,7 @@ public class PageNameTag extends WikiTagBase { @Override public final int doWikiStartTag() throws IOException { final Engine engine = m_wikiContext.getEngine(); - final WikiPage page = m_wikiContext.getPage(); + final Page page = m_wikiContext.getPage(); if( page != null ) { if( page instanceof Attachment ) { diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageSizeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageSizeTag.java index 7dba42c..184f5d7 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageSizeTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageSizeTag.java @@ -19,8 +19,8 @@ package org.apache.wiki.tags; import org.apache.log4j.Logger; -import org.apache.wiki.WikiPage; import org.apache.wiki.api.core.Engine; +import org.apache.wiki.api.core.Page; import org.apache.wiki.api.exceptions.ProviderException; import org.apache.wiki.pages.PageManager; @@ -39,7 +39,7 @@ public class PageSizeTag extends WikiTagBase { @Override public final int doWikiStartTag() throws IOException { final Engine engine = m_wikiContext.getEngine(); - final WikiPage page = m_wikiContext.getPage(); + final Page page = m_wikiContext.getPage(); try { if( page != null ) { diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/ParentPageNameTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParentPageNameTag.java index 44cd9d8..4785005 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/ParentPageNameTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParentPageNameTag.java @@ -18,9 +18,9 @@ */ package org.apache.wiki.tags; -import org.apache.wiki.WikiPage; +import org.apache.wiki.api.core.Attachment; import org.apache.wiki.api.core.Engine; -import org.apache.wiki.attachment.Attachment; +import org.apache.wiki.api.core.Page; import org.apache.wiki.render.RenderingManager; import java.io.IOException; @@ -40,7 +40,7 @@ public class ParentPageNameTag extends WikiTagBase { @Override public final int doWikiStartTag() throws IOException { final Engine engine = m_wikiContext.getEngine(); - final WikiPage page = m_wikiContext.getPage(); + final Page page = m_wikiContext.getPage(); if( page != null ) { if( page instanceof Attachment ) { 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 afe602b..53fe884 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 @@ -22,8 +22,8 @@ import com.vladsch.flexmark.util.ast.Node; 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.api.core.ContextEnum; import org.apache.wiki.attachment.AttachmentManager; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; @@ -66,7 +66,7 @@ public class LocalLinkAttributeProviderState implements NodeAttributeProviderSta if( attachment != null ) { if( !linkOperations.isImageLink( link.getUrl().toString(), isImageInlining, inlineImagePatterns ) ) { attributes.replaceValue( "class", MarkupParser.CLASS_ATTACHMENT ); - final String attlink = wikiContext.getURL( WikiContext.ATTACH, link.getWikiLink() ); + final String attlink = wikiContext.getURL( ContextEnum.PAGE_ATTACH.getRequestContext(), link.getWikiLink() ); attributes.replaceValue( "href", attlink ); } else { new ImageLinkAttributeProviderState( wikiContext, attachment, hasRef ).setAttributes( attributes, link ); diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/NodePostProcessorStateCommonOperations.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/NodePostProcessorStateCommonOperations.java index efdb15c..a8a3478 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/NodePostProcessorStateCommonOperations.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/NodePostProcessorStateCommonOperations.java @@ -22,8 +22,8 @@ import com.vladsch.flexmark.ast.HtmlInline; 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.api.core.ContextEnum; import org.apache.wiki.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.MarkupParser; @@ -51,7 +51,7 @@ class NodePostProcessorStateCommonOperations { final boolean wysiwygEditorMode = wysiwygVariable != null && wysiwygVariable; if( useOutlinkImage && !wysiwygEditorMode ) { - final String m_outlinkImageURL = wikiContext.getURL( WikiContext.NONE, MarkupParser.OUTLINK_IMAGE ); + final String m_outlinkImageURL = wikiContext.getURL( ContextEnum.PAGE_NONE.getRequestContext(), MarkupParser.OUTLINK_IMAGE ); final HtmlInline img = new HtmlInline( CharSubSequence.of( "<img class=\""+ MarkupParser.OUTLINK + "\" " + "alt=\"\" src=\""+ m_outlinkImageURL + "\" />" ) ); node.insertAfter( img );
