You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/03/16 21:58:17 UTC
[jspwiki] 27/47: JSPWIKI-303: use constant from Plugin instead of
from WikiPlugin
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 a62b3e55402bca07dc05a825b0593603d2b2abaf
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Mar 15 13:18:13 2020 +0100
JSPWIKI-303: use constant from Plugin instead of from WikiPlugin
---
.../main/java/org/apache/wiki/forms/FormClose.java | 4 +-
.../main/java/org/apache/wiki/forms/FormInput.java | 4 +-
.../main/java/org/apache/wiki/forms/FormOpen.java | 4 +-
.../java/org/apache/wiki/forms/FormOutput.java | 4 +-
.../java/org/apache/wiki/forms/FormSelect.java | 4 +-
.../java/org/apache/wiki/forms/FormTextarea.java | 4 +-
.../apache/wiki/plugin/AbstractReferralPlugin.java | 3 +-
.../org/apache/wiki/plugin/BugReportHandler.java | 3 +-
.../org/apache/wiki/plugin/CurrentTimePlugin.java | 4 +-
.../apache/wiki/plugin/DefaultPluginManager.java | 26 ++++++-------
.../java/org/apache/wiki/plugin/InsertPage.java | 3 +-
.../org/apache/wiki/plugin/ListLocksPlugin.java | 3 +-
.../java/org/apache/wiki/plugin/PluginManager.java | 10 ++---
.../apache/wiki/plugin/ReferringPagesPlugin.java | 6 +--
.../wiki/plugin/ReferringUndefinedPagesPlugin.java | 43 ++++++++++------------
.../org/apache/wiki/plugin/TableOfContents.java | 3 +-
.../org/apache/wiki/plugin/WeblogEntryPlugin.java | 3 +-
.../java/org/apache/wiki/plugin/WeblogPlugin.java | 3 +-
.../InterWikiLinkAttributeProviderState.java | 3 +-
.../WysiwygEditingAttributeProviderState.java | 3 +-
.../AccessRuleLinkNodePostProcessorState.java | 3 +-
.../InterWikiLinkNodePostProcessorState.java | 3 +-
.../MetadataLinkNodePostProcessorState.java | 3 +-
.../NodePostProcessorStateCommonOperations.java | 3 +-
.../PluginLinkNodePostProcessorState.java | 9 +++--
.../VariableLinkNodePostProcessorState.java | 3 +-
26 files changed, 79 insertions(+), 85 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormClose.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormClose.java
index 7c80963..8d9f542 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormClose.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormClose.java
@@ -20,7 +20,7 @@ package org.apache.wiki.forms;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.preferences.Preferences;
import java.util.Map;
@@ -43,7 +43,7 @@ public class FormClose extends FormElement {
// Don't render if no error and error-only-rendering is on.
final FormInfo info = getFormInfo( ctx );
if( info != null && info.hide() ) {
- final ResourceBundle rb = Preferences.getBundle( ctx, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( ctx, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
return "<p>" + rb.getString( "formclose.noneedtoshow" ) + "</p>";
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormInput.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormInput.java
index f324504..ba7d4d1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormInput.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormInput.java
@@ -21,7 +21,7 @@ package org.apache.wiki.forms;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.TextUtil;
import org.apache.wiki.util.XHTML;
@@ -57,7 +57,7 @@ public class FormInput extends FormElement {
final String inputType = params.get( PARAM_TYPE );
final String size = params.get( PARAM_SIZE );
final String checked = params.get( PARAM_CHECKED );
- final ResourceBundle rb = Preferences.getBundle( ctx, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( ctx, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
if ( inputName == null ) {
throw new PluginException( rb.getString( "forminput.namemissing" ) );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOpen.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOpen.java
index fdaba9f..7ee9368 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOpen.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOpen.java
@@ -22,7 +22,7 @@ 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.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.preferences.Preferences;
import java.text.MessageFormat;
@@ -77,7 +77,7 @@ public class FormOpen extends FormElement {
*/
@Override
public String execute( final Context ctx, final Map< String, String > params ) throws PluginException {
- final ResourceBundle rb = Preferences.getBundle( ctx, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( ctx, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
final String formName = params.get( PARAM_FORM );
if( formName == null ) {
throw new PluginException( MessageFormat.format( rb.getString( "formopen.missingparam" ), PARAM_FORM ) );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java
index fffb2ce..968b1e1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java
@@ -22,7 +22,7 @@ package org.apache.wiki.forms;
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.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.plugin.DefaultPluginManager;
import org.apache.wiki.plugin.PluginManager;
import org.apache.wiki.preferences.Preferences;
@@ -60,7 +60,7 @@ public class FormOutput extends FormElement {
if( ctx.getHttpRequest() == null ) {
return "";
}
- final ResourceBundle rb = Preferences.getBundle( ctx, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( ctx, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
// If we are NOT here due to this form being submitted, we do nothing.
// The submitted form MUST have parameter 'formname' equal to the name
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormSelect.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormSelect.java
index 08d8f52..ab1ee5e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormSelect.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormSelect.java
@@ -21,7 +21,7 @@ package org.apache.wiki.forms;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.XHTML;
import org.apache.wiki.util.XhtmlUtil;
@@ -43,7 +43,7 @@ public class FormSelect extends FormElement {
public String execute( final Context ctx, final Map< String, String > params ) throws PluginException {
// Don't render if no error and error-only-rendering is on.
final FormInfo info = getFormInfo( ctx );
- final ResourceBundle rb = Preferences.getBundle( ctx, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( ctx, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
Map< String, String > previousValues = null;
if( info != null ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormTextarea.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormTextarea.java
index ac48afb..c091eac 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormTextarea.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormTextarea.java
@@ -21,7 +21,7 @@ package org.apache.wiki.forms;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.util.XHTML;
import org.apache.wiki.util.XhtmlUtil;
@@ -51,7 +51,7 @@ public class FormTextarea extends FormElement {
// Don't render if no error and error-only-rendering is on.
final FormInfo info = getFormInfo( ctx );
Map< String, String > previousValues = null;
- final ResourceBundle rb = Preferences.getBundle( ctx, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( ctx, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
if ( info != null ) {
if ( info.hide() ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
index b26878b..9532848 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
@@ -27,7 +27,6 @@ import org.apache.oro.text.regex.PatternCompiler;
import org.apache.oro.text.regex.PatternMatcher;
import org.apache.oro.text.regex.Perl5Matcher;
import org.apache.wiki.StringTransmutator;
-import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
@@ -443,7 +442,7 @@ public abstract class AbstractReferralPlugin implements Plugin {
}
@Override
- public String mutate( final WikiContext context, final String text ) {
+ public String mutate( final Context context, final String text ) {
if( text.length() > m_length ) {
return text.substring( 0, m_length ) + "...";
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
index 3e63964..5e8852c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
@@ -26,7 +26,6 @@ import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.exceptions.RedirectException;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.api.plugin.Plugin;
-import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.preferences.Preferences;
@@ -81,7 +80,7 @@ public class BugReportHandler implements Plugin {
String version = params.get( PARAM_VERSION );
String submitter = null;
final SimpleDateFormat format = new SimpleDateFormat( DEFAULT_DATEFORMAT );
- final ResourceBundle rb = Preferences.getBundle( context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
final Principal wup = context.getCurrentUser();
if( wup != null ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/CurrentTimePlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/CurrentTimePlugin.java
index 5c54a44..1f8b31c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/CurrentTimePlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/CurrentTimePlugin.java
@@ -21,7 +21,6 @@ package org.apache.wiki.plugin;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.Plugin;
-import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.preferences.Preferences.TimeFormat;
@@ -62,8 +61,7 @@ public class CurrentTimePlugin implements Plugin {
return fmt.format( d );
} catch( final IllegalArgumentException e ) {
- final ResourceBundle rb = Preferences.getBundle( context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
-
+ final ResourceBundle rb = Preferences.getBundle( context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
throw new PluginException( rb.getString( "currenttimeplugin.badformat" ) + e.getMessage() );
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
index c6ee77a..a0db25b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
@@ -37,7 +37,7 @@ 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.InitializablePlugin;
-import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.modules.BaseModuleManager;
import org.apache.wiki.modules.WikiModuleInfo;
import org.apache.wiki.preferences.Preferences;
@@ -151,7 +151,7 @@ import java.util.StringTokenizer;
* as the regular parameters. However, since JSPWiki caches the DOM tree to speed up later
* places, which means that whatever this method returns would be irrelevant. You can do some DOM
* tree manipulation, though. The ParserStagePlugin is available from 2.5.30 onwards.</li>
- * <li>WikiPlugin: The regular kind of plugin which is executed at every rendering stage. Each
+ * <li>Plugin: The regular kind of plugin which is executed at every rendering stage. Each
* new page load is guaranteed to invoke the plugin, unlike with the ParserStagePlugins.</li>
* </ul>
*
@@ -321,11 +321,11 @@ public class DefaultPluginManager extends BaseModuleManager implements PluginMan
return "";
}
- final ResourceBundle rb = Preferences.getBundle( context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
final boolean debug = TextUtil.isPositive( params.get( PARAM_DEBUG ) );
try {
// Create...
- final WikiPlugin plugin = newWikiPlugin( classname, rb );
+ final Plugin plugin = newWikiPlugin( classname, rb );
if( plugin == null ) {
return "Plugin '" + classname + "' not compatible with this version of JSPWiki";
}
@@ -487,7 +487,7 @@ public class DefaultPluginManager extends BaseModuleManager implements PluginMan
return "";
}
- final ResourceBundle rb = Preferences.getBundle( context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
final PatternMatcher matcher = new Perl5Matcher();
try {
@@ -617,7 +617,7 @@ public class DefaultPluginManager extends BaseModuleManager implements PluginMan
m_initialized = true;
try {
- final WikiPlugin p = newPluginInstance(searchPath, externalJars);
+ final Plugin p = newPluginInstance(searchPath, externalJars);
if( p instanceof InitializablePlugin ) {
( ( InitializablePlugin )p ).initialize( engine );
}
@@ -700,12 +700,12 @@ public class DefaultPluginManager extends BaseModuleManager implements PluginMan
* @throws IllegalAccessException If the class cannot be accessed.
*/
- public WikiPlugin newPluginInstance( final List<String> searchPath, final List<String> externalJars) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+ public Plugin newPluginInstance( final List<String> searchPath, final List<String> externalJars) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
if( m_clazz == null ) {
m_clazz = ClassUtil.findClass(searchPath, externalJars ,m_className);
}
- return (WikiPlugin) m_clazz.newInstance();
+ return (Plugin) m_clazz.newInstance();
}
/**
@@ -797,16 +797,16 @@ public class DefaultPluginManager extends BaseModuleManager implements PluginMan
}
/**
- * Creates a {@link WikiPlugin}.
+ * Creates a {@link Plugin}.
*
* @param pluginName plugin's classname
* @param rb {@link ResourceBundle} with i18ned text for exceptions.
- * @return a {@link WikiPlugin}.
- * @throws PluginException if there is a problem building the {@link WikiPlugin}.
+ * @return a {@link Plugin}.
+ * @throws PluginException if there is a problem building the {@link Plugin}.
*/
@Override
- public WikiPlugin newWikiPlugin( final String pluginName, final ResourceBundle rb ) throws PluginException {
- WikiPlugin plugin = null;
+ public Plugin newWikiPlugin( final String pluginName, final ResourceBundle rb ) throws PluginException {
+ Plugin plugin = null;
WikiPluginInfo pluginInfo = m_pluginClassMap.get( pluginName );
try {
if( pluginInfo == null ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
index 1553a20..38d806e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
@@ -25,7 +25,6 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.plugin.Plugin;
-import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.permissions.PermissionFactory;
import org.apache.wiki.pages.PageManager;
@@ -96,7 +95,7 @@ public class InsertPage implements Plugin {
final int section = TextUtil.parseIntParameter(params.get( PARAM_SECTION ), -1 );
int maxlen = TextUtil.parseIntParameter(params.get( PARAM_MAXLENGTH ), -1 );
- final ResourceBundle rb = Preferences.getBundle( context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
if( style == null ) {
style = DEFAULT_STYLE;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
index 5ae6037..91288d3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ListLocksPlugin.java
@@ -21,7 +21,6 @@ package org.apache.wiki.plugin;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.Plugin;
-import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.pages.PageLock;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.preferences.Preferences;
@@ -47,7 +46,7 @@ public class ListLocksPlugin implements Plugin {
final StringBuilder result = new StringBuilder();
final PageManager mgr = context.getEngine().getManager( PageManager.class );
final List< PageLock > locks = mgr.getActiveLocks();
- final ResourceBundle rb = Preferences.getBundle( context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
result.append("<table class=\"wikitable\">\n");
result.append("<tr>\n");
result.append( "<th>" + rb.getString( "plugin.listlocks.page" ) + "</th><th>" + rb.getString( "plugin.listlocks.locked.by" )
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/PluginManager.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/PluginManager.java
index 2389695..7ed86fb 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/PluginManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/PluginManager.java
@@ -22,7 +22,7 @@ import org.apache.oro.text.regex.Pattern;
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.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.modules.ModuleManager;
import java.io.IOException;
@@ -132,13 +132,13 @@ public interface PluginManager extends ModuleManager {
String execute( WikiContext context, String commandline ) throws PluginException;
/**
- * Creates a {@link WikiPlugin}.
+ * Creates a {@link Plugin}.
*
* @param pluginName plugin's classname
* @param rb {@link ResourceBundle} with i18ned text for exceptions.
- * @return a {@link WikiPlugin}.
- * @throws PluginException if there is a problem building the {@link WikiPlugin}.
+ * @return a {@link Plugin}.
+ * @throws PluginException if there is a problem building the {@link Plugin}.
*/
- WikiPlugin newWikiPlugin( String pluginName, ResourceBundle rb ) throws PluginException;
+ Plugin newWikiPlugin( String pluginName, ResourceBundle rb ) throws PluginException;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
index 2f5187f..d0c1239 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
@@ -23,7 +23,7 @@ import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.references.ReferenceManager;
@@ -67,10 +67,10 @@ public class ReferringPagesPlugin extends AbstractReferralPlugin {
* {@inheritDoc}
*/
@Override
- public String execute( final Context context, final Map<String, String> params ) throws PluginException {
+ public String execute( final Context context, final Map< String, String > params ) throws PluginException {
final ReferenceManager refmgr = context.getEngine().getManager( ReferenceManager.class );
String pageName = params.get( PARAM_PAGE );
- final ResourceBundle rb = Preferences.getBundle( context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
StringBuilder result = new StringBuilder( 256 );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
index 35a0bed..3283723 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
@@ -20,7 +20,7 @@ package org.apache.wiki.plugin;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.references.ReferenceManager;
import org.apache.wiki.util.TextUtil;
@@ -47,8 +47,7 @@ public class ReferringUndefinedPagesPlugin extends AbstractReferralPlugin {
@Override
public String execute( final Context context, final Map<String, String> params) throws PluginException {
- final ResourceBundle rb = Preferences.getBundle(context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
-
+ final ResourceBundle rb = Preferences.getBundle(context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE);
final ReferenceManager referenceManager = context.getEngine().getManager( ReferenceManager.class );
final int items = TextUtil.parseIntParameter(params.get(PARAM_MAX), ALL_ITEMS);
@@ -57,39 +56,35 @@ public class ReferringUndefinedPagesPlugin extends AbstractReferralPlugin {
extras = rb.getString("referringundefinedpagesplugin.more");
}
- final StringBuilder resultHTML = new StringBuilder();
-
- final Collection<String> uncreatedPages = referenceManager.findUncreated();
-
- super.initialize(context, params);
-
- Collection<String> result = null;
+ final Collection< String > uncreatedPages = referenceManager.findUncreated();
+ super.initialize( context, params );
+ Collection< String > result = null;
final TreeMap< String, String > sortedMap = new TreeMap<>();
- if (uncreatedPages != null) {
- for ( final String uncreatedPageName : uncreatedPages) {
- final Collection<String> referrers = referenceManager.findReferrers(uncreatedPageName);
- if (referrers != null) {
- for ( final String referringPage : referrers) {
- sortedMap.put(referringPage, "");
+ if( uncreatedPages != null ) {
+ for( final String uncreatedPageName : uncreatedPages ) {
+ final Collection< String > referrers = referenceManager.findReferrers( uncreatedPageName );
+ if( referrers != null ) {
+ for( final String referringPage : referrers ) {
+ sortedMap.put( referringPage, "" );
}
}
}
result = sortedMap.keySet();
}
- result = super.filterAndSortCollection(result);
-
- final String wikitext = wikitizeCollection(result, m_separator, items);
+ result = super.filterAndSortCollection( result );
- resultHTML.append(makeHTML(context, wikitext));
+ final String wikitext = wikitizeCollection( result, m_separator, items );
+ final StringBuilder resultHTML = new StringBuilder();
+ resultHTML.append( makeHTML( context, wikitext ) );
// add the more.... text
- if (items < result.size() && items > 0) {
- final Object[] args = {"" + (result.size() - items)};
- extras = MessageFormat.format(extras, args);
+ if( items < result.size() && items > 0 ) {
+ final Object[] args = { "" + ( result.size() - items ) };
+ extras = MessageFormat.format( extras, args );
- resultHTML.append("<br/>" + extras + "<br/>");
+ resultHTML.append( "<br/>" + extras + "<br/>" );
}
return resultHTML.toString();
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
index e91eff1..abb20a9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
@@ -25,7 +25,6 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.Plugin;
-import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.filters.FilterManager;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.parser.Heading;
@@ -151,7 +150,7 @@ public class TableOfContents implements Plugin, HeadingListener {
public String execute( final Context context, final Map<String, String> params ) throws PluginException {
final Engine engine = context.getEngine();
final Page page = context.getPage();
- final ResourceBundle rb = Preferences.getBundle( context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
if( context.getVariable( VAR_ALREADY_PROCESSING ) != null ) {
//return rb.getString("tableofcontents.title");
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
index 76af006..80ce30c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
@@ -26,7 +26,6 @@ import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.plugin.Plugin;
-import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.pages.PageLock;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.preferences.Preferences;
@@ -91,7 +90,7 @@ public class WeblogEntryPlugin implements Plugin {
*/
@Override
public String execute( final Context context, final Map< String, String > params ) throws PluginException {
- final ResourceBundle rb = Preferences.getBundle(context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ final ResourceBundle rb = Preferences.getBundle(context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE);
final Engine engine = context.getEngine();
String weblogName = params.get(PARAM_BLOGNAME);
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 9c70e98..abdeace 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
@@ -28,7 +28,6 @@ import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.plugin.ParserStagePlugin;
import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.api.plugin.PluginElement;
-import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.api.providers.WikiProvider;
import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.permissions.PagePermission;
@@ -274,7 +273,7 @@ public class WeblogPlugin implements Plugin, ParserStagePlugin {
private void addEntryHTML( final Context context, final DateFormat entryFormat, final boolean hasComments,
final StringBuilder buffer, final WikiPage entry, final Map< String, String > params) {
final Engine engine = context.getEngine();
- final ResourceBundle rb = Preferences.getBundle(context, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE);
+ final ResourceBundle rb = Preferences.getBundle(context, Plugin.CORE_PLUGINS_RESOURCEBUNDLE);
buffer.append("<div class=\"weblogentry\">\n");
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 7138720..fdd72f1 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
@@ -23,6 +23,7 @@ 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;
@@ -52,7 +53,7 @@ public class InterWikiLinkAttributeProviderState implements NodeAttributeProvide
this.linkOperations = new LinkParsingOperations( wikiContext );
this.isImageInlining = isImageInlining;
this.inlineImagePatterns = inlineImagePatterns;
- final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE );
+ final Boolean wysiwygVariable = ( Boolean )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 e0efb76..d465bbe 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
@@ -21,6 +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.wiki.WikiContext;
+import org.apache.wiki.api.core.Context;
import org.apache.wiki.htmltowiki.XHtmlToWikiConfig;
import org.apache.wiki.markdown.nodes.JSPWikiLink;
import org.apache.wiki.render.WikiRenderer;
@@ -37,7 +38,7 @@ public class WysiwygEditingAttributeProviderState implements NodeAttributeProvid
public WysiwygEditingAttributeProviderState( final WikiContext wikiContext ) {
this.wikiContext = wikiContext;
- final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE );
+ final Boolean wysiwygVariable = ( Boolean )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 d977565..2d312a3 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
@@ -23,6 +23,7 @@ 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;
import org.apache.wiki.auth.acl.Acl;
import org.apache.wiki.auth.acl.AclManager;
@@ -41,7 +42,7 @@ public class AccessRuleLinkNodePostProcessorState implements NodePostProcessorSt
public AccessRuleLinkNodePostProcessorState( final WikiContext wikiContext ) {
this.wikiContext = wikiContext;
- final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE );
+ final Boolean wysiwygVariable = ( Boolean )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/InterWikiLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/InterWikiLinkNodePostProcessorState.java
index 340cf65..db6d9f1 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
@@ -25,6 +25,7 @@ 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;
import org.apache.wiki.parser.LinkParsingOperations;
@@ -61,7 +62,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( WikiContext.VAR_WYSIWYG_EDITOR_MODE );
+ final Boolean wysiwygVariable = ( Boolean )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 fadb459..c55f407 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
@@ -22,6 +22,7 @@ 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;
import org.apache.wiki.preferences.Preferences;
@@ -42,7 +43,7 @@ public class MetadataLinkNodePostProcessorState implements NodePostProcessorStat
public MetadataLinkNodePostProcessorState( final WikiContext wikiContext ) {
this.wikiContext = wikiContext;
- final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE );
+ final Boolean wysiwygVariable = ( Boolean )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 4012797..87aeef0 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
@@ -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;
import org.apache.wiki.parser.MarkupParser;
@@ -46,7 +47,7 @@ class NodePostProcessorStateCommonOperations {
}
static void addOutlinkImage( final NodeTracker state, final Node node, final WikiContext wikiContext, final boolean useOutlinkImage ) {
- final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE );
+ final Boolean wysiwygVariable = ( Boolean )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 ea18af3..0451758 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
@@ -25,8 +25,9 @@ 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.WikiPlugin;
+import org.apache.wiki.api.plugin.Plugin;
import org.apache.wiki.markdown.nodes.JSPWikiLink;
import org.apache.wiki.parser.PluginContent;
import org.apache.wiki.preferences.Preferences;
@@ -46,7 +47,7 @@ public class PluginLinkNodePostProcessorState implements NodePostProcessorState<
public PluginLinkNodePostProcessorState( final WikiContext wikiContext ) {
this.wikiContext = wikiContext;
- final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE );
+ final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE );
m_wysiwygEditorMode = wysiwygVariable != null ? wysiwygVariable : false;
}
@@ -77,7 +78,7 @@ public class PluginLinkNodePostProcessorState implements NodePostProcessorState<
} catch( final PluginException e ) {
LOG.info( wikiContext.getRealPage().getWiki() + " : " + wikiContext.getRealPage().getName() + " - Failed to insert plugin: " + e.getMessage() );
if( !m_wysiwygEditorMode ) {
- final ResourceBundle rbPlugin = Preferences.getBundle( wikiContext, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rbPlugin = Preferences.getBundle( wikiContext, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
NodePostProcessorStateCommonOperations.makeError( state, link, MessageFormat.format( rbPlugin.getString( "plugin.error.insertionfailed" ),
wikiContext.getRealPage().getWiki(),
wikiContext.getRealPage().getName(),
@@ -108,7 +109,7 @@ public class PluginLinkNodePostProcessorState implements NodePostProcessorState<
void handleTableOfContentsPlugin(final NodeTracker state, final JSPWikiLink link) {
if( !m_wysiwygEditorMode ) {
- final ResourceBundle rb = Preferences.getBundle( wikiContext, WikiPlugin.CORE_PLUGINS_RESOURCEBUNDLE );
+ final ResourceBundle rb = Preferences.getBundle( wikiContext, Plugin.CORE_PLUGINS_RESOURCEBUNDLE );
final HtmlInline divToc = new HtmlInline( CharSubSequence.of( "<div class=\"toc\">\n" ) );
final HtmlInline divCollapseBox = new HtmlInline( CharSubSequence.of( "<div class=\"collapsebox\">\n" ) );
final HtmlInline divsClosing = new HtmlInline( CharSubSequence.of( "</div>\n</div>\n" ) );
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 4c1ea59..d9029b9 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
@@ -24,6 +24,7 @@ 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;
import org.apache.wiki.variables.VariableManager;
@@ -39,7 +40,7 @@ public class VariableLinkNodePostProcessorState implements NodePostProcessorStat
public VariableLinkNodePostProcessorState( final WikiContext wikiContext ) {
this.wikiContext = wikiContext;
- final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE );
+ final Boolean wysiwygVariable = ( Boolean )wikiContext.getVariable( Context.VAR_WYSIWYG_EDITOR_MODE );
m_wysiwygEditorMode = wysiwygVariable != null && wysiwygVariable;
}