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 fcd0f5d33bac29d42ced17050673529ec3fea119 Author: juanpablo <[email protected]> AuthorDate: Fri Jan 3 20:52:10 2020 +0100 JSPWIKI-120: getCurrentProvider() moved from WikiEngine to PageManager; getCurrentProviderInfo deleted from WikiEngine - use PageManager.getProviderDescription() instead --- .../src/main/java/org/apache/wiki/WikiEngine.java | 23 ---------------------- .../org/apache/wiki/pages/DefaultPageManager.java | 14 +++++++++++-- .../java/org/apache/wiki/pages/PageManager.java | 7 +++++++ .../wiki/variables/DefaultVariableManager.java | 10 ++++------ 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java index 19a2eaa..836e10d 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java @@ -1553,29 +1553,6 @@ public class WikiEngine { } /** - * Returns the provider name. - * @return The full class name of the current page provider. - */ - - public String getCurrentProvider() - { - return m_pageManager.getProvider().getClass().getName(); - } - - /** - * Return information about current provider. This method just calls - * the corresponding PageManager method, which in turn calls the - * provider method. - * - * @return A textual description of the current provider. - * @since 1.6.4 - */ - public String getCurrentProviderInfo() - { - return m_pageManager.getProviderDescription(); - } - - /** * Returns a Collection of WikiPages, sorted in time * order of last change (i.e. first object is the most * recently changed). This method also includes attachments. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java b/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java index e4f97b9..d704b7f 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java @@ -315,7 +315,16 @@ public class DefaultPageManager extends ModuleManager implements PageManager { return null; } - /* (non-Javadoc) + /** + * {@inheritDoc} + * @see org.apache.wiki.pages.PageManager#getCurrentProvider() + */ + public String getCurrentProvider() { + return getProvider().getClass().getName(); + } + + /** + * {@inheritDoc} * @see org.apache.wiki.pages.PageManager#getProviderDescription() */ @Override @@ -323,7 +332,8 @@ public class DefaultPageManager extends ModuleManager implements PageManager { return m_provider.getProviderInfo(); } - /* (non-Javadoc) + /** + * {@inheritDoc} * @see org.apache.wiki.pages.PageManager#getTotalPageCount() */ @Override diff --git a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java index 7337c8d..a78abca 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java @@ -138,6 +138,13 @@ public interface PageManager extends WikiEventListener { List<WikiPage> getVersionHistory(String pageName) throws ProviderException; /** + * Returns the provider name. + * + * @return The full class name of the current page provider. + */ + String getCurrentProvider(); + + /** * Returns a human-readable description of the current provider. * * @return A human-readable description. 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 171760d..2f82aa8 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 @@ -346,14 +346,12 @@ public class DefaultVariableManager implements VariableManager { return Integer.toString( m_context.getEngine().getPageCount() ); } - public String getPageprovider() - { - return m_context.getEngine().getCurrentProvider(); + public String getPageprovider() { + return m_context.getEngine().getPageManager().getCurrentProvider(); } - public String getPageproviderdescription() - { - return m_context.getEngine().getCurrentProviderInfo(); + public String getPageproviderdescription() { + return m_context.getEngine().getPageManager().getProviderDescription(); } public String getAttachmentprovider() {
