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 69ee8896aa535ab7b03bbc4dd40bb8766e0876a0 Author: juanpablo <[email protected]> AuthorDate: Wed Mar 11 18:59:20 2020 +0100 adapt to ParserStagePlugin signature --- .../java/org/apache/wiki/parser/PluginContent.java | 15 ++++++++------- .../java/org/apache/wiki/plugin/WeblogPlugin.java | 7 +++++-- .../java/org/apache/wiki/plugin/SamplePlugin.java | 22 ++++++++++++---------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/PluginContent.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/PluginContent.java index cf81189..65e330a 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/parser/PluginContent.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/PluginContent.java @@ -24,6 +24,7 @@ import org.apache.oro.text.regex.PatternMatcher; import org.apache.oro.text.regex.Perl5Matcher; import org.apache.wiki.InternalWikiException; import org.apache.wiki.WikiContext; +import org.apache.wiki.api.core.Context; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.exceptions.PluginException; import org.apache.wiki.api.plugin.ParserStagePlugin; @@ -128,7 +129,7 @@ public class PluginContent extends Text implements PluginElement { /**{@inheritDoc}*/ @Override - public String invoke( final WikiContext context ) { + public String invoke( final Context context ) { String result; final Boolean wysiwygVariable = ( Boolean )context.getVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE ); boolean wysiwygEditorMode = false; @@ -161,18 +162,18 @@ public class PluginContent extends Text implements PluginElement { // Parse any variable instances from the string for( final Map.Entry< String, String > e : m_params.entrySet() ) { String val = e.getValue(); - val = engine.getManager( VariableManager.class).expandVariables( context, val ); + val = engine.getManager( VariableManager.class).expandVariables( ( WikiContext )context, val ); parsedParams.put( e.getKey(), val ); } final PluginManager pm = engine.getManager( PluginManager.class ); - result = pm.execute( context, m_pluginName, parsedParams ); + result = pm.execute( ( WikiContext )context, m_pluginName, parsedParams ); } } catch( final Exception e ) { if( wysiwygEditorMode ) { result = ""; } else { // log.info("Failed to execute plugin",e); - final ResourceBundle rb = Preferences.getBundle( context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE ); + final ResourceBundle rb = Preferences.getBundle( ( WikiContext )context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE ); result = MarkupParser.makeError( MessageFormat.format( rb.getString( "plugin.error.insertionfailed" ), context.getRealPage().getWiki(), context.getRealPage().getName(), @@ -185,10 +186,10 @@ public class PluginContent extends Text implements PluginElement { /**{@inheritDoc}*/ @Override - public void executeParse( final WikiContext context ) throws PluginException { + public void executeParse( final Context context ) throws PluginException { final PluginManager pm = context.getEngine().getManager( PluginManager.class ); if( pm.pluginsEnabled() ) { - final ResourceBundle rb = Preferences.getBundle(context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE); + final ResourceBundle rb = Preferences.getBundle( ( WikiContext )context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE); final Map< String, String > params = getParameters(); final WikiPlugin plugin = pm.newWikiPlugin( getPluginName(), rb ); try { @@ -211,7 +212,7 @@ public class PluginContent extends Text implements PluginElement { * @throws PluginException If plugin invocation is faulty * @since 2.10.0 */ - public static PluginContent parsePluginLine( final WikiContext context, final String commandline, final int pos ) throws PluginException { + public static PluginContent parsePluginLine( final Context context, final String commandline, final int pos ) throws PluginException { final PatternMatcher matcher = new Perl5Matcher(); try { diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java index 0127e48..06a514b 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java @@ -22,6 +22,7 @@ import org.apache.log4j.Logger; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiPage; import org.apache.wiki.WikiProvider; +import org.apache.wiki.api.core.Context; import org.apache.wiki.api.core.Engine; import org.apache.wiki.api.exceptions.PluginException; import org.apache.wiki.api.exceptions.ProviderException; @@ -157,7 +158,8 @@ public class WeblogPlugin implements WikiPlugin, ParserStagePlugin { /** * {@inheritDoc} */ - @Override public String execute( final WikiContext context, final Map< String, String > params ) throws PluginException { + @Override + public String execute( final WikiContext context, final Map< String, String > params ) throws PluginException { final Calendar startTime; final Calendar stopTime; int numDays = DEFAULT_DAYS; @@ -442,7 +444,8 @@ public class WeblogPlugin implements WikiPlugin, ParserStagePlugin { * * {@inheritDoc} */ - @Override public void executeParser( final PluginElement element, final WikiContext context, final Map< String, String > params ) { + @Override + public void executeParser( final PluginElement element, final Context context, final Map< String, String > params ) { context.getPage().setAttribute( ATTR_ISWEBLOG, "true" ); } diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin.java index d68a896..50663fb 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin.java @@ -19,7 +19,7 @@ package org.apache.wiki.plugin; import org.apache.wiki.WikiContext; -import org.apache.wiki.api.exceptions.PluginException; +import org.apache.wiki.api.core.Context; import org.apache.wiki.api.plugin.ParserStagePlugin; import org.apache.wiki.api.plugin.PluginElement; import org.apache.wiki.api.plugin.WikiPlugin; @@ -31,31 +31,33 @@ import java.util.Map; * <P> * Parameters: text - text to return. * Any _body content gets appended between brackets. - * */ public class SamplePlugin implements WikiPlugin, ParserStagePlugin { protected static boolean c_rendered = false; - public String execute( WikiContext context, Map< String, String > params ) throws PluginException { - StringBuilder sb = new StringBuilder(); - - String text = params.get("text"); + @Override + public String execute( final WikiContext context, final Map< String, String > params ) { + final StringBuilder sb = new StringBuilder(); + final String text = params.get("text"); if( text != null ) { sb.append( text ); } - String body = params.get("_body"); + final String body = params.get("_body"); if( body != null ) { - sb.append( " ("+body.replace('\n','+')+")" ); + sb.append( " (" ).append( body.replace( '\n', '+' ) ).append( ")" ); } return sb.toString(); } - public void executeParser( PluginElement element, WikiContext context, Map< String, String > params) { - if( element.getParameter("render") != null ) c_rendered = true; + @Override + public void executeParser( final PluginElement element, final Context context, final Map< String, String > params) { + if( element.getParameter("render") != null ) { + c_rendered = true; + } } }
