use Context instead of WikiContext
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java
index e91e76a..8a3a11c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java
@@ -20,6 +20,7 @@
import org.apache.log4j.Logger;
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.NoSuchVariableException;
import org.apache.wiki.modules.BaseModuleManager;
@@ -93,7 +94,7 @@
/** {@inheritDoc} */
@Override
- public String getEditorName( final WikiContext context ) {
+ public String getEditorName( final Context context ) {
if( context.getRequestContext().equals( WikiContext.PREVIEW ) ) {
return EDITOR_PREVIEW;
}
@@ -133,7 +134,7 @@
/** {@inheritDoc} */
@Override
- public String getEditorPath( final WikiContext context ) {
+ public String getEditorPath( final Context context ) {
final String editor = getEditorName( context );
final WikiEditorInfo ed = m_editors.get( editor );
final String path;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
index b39f357..ed34db8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
@@ -18,7 +18,7 @@
*/
package org.apache.wiki.ui;
-import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.core.Context;
import org.apache.wiki.modules.ModuleManager;
import javax.servlet.jsp.PageContext;
@@ -83,7 +83,7 @@
* @param context The context that is chosen.
* @return The name of the chosen editor. If no match could be found, will revert to the default "plain" editor.
*/
- String getEditorName( WikiContext context );
+ String getEditorName( Context context );
/**
* Returns a list of editors as Strings of editor names.
@@ -98,7 +98,7 @@
* @param context WikiContext from where the editor name is retrieved.
* @return e.g. "editors/plain.jsp"
*/
- String getEditorPath( WikiContext context );
+ String getEditorPath( Context context );
/**
* Convenience function which examines the current context and attempts to figure out whether the edited text is in the HTTP