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 34f6a71f53b620ebcb01aac1eacaa820a713df74 Author: juanpablo <[email protected]> AuthorDate: Sun Mar 15 13:52:29 2020 +0100 WikiContext#getVariable( String ) returns typed object instead of plain Object --- .../src/main/java/org/apache/wiki/WikiContext.java | 4 +- .../java/org/apache/wiki/filters/SpamFilter.java | 4 +- .../apache/wiki/htmltowiki/XHtmlToWikiConfig.java | 151 +++++++++------------ .../org/apache/wiki/parser/VariableContent.java | 2 +- .../main/java/org/apache/wiki/plugin/Counter.java | 2 +- .../java/org/apache/wiki/ui/TemplateManager.java | 22 ++- .../ImageLinkAttributeProviderState.java | 8 +- .../InterWikiLinkAttributeProviderState.java | 7 +- .../WysiwygEditingAttributeProviderState.java | 7 +- .../AccessRuleLinkNodePostProcessorState.java | 9 +- .../ImageLinkNodePostProcessorState.java | 4 +- .../InterWikiLinkNodePostProcessorState.java | 7 +- .../MetadataLinkNodePostProcessorState.java | 7 +- .../NodePostProcessorStateCommonOperations.java | 4 +- .../PluginLinkNodePostProcessorState.java | 7 +- .../VariableLinkNodePostProcessorState.java | 7 +- 16 files changed, 106 insertions(+), 146 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java index 717b9d3..bde31c9 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java @@ -452,9 +452,9 @@ public class WikiContext implements Context, Command { */ @Override public boolean getBooleanWikiProperty( final String key, final boolean defValue ) { - final Object bool = getVariable( key ); + final String bool = getVariable( key ); if( bool != null ) { - return TextUtil.isPositive( (String) bool ); + return TextUtil.isPositive( bool ); } return TextUtil.getBooleanProperty( getEngine().getWikiProperties(), key, defValue ); diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java index f6e3894..c19d285 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java @@ -317,7 +317,7 @@ public class SpamFilter extends BasePageFilter { } if( !m_stopAtFirstMatch ) { - final Integer score = ( Integer )context.getVariable( ATTR_SPAMFILTER_SCORE ); + final Integer score = context.getVariable( ATTR_SPAMFILTER_SCORE ); if( score != null && score.intValue() >= m_scoreLimit ) { throw new RedirectException( "Herb says you got too many points", getRedirectPage( context ) ); @@ -350,7 +350,7 @@ public class SpamFilter extends BasePageFilter { throw new RedirectException( message, getRedirectPage( context ) ); } - Integer score = ( Integer )context.getVariable( ATTR_SPAMFILTER_SCORE ); + Integer score = context.getVariable( ATTR_SPAMFILTER_SCORE ); if( score != null ) { score = score + 1; } else { diff --git a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java index 21ff64f..9a84af8 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.java @@ -19,184 +19,155 @@ package org.apache.wiki.htmltowiki; import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; + /** - * Defines a Wiki configuration to XHtmlToWikiTranslator, including things like - * URLs. - * + * Defines a Wiki configuration to XHtmlToWikiTranslator, including things like URLs. */ -public class XHtmlToWikiConfig -{ - private String m_outlink = "outlink"; +public class XHtmlToWikiConfig { + private String m_outlink = "outlink"; private String m_pageInfoJsp = "PageInfo.jsp"; - private String m_wikiJspPage = "Wiki.jsp?page="; - private String m_editJspPage = "Edit.jsp?page="; - private String m_attachPage = "attach?page="; - private String m_pageName; /** * Creates a new, empty config object. */ - public XHtmlToWikiConfig() - {} + public XHtmlToWikiConfig() { + } /** - * The constructor initializes the different internal fields - * according to the current URLConstructor. + * The constructor initializes the different internal fields according to the current URLConstructor. * * @param wikiContext A WikiContext */ - public XHtmlToWikiConfig( WikiContext wikiContext ) - { + public XHtmlToWikiConfig( final Context wikiContext ) { setWikiContext( wikiContext ); - // // Figure out the actual URLs. - // - // NB: The logic here will fail if you add something else after - // the Wiki page name in VIEW or ATTACH - // - + // NB: The logic here will fail if you add something else after the Wiki page name in VIEW or ATTACH m_wikiJspPage = wikiContext.getURL( WikiContext.VIEW, "" ); - m_editJspPage = wikiContext.getURL( WikiContext.EDIT, "" ); - m_attachPage = wikiContext.getURL( WikiContext.ATTACH, "" ); - m_pageInfoJsp = wikiContext.getURL( WikiContext.INFO, "" ); } - private void setWikiContext( WikiContext wikiContext ) - { - if( wikiContext.getPage() != null ) - { + private void setWikiContext( final Context wikiContext ) { + if( wikiContext.getPage() != null ) { setPageName( wikiContext.getPage().getName() + '/' ); } } /** - * Return the URL for the attachments. - * - * @return URL for attachments. + * Return the URL for the attachments. + * + * @return URL for attachments. */ - public String getAttachPage() - { + public String getAttachPage() { return m_attachPage; } /** - * Set the URL for attachments. - * - * @param attachPage The attachment URL. + * Set the URL for attachments. + * + * @param attachPage The attachment URL. */ - public void setAttachPage( String attachPage ) - { + public void setAttachPage( final String attachPage ) { m_attachPage = attachPage; } /** - * Gets the URL of the outlink image. - * - * @return The URL of the outlink image. + * Gets the URL of the outlink image. + * + * @return The URL of the outlink image. */ - public String getOutlink() - { + public String getOutlink() { return m_outlink; } /** - * Set the outlink URL. - * - * @param outlink The outlink URL. + * Set the outlink URL. + * + * @param outlink The outlink URL. */ - public void setOutlink( String outlink ) - { + public void setOutlink( final String outlink ) { m_outlink = outlink; } /** - * Get the PageInfo.jsp URI. - * - * @return The URI for the page info display. + * Get the PageInfo.jsp URI. + * + * @return The URI for the page info display. */ - public String getPageInfoJsp() - { + public String getPageInfoJsp() { return m_pageInfoJsp; } /** - * Set the URI for the page info display. - * - * @param pageInfoJsp URI for the page info. + * Set the URI for the page info display. + * + * @param pageInfoJsp URI for the page info. */ - public void setPageInfoJsp( String pageInfoJsp ) - { + public void setPageInfoJsp( final String pageInfoJsp ) { m_pageInfoJsp = pageInfoJsp; } /** - * Get the page name. - * - * @return The Page Name. + * Get the page name. + * + * @return The Page Name. */ - public String getPageName() - { + public String getPageName() { return m_pageName; } - /** - * Set the page name. - * - * @param pageName The name of the page. + * Set the page name. + * + * @param pageName The name of the page. */ - public void setPageName( String pageName ) - { + public void setPageName( final String pageName ) { m_pageName = pageName; } /** - * Get the URI to the Wiki.jsp view. - * - * @return The URI to the Wiki.jsp. + * Get the URI to the Wiki.jsp view. + * + * @return The URI to the Wiki.jsp. */ - public String getWikiJspPage() - { + public String getWikiJspPage() { return m_wikiJspPage; } /** - * Set the URI to the Wiki.jsp. - * - * @param wikiJspPage The URI to the Wiki.jsp. + * Set the URI to the Wiki.jsp. + * + * @param wikiJspPage The URI to the Wiki.jsp. */ - public void setWikiJspPage( String wikiJspPage ) - { + public void setWikiJspPage( final String wikiJspPage ) { m_wikiJspPage = wikiJspPage; } /** - * Return the URI to the Edit.jsp page. - * - * @return The URI to the Edit.jsp page. + * Return the URI to the Edit.jsp page. + * + * @return The URI to the Edit.jsp page. */ - public String getEditJspPage() - { + public String getEditJspPage() { return m_editJspPage; } /** - * Set the URI to the Edit.jsp page. - * - * @param editJspPage The Edit.jsp URI. + * Set the URI to the Edit.jsp page. + * + * @param editJspPage The Edit.jsp URI. */ - public void setEditJspPage( String editJspPage ) - { + public void setEditJspPage( final String editJspPage ) { m_editJspPage = editJspPage; } + } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/VariableContent.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/VariableContent.java index 445443d..5899575 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/parser/VariableContent.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/VariableContent.java @@ -68,7 +68,7 @@ public class VariableContent extends Text { return "No WikiContext available: INTERNAL ERROR"; } - final Boolean wysiwygEditorMode = context.getVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE ); + final Boolean wysiwygEditorMode = context.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); if( wysiwygEditorMode != null && wysiwygEditorMode ) { result = "[" + m_varName + "]"; } else { diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Counter.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Counter.java index 331af6c..ca658a7 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Counter.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Counter.java @@ -69,7 +69,7 @@ public class Counter implements Plugin { } // Fetch the old value - Integer val = (Integer)context.getVariable( countername ); + Integer val = context.getVariable( countername ); if( val == null ) { val = 0; } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java index 34d240b..bd8a5d6 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java @@ -19,7 +19,6 @@ package org.apache.wiki.ui; import org.apache.log4j.Logger; -import org.apache.wiki.WikiContext; import org.apache.wiki.api.core.Context; import org.apache.wiki.i18n.InternationalizationManager; import org.apache.wiki.modules.ModuleManager; @@ -257,7 +256,7 @@ public interface TemplateManager extends ModuleManager { * @param type the marker * @return the generated marker comment */ - static String getMarker( final WikiContext context, final String type ) { + static String getMarker( final Context context, final String type ) { if( type.equals( RESOURCE_JSLOCALIZEDSTRINGS ) ) { return getJSLocalizedStrings( context ); } else if( type.equals( RESOURCE_JSFUNCTION ) ) { @@ -269,11 +268,11 @@ public interface TemplateManager extends ModuleManager { /** * Extract all i18n strings in the javascript domain. (javascript.*) Returns a javascript snippet which defines the LocalizedStings array. * - * @param context the {@link WikiContext} + * @param context the {@link Context} * @return Javascript snippet which defines the LocalizedStrings array * @since 2.5.108 */ - static String getJSLocalizedStrings( final WikiContext context ) { + static String getJSLocalizedStrings( final Context context ) { final StringBuilder sb = new StringBuilder(); sb.append( "var LocalizedStrings = {\n"); final ResourceBundle rb = Preferences.getBundle( context, InternationalizationManager.DEF_TEMPLATE ); @@ -315,9 +314,8 @@ public interface TemplateManager extends ModuleManager { * @param type What kind of a request should be added? * @param resource The resource to add. */ - @SuppressWarnings("unchecked") - static void addResourceRequest( final WikiContext ctx, final String type, final String resource ) { - HashMap< String, Vector< String > > resourcemap = ( HashMap< String, Vector< String > > ) ctx.getVariable( RESOURCE_INCLUDES ); + static void addResourceRequest( final Context ctx, final String type, final String resource ) { + HashMap< String, Vector< String > > resourcemap = ctx.getVariable( RESOURCE_INCLUDES ); if( resourcemap == null ) { resourcemap = new HashMap<>(); } @@ -361,9 +359,8 @@ public interface TemplateManager extends ModuleManager { * @param type The resource request type * @return a String array for the resource requests */ - @SuppressWarnings("unchecked") - static String[] getResourceRequests( final WikiContext ctx, final String type ) { - final HashMap< String, Vector< String > > hm = ( HashMap< String, Vector< String > > ) ctx.getVariable( RESOURCE_INCLUDES ); + static String[] getResourceRequests( final Context ctx, final String type ) { + final HashMap< String, Vector< String > > hm = ctx.getVariable( RESOURCE_INCLUDES ); if( hm == null ) { return new String[0]; } @@ -383,11 +380,10 @@ public interface TemplateManager extends ModuleManager { * @param ctx the wiki context * @return the array of types requested */ - @SuppressWarnings("unchecked") - static String[] getResourceTypes( final WikiContext ctx ) { + static String[] getResourceTypes( final Context ctx ) { String[] res = new String[0]; if( ctx != null ) { - final HashMap< String, String > hm = ( HashMap< String, String > ) ctx.getVariable( RESOURCE_INCLUDES ); + final HashMap< String, String > hm = ctx.getVariable( RESOURCE_INCLUDES ); if( hm != null ) { final Set< String > keys = hm.keySet(); res = keys.toArray( res ); diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java index 7d53bf7..20d87ba 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.java @@ -19,13 +19,13 @@ 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.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; import org.apache.wiki.parser.MarkupParser; -import com.vladsch.flexmark.util.html.Attributes; - /** * {@link NodeAttributeProviderState} which sets the attributes for image links. @@ -34,10 +34,10 @@ public class ImageLinkAttributeProviderState implements NodeAttributeProviderSta private final boolean isLinkFromText; private final LinkParsingOperations linkOperations; - private final WikiContext wikiContext; + private final Context wikiContext; private final String urlRef; - public ImageLinkAttributeProviderState( final WikiContext wikiContext, final String urlRef, final boolean isLinkFromText ) { + public ImageLinkAttributeProviderState( final Context wikiContext, final String urlRef, final boolean isLinkFromText ) { this.isLinkFromText = isLinkFromText; this.urlRef = urlRef; this.wikiContext = wikiContext; diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java index fdd72f1..3c22303 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.java @@ -22,7 +22,6 @@ import com.vladsch.flexmark.ast.Link; 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; @@ -39,12 +38,12 @@ public class InterWikiLinkAttributeProviderState implements NodeAttributeProvide private final boolean hasRef; private final boolean m_wysiwygEditorMode; - private final WikiContext wikiContext; + private final Context wikiContext; private final LinkParsingOperations linkOperations; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; - public InterWikiLinkAttributeProviderState( final WikiContext wikiContext, + public InterWikiLinkAttributeProviderState( final Context wikiContext, final boolean hasRef, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { @@ -53,7 +52,7 @@ public class InterWikiLinkAttributeProviderState implements NodeAttributeProvide this.linkOperations = new LinkParsingOperations( wikiContext ); this.isImageInlining = isImageInlining; this.inlineImagePatterns = inlineImagePatterns; - final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); + final Boolean wysiwygVariable = wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); m_wysiwygEditorMode = wysiwygVariable != null ? wysiwygVariable : false; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java index d465bbe..a2a0dff 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.java @@ -20,7 +20,6 @@ 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.htmltowiki.XHtmlToWikiConfig; import org.apache.wiki.markdown.nodes.JSPWikiLink; @@ -33,12 +32,12 @@ import org.apache.wiki.render.WikiRenderer; */ public class WysiwygEditingAttributeProviderState implements NodeAttributeProviderState< JSPWikiLink > { - private final WikiContext wikiContext; + private final Context wikiContext; private final boolean m_wysiwygEditorMode; - public WysiwygEditingAttributeProviderState( final WikiContext wikiContext ) { + public WysiwygEditingAttributeProviderState( final Context wikiContext ) { this.wikiContext = wikiContext; - final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); + final Boolean wysiwygVariable = wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); m_wysiwygEditorMode = wysiwygVariable != null ? wysiwygVariable : false; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/AccessRuleLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/AccessRuleLinkNodePostProcessorState.java index 2d312a3..3ee509e 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/AccessRuleLinkNodePostProcessorState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/AccessRuleLinkNodePostProcessorState.java @@ -21,7 +21,6 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.postprocessor; import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.NodeTracker; import org.apache.log4j.Logger; -import org.apache.wiki.WikiContext; import org.apache.wiki.WikiPage; import org.apache.wiki.api.core.Context; import org.apache.wiki.auth.WikiSecurityException; @@ -37,12 +36,12 @@ import org.apache.wiki.render.RenderingManager; public class AccessRuleLinkNodePostProcessorState implements NodePostProcessorState< JSPWikiLink > { private static final Logger LOG = Logger.getLogger( AccessRuleLinkNodePostProcessorState.class ); - private final WikiContext wikiContext; + private final Context wikiContext; private final boolean m_wysiwygEditorMode; - public AccessRuleLinkNodePostProcessorState( final WikiContext wikiContext ) { + public AccessRuleLinkNodePostProcessorState( final Context wikiContext ) { this.wikiContext = wikiContext; - final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); + final Boolean wysiwygVariable = wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); m_wysiwygEditorMode = wysiwygVariable != null ? wysiwygVariable : false; } @@ -55,7 +54,7 @@ public class AccessRuleLinkNodePostProcessorState implements NodePostProcessorSt public void process( final NodeTracker state, final JSPWikiLink link ) { String ruleLine = NodePostProcessorStateCommonOperations.inlineLinkTextOnWysiwyg( state, link, m_wysiwygEditorMode ); if( wikiContext.getEngine().getManager( RenderingManager.class ).getParser( wikiContext, link.getUrl().toString() ).isParseAccessRules() ) { - final WikiPage page = wikiContext.getRealPage(); + final WikiPage page = ( WikiPage )wikiContext.getRealPage(); if( ruleLine.startsWith( "{" ) ) { ruleLine = ruleLine.substring( 1 ); } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/ImageLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/ImageLinkNodePostProcessorState.java index 11d8d16..705f0a1 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/ImageLinkNodePostProcessorState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/ImageLinkNodePostProcessorState.java @@ -22,7 +22,7 @@ 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.markdown.nodes.JSPWikiLink; import org.apache.wiki.parser.LinkParsingOperations; @@ -36,7 +36,7 @@ public class ImageLinkNodePostProcessorState implements NodePostProcessorState< private final String urlRef; private final LinkParsingOperations linkOperations; - public ImageLinkNodePostProcessorState( final WikiContext wikiContext, final String urlRef, final boolean isLinkFromText ) { + public ImageLinkNodePostProcessorState( final Context wikiContext, final String urlRef, final boolean isLinkFromText ) { this.isLinkFromText = isLinkFromText; this.urlRef = urlRef; this.linkOperations = new LinkParsingOperations( wikiContext ); diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/InterWikiLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/InterWikiLinkNodePostProcessorState.java index db6d9f1..c478d45 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/InterWikiLinkNodePostProcessorState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/InterWikiLinkNodePostProcessorState.java @@ -24,7 +24,6 @@ import com.vladsch.flexmark.util.ast.NodeTracker; import com.vladsch.flexmark.util.sequence.CharSubSequence; import org.apache.log4j.Logger; import org.apache.oro.text.regex.Pattern; -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; @@ -44,7 +43,7 @@ import java.util.ResourceBundle; public class InterWikiLinkNodePostProcessorState implements NodePostProcessorState< JSPWikiLink > { private static final Logger LOG = Logger.getLogger( InterWikiLinkNodePostProcessorState.class ); - private final WikiContext wikiContext; + private final Context wikiContext; private final LinkParsingOperations linkOperations; private final boolean isImageInlining; private final List< Pattern > inlineImagePatterns; @@ -52,7 +51,7 @@ public class InterWikiLinkNodePostProcessorState implements NodePostProcessorSta private final boolean m_wysiwygEditorMode; private boolean m_useOutlinkImage = true; - public InterWikiLinkNodePostProcessorState( final WikiContext wikiContext, + public InterWikiLinkNodePostProcessorState( final Context wikiContext, final Document document, final boolean isImageInlining, final List< Pattern > inlineImagePatterns ) { @@ -62,7 +61,7 @@ public class InterWikiLinkNodePostProcessorState implements NodePostProcessorSta this.inlineImagePatterns = inlineImagePatterns; this.document = document; this.m_useOutlinkImage = wikiContext.getBooleanWikiProperty( MarkupParser.PROP_USEOUTLINKIMAGE, m_useOutlinkImage ); - final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); + final Boolean wysiwygVariable = wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); m_wysiwygEditorMode = wysiwygVariable != null ? wysiwygVariable : false; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/MetadataLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/MetadataLinkNodePostProcessorState.java index c55f407..ee955ed 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/MetadataLinkNodePostProcessorState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/MetadataLinkNodePostProcessorState.java @@ -21,7 +21,6 @@ package org.apache.wiki.markdown.extensions.jspwikilinks.postprocessor; import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.NodeTracker; import org.apache.log4j.Logger; -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; @@ -38,12 +37,12 @@ import java.util.ResourceBundle; public class MetadataLinkNodePostProcessorState implements NodePostProcessorState< JSPWikiLink > { private static final Logger LOG = Logger.getLogger( MetadataLinkNodePostProcessorState.class ); - private final WikiContext wikiContext; + private final Context wikiContext; private final boolean m_wysiwygEditorMode; - public MetadataLinkNodePostProcessorState( final WikiContext wikiContext ) { + public MetadataLinkNodePostProcessorState( final Context wikiContext ) { this.wikiContext = wikiContext; - final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); + final Boolean wysiwygVariable = wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); m_wysiwygEditorMode = wysiwygVariable != null ? wysiwygVariable : false; } 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 87aeef0..efdb15c 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 @@ -46,8 +46,8 @@ class NodePostProcessorStateCommonOperations { } } - static void addOutlinkImage( final NodeTracker state, final Node node, final WikiContext wikiContext, final boolean useOutlinkImage ) { - final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); + static void addOutlinkImage( final NodeTracker state, final Node node, final Context wikiContext, final boolean useOutlinkImage ) { + final Boolean wysiwygVariable = wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); final boolean wysiwygEditorMode = wysiwygVariable != null && wysiwygVariable; if( useOutlinkImage && !wysiwygEditorMode ) { diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/PluginLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/PluginLinkNodePostProcessorState.java index 0451758..a5e428a 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/PluginLinkNodePostProcessorState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/PluginLinkNodePostProcessorState.java @@ -24,7 +24,6 @@ import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.NodeTracker; import com.vladsch.flexmark.util.sequence.CharSubSequence; import org.apache.log4j.Logger; -import org.apache.wiki.WikiContext; import org.apache.wiki.api.core.Context; import org.apache.wiki.api.exceptions.PluginException; import org.apache.wiki.api.plugin.Plugin; @@ -42,12 +41,12 @@ import java.util.ResourceBundle; public class PluginLinkNodePostProcessorState implements NodePostProcessorState< JSPWikiLink > { private static final Logger LOG = Logger.getLogger( PluginLinkNodePostProcessorState.class ); - private final WikiContext wikiContext; + private final Context wikiContext; private final boolean m_wysiwygEditorMode; - public PluginLinkNodePostProcessorState( final WikiContext wikiContext ) { + public PluginLinkNodePostProcessorState( final Context wikiContext ) { this.wikiContext = wikiContext; - final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); + final Boolean wysiwygVariable = wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); m_wysiwygEditorMode = wysiwygVariable != null ? wysiwygVariable : false; } diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/VariableLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/VariableLinkNodePostProcessorState.java index d9029b9..491716c 100755 --- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/VariableLinkNodePostProcessorState.java +++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/VariableLinkNodePostProcessorState.java @@ -23,7 +23,6 @@ import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.ast.NodeTracker; import com.vladsch.flexmark.util.sequence.CharSubSequence; import org.apache.commons.text.StringEscapeUtils; -import org.apache.wiki.WikiContext; import org.apache.wiki.api.core.Context; import org.apache.wiki.api.exceptions.NoSuchVariableException; import org.apache.wiki.markdown.nodes.JSPWikiLink; @@ -35,12 +34,12 @@ import org.apache.wiki.variables.VariableManager; */ public class VariableLinkNodePostProcessorState implements NodePostProcessorState< JSPWikiLink > { - private final WikiContext wikiContext; + private final Context wikiContext; private final boolean m_wysiwygEditorMode; - public VariableLinkNodePostProcessorState( final WikiContext wikiContext ) { + public VariableLinkNodePostProcessorState( final Context wikiContext ) { this.wikiContext = wikiContext; - final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); + final Boolean wysiwygVariable = wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE ); m_wysiwygEditorMode = wysiwygVariable != null && wysiwygVariable; }
