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 25e2488f088e7fb93ec9511f279aa8ddc346d82e Author: juanpablo <[email protected]> AuthorDate: Wed Feb 26 19:02:22 2020 +0100 JSPWIKI-120: URLConstructor#initialize(..) uses Engine instead of WikiEngine --- .../org/apache/wiki/url/DefaultURLConstructor.java | 22 +++++++++++----------- .../org/apache/wiki/url/ShortURLConstructor.java | 6 +++--- .../apache/wiki/url/ShortViewURLConstructor.java | 4 ++-- .../java/org/apache/wiki/url/URLConstructor.java | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java index f35200e..f127c06 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java @@ -20,7 +20,7 @@ package org.apache.wiki.url; import org.apache.commons.lang3.StringUtils; import org.apache.wiki.WikiContext; -import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.core.Engine; import org.apache.wiki.ui.Command; import org.apache.wiki.ui.CommandResolver; import org.apache.wiki.util.TextUtil; @@ -38,7 +38,7 @@ import java.util.Properties; */ public class DefaultURLConstructor implements URLConstructor { - protected WikiEngine m_engine; + protected Engine m_engine; /** * Contains the absolute path of the JSPWiki Web application without the actual servlet (which is the m_urlPrefix). @@ -49,7 +49,7 @@ public class DefaultURLConstructor implements URLConstructor { * * {@inheritDoc} */ - public void initialize( final WikiEngine engine, final Properties properties ) { + @Override public void initialize( final Engine engine, final Properties properties ) { m_engine = engine; m_pathPrefix = engine.getBaseURL() + "/"; } @@ -125,14 +125,14 @@ public class DefaultURLConstructor implements URLConstructor { * * {@inheritDoc} */ - public String makeURL( final String context, final String name, String parameters ) { + @Override public String makeURL( final String context, final String name, String parameters ) { if( parameters != null && parameters.length() > 0 ) { - if( context.equals(WikiContext.ATTACH) ) { - parameters = "?"+parameters; - } else if( context.equals(WikiContext.NONE) ) { - parameters = (name.indexOf('?') != -1 ) ? "&" : "?" + parameters; + if( context.equals( WikiContext.ATTACH ) ) { + parameters = "?" + parameters; + } else if( context.equals( WikiContext.NONE ) ) { + parameters = name.indexOf( '?' ) != -1 ? "&" : "?" + parameters; } else { - parameters = "&"+parameters; + parameters = "&" + parameters; } } else { parameters = ""; @@ -145,7 +145,7 @@ public class DefaultURLConstructor implements URLConstructor { * * {@inheritDoc} */ - public String parsePage( final String context, final HttpServletRequest request, final Charset encoding ) { + @Override public String parsePage( final String context, final HttpServletRequest request, final Charset encoding ) { String pagereq = request.getParameter( "page" ); if( context.equals(WikiContext.ATTACH) ) { pagereq = parsePageFromURL( request, encoding ); @@ -185,7 +185,7 @@ public class DefaultURLConstructor implements URLConstructor { * @param request The HTTP Request that was used to end up in this page. * @return "Wiki.jsp", "PageInfo.jsp", etc. Just return the name, JSPWiki will figure out the page. */ - public String getForwardPage( final HttpServletRequest request ) { + @Override public String getForwardPage( final HttpServletRequest request ) { return "Wiki.jsp"; } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java index 7b988f6..69530db 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java @@ -21,7 +21,7 @@ package org.apache.wiki.url; import org.apache.log4j.Logger; import org.apache.wiki.InternalWikiException; import org.apache.wiki.WikiContext; -import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.core.Engine; import org.apache.wiki.util.TextUtil; import javax.servlet.http.HttpServletRequest; @@ -50,7 +50,7 @@ public class ShortURLConstructor extends DefaultURLConstructor { /** {@inheritDoc} */ @Override - public void initialize( final WikiEngine engine, final Properties properties ) { + public void initialize( final Engine engine, final Properties properties ) { super.initialize( engine, properties ); m_urlPrefix = TextUtil.getStringProperty( properties, PROP_PREFIX, null ); @@ -160,7 +160,7 @@ public class ShortURLConstructor extends DefaultURLConstructor { jspPage = "Wiki"; } - return jspPage+".jsp"; + return jspPage + ".jsp"; } } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java index 8265c31..2c2ab39 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java @@ -19,7 +19,7 @@ package org.apache.wiki.url; import org.apache.wiki.WikiContext; -import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.core.Engine; import javax.servlet.http.HttpServletRequest; import java.util.Properties; @@ -34,7 +34,7 @@ public class ShortViewURLConstructor extends ShortURLConstructor { /** * {@inheritDoc} */ - public void initialize( final WikiEngine engine, final Properties properties ) { + @Override public void initialize( final Engine engine, final Properties properties ) { super.initialize( engine, properties ); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java index 6035750..a0ac40f 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/url/URLConstructor.java @@ -18,7 +18,7 @@ */ package org.apache.wiki.url; -import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.core.Engine; import javax.servlet.http.HttpServletRequest; import java.io.IOException; @@ -43,7 +43,7 @@ public interface URLConstructor { * @param engine The WikiEngine that this URLConstructor belongs to * @param properties Properties used to initialize */ - void initialize( WikiEngine engine, Properties properties ); + void initialize( Engine engine, Properties properties ); /** * Constructs the URL with a bunch of parameters.
