JSPWIKI-120: getCurrentProvider() moved from WikiEngine to PageManager; getCurrentProviderInfo deleted from WikiEngine - use PageManager.getProviderDescription() instead
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 @@
}
/**
- * 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 @@
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 @@
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 @@
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 @@
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() {
