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 f2c5378a22230d5c15474286727832ef2dcef5e7 Author: juanpablo <[email protected]> AuthorDate: Mon Jan 13 00:27:48 2020 +0100 move WikiEngine renderer-related property names to RenderingManager also, move default values of those properties for DefaultRenderingManager down to DefaultRenderingManager --- .../org/apache/wiki/render/DefaultRenderingManager.java | 10 +++++++--- .../main/java/org/apache/wiki/render/RenderingManager.java | 13 ++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/render/DefaultRenderingManager.java b/jspwiki-main/src/main/java/org/apache/wiki/render/DefaultRenderingManager.java index 5e63df5..4f55840 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/render/DefaultRenderingManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/render/DefaultRenderingManager.java @@ -66,9 +66,13 @@ public class DefaultRenderingManager implements RenderingManager { /** The capacity of the caches, if you want something else, tweak ehcache.xml. */ private static final int DEFAULT_CACHESIZE = 1_000; private static final String VERSION_DELIMITER = "::"; - private static final String PROP_PARSER = "jspwiki.renderingManager.markupParser"; - private static final String PROP_RENDERER = "jspwiki.renderingManager.renderer"; - private static final String PROP_WYSIWYG_RENDERER = "jspwiki.renderingManager.renderer.wysiwyg"; + + /** The name of the default renderer. */ + private static final String DEFAULT_PARSER = JSPWikiMarkupParser.class.getName(); + /** The name of the default renderer. */ + private static final String DEFAULT_RENDERER = XHTMLRenderer.class.getName(); + /** The name of the default WYSIWYG renderer. */ + private static final String DEFAULT_WYSIWYG_RENDERER = WysiwygEditingRenderer.class.getName(); /** Stores the WikiDocuments that have been cached. */ private Cache m_documentCache; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/render/RenderingManager.java b/jspwiki-main/src/main/java/org/apache/wiki/render/RenderingManager.java index ea0d0e6..ad209cc 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/render/RenderingManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/render/RenderingManager.java @@ -24,7 +24,6 @@ import org.apache.wiki.WikiEngine; import org.apache.wiki.api.exceptions.WikiException; import org.apache.wiki.event.WikiEventListener; import org.apache.wiki.modules.InternalModule; -import org.apache.wiki.parser.JSPWikiMarkupParser; import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.parser.WikiDocument; @@ -44,14 +43,14 @@ import java.util.Properties; */ public interface RenderingManager extends WikiEventListener, InternalModule { - /** The name of the default renderer. */ - String DEFAULT_PARSER = JSPWikiMarkupParser.class.getName(); + /** markup parser property. */ + String PROP_PARSER = "jspwiki.renderingManager.markupParser"; - /** The name of the default renderer. */ - String DEFAULT_RENDERER = XHTMLRenderer.class.getName(); + /** default renderer property. */ + String PROP_RENDERER = "jspwiki.renderingManager.renderer"; - /** The name of the default WYSIWYG renderer. */ - String DEFAULT_WYSIWYG_RENDERER = WysiwygEditingRenderer.class.getName(); + /** default wysiwyg renderer property. */ + String PROP_WYSIWYG_RENDERER = "jspwiki.renderingManager.renderer.wysiwyg"; /** Name of the regular page cache. */ String DOCUMENTCACHE_NAME = "jspwiki.renderingCache";
