[jspwiki] 27/36: use Context instead of WikiContext

[ju...@apache.org]

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 084c501eccc7493f583288947149d30202098ab0
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat Mar 21 14:32:37 2020 +0100

    use Context instead of WikiContext
---
 .../src/main/java/org/apache/wiki/ui/DefaultEditorManager.java      | 5 +++--
 jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java    | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

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 @@ package org.apache.wiki.ui;
 
 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 @@ public class DefaultEditorManager extends BaseModuleManager implements EditorMan
 
     /** {@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 @@ public class DefaultEditorManager extends BaseModuleManager implements EditorMan
 
     /** {@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 @@ public interface EditorManager extends ModuleManager {
      * @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 @@ public interface EditorManager extends ModuleManager {
      *  @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