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 ff5b22641beec690d71b3c5fb1d44f6178f4049d Author: juanpablo <[email protected]> AuthorDate: Mon Mar 2 19:57:22 2020 +0100 fix compilation problems --- jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java | 2 +- .../src/main/java/org/apache/wiki/plugin/TableOfContents.java | 2 +- .../src/main/java/org/apache/wiki/tags/AdminBeanIteratorTag.java | 2 +- jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java | 6 ++---- .../src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java | 8 +++++--- .../java/org/apache/wiki/variables/DefaultVariableManager.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) 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 8c56300..9c82ec2 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 @@ -20,10 +20,10 @@ package org.apache.wiki.forms; import org.apache.wiki.WikiContext; -import org.apache.wiki.api.engine.PluginManager; import org.apache.wiki.api.exceptions.PluginException; import org.apache.wiki.api.plugin.WikiPlugin; import org.apache.wiki.plugin.DefaultPluginManager; +import org.apache.wiki.plugin.PluginManager; import org.apache.wiki.preferences.Preferences; import org.apache.wiki.util.FormUtil; 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 4b082d4..4ef0e13 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 @@ -23,9 +23,9 @@ import org.apache.wiki.InternalWikiException; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiPage; import org.apache.wiki.api.core.Engine; -import org.apache.wiki.api.engine.FilterManager; import org.apache.wiki.api.exceptions.PluginException; 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; import org.apache.wiki.parser.HeadingListener; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorTag.java index 49af855..d36a2fe 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorTag.java @@ -19,8 +19,8 @@ package org.apache.wiki.tags; import org.apache.wiki.WikiContext; -import org.apache.wiki.api.engine.AdminBeanManager; import org.apache.wiki.ui.admin.AdminBean; +import org.apache.wiki.ui.admin.AdminBeanManager; import java.util.ArrayList; import java.util.Collection; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java index c971d71..20a4413 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PluginTag.java @@ -20,8 +20,8 @@ package org.apache.wiki.tags; import org.apache.log4j.Logger; import org.apache.wiki.api.core.Engine; -import org.apache.wiki.api.engine.PluginManager; import org.apache.wiki.api.exceptions.PluginException; +import org.apache.wiki.plugin.PluginManager; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyContent; @@ -104,9 +104,7 @@ public class PluginTag argmap.put( "_body", body ); } - final String result = pm.execute( m_wikiContext, plugin, argmap ); - - return result; + return pm.execute( m_wikiContext, plugin, argmap ); } /** diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java index 3b47696..639295c 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java @@ -19,7 +19,7 @@ package org.apache.wiki.ui.admin.beans; import org.apache.wiki.api.core.Engine; -import org.apache.wiki.api.engine.FilterManager; +import org.apache.wiki.filters.FilterManager; import org.apache.wiki.modules.WikiModuleInfo; import org.apache.wiki.util.XHTML; import org.apache.wiki.util.XhtmlUtil; @@ -38,14 +38,16 @@ public class FilterBean extends ModuleBean { /** * {@inheritDoc} */ - @Override public String getTitle() { + @Override + public String getTitle() { return "Filters"; } /** * {@inheritDoc} */ - @Override public int getType() { + @Override + public int getType() { return CORE; } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java index 7525759..5764fcd 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java @@ -24,14 +24,14 @@ import org.apache.wiki.WikiContext; import org.apache.wiki.WikiPage; import org.apache.wiki.WikiProvider; import org.apache.wiki.WikiSession; -import org.apache.wiki.api.engine.FilterManager; -import org.apache.wiki.api.engine.PluginManager; import org.apache.wiki.api.exceptions.NoSuchVariableException; import org.apache.wiki.api.filters.PageFilter; import org.apache.wiki.attachment.AttachmentManager; +import org.apache.wiki.filters.FilterManager; import org.apache.wiki.i18n.InternationalizationManager; import org.apache.wiki.modules.InternalModule; import org.apache.wiki.pages.PageManager; +import org.apache.wiki.plugin.PluginManager; import org.apache.wiki.preferences.Preferences; import javax.servlet.http.HttpServletRequest;
