You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/01/28 20:34:21 UTC
[jspwiki] 20/32: JSPWIKI-1127: remove references to PROP_REFSTYLE
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 3e8e1e6e1b860185d671d0d269863ccbffe20aa9
Author: juanpablo <ju...@apache.org>
AuthorDate: Wed Jan 22 23:30:28 2020 +0100
JSPWIKI-1127: remove references to PROP_REFSTYLE
---
.../src/main/java/org/apache/wiki/WikiEngine.java | 3 ---
.../main/java/org/apache/wiki/tags/LinkTag.java | 25 +++++-----------------
.../java/org/apache/wiki/xmlrpc/RPCHandler.java | 3 ---
.../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 3 ---
4 files changed, 5 insertions(+), 29 deletions(-)
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 67c1d4d..873d583 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -128,9 +128,6 @@ public class WikiEngine {
Double negative, cause for most servers you don't need the property */
public static final String PROP_NO_FILTER_ENCODING = "jspwiki.nofilterencoding";
- /** The name for the property which allows you to set the current reference style. The value is {@value}. */
- public static final String PROP_REFSTYLE = "jspwiki.referenceStyle";
-
/** Property name for where the jspwiki work directory should be.
If not specified, reverts to ${java.tmpdir}. */
public static final String PROP_WORKDIR = "jspwiki.workDir";
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
index ab096a7..e464f59 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
@@ -63,9 +63,6 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
private String m_tabindex = null;
private String m_templatefile = null;
- private boolean m_absolute = false;
- private boolean m_overrideAbsolute = false;
-
private Map<String, String> m_containedParams;
private BodyContent m_bodyContent;
@@ -75,7 +72,6 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
m_version = m_cssClass = m_style = m_title = m_target = m_compareToVersion = m_rel = m_jsp = m_ref = m_accesskey = m_templatefile = null;
m_context = WikiContext.VIEW;
m_containedParams = new HashMap<>();
- m_absolute = false;
}
public void setTemplatefile( final String key )
@@ -88,11 +84,6 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
m_accesskey = key;
}
- public void setAbsolute( final String arg ) {
- m_overrideAbsolute = true;
- m_absolute = TextUtil.isPositive( arg );
- }
-
public String getVersion()
{
return m_version;
@@ -235,10 +226,10 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
matchedLink = reallink;
}
- url = makeBasicURL( m_context, matchedLink, parms, m_absolute ) + sectref;
+ url = makeBasicURL( m_context, matchedLink, parms ) + sectref;
} else {
final String reallink = MarkupParser.cleanLink( m_ref );
- url = makeBasicURL( m_context, reallink, parms, m_absolute );
+ url = makeBasicURL( m_context, reallink, parms );
}
}
} else if( m_pageName != null && m_pageName.length() > 0 ) {
@@ -258,11 +249,11 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
url = engine.getURL( ctx, m_pageName, parms );
//url = m_wikiContext.getURL( ctx, m_pageName, parms );
} else {
- url = makeBasicURL( m_context, m_pageName, parms, m_absolute );
+ url = makeBasicURL( m_context, m_pageName, parms );
}
} else {
final String page = engine.getFrontPage();
- url = makeBasicURL( m_context, page, null, m_absolute );
+ url = makeBasicURL( m_context, page, null );
}
return url;
@@ -294,7 +285,7 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
return addTo + buf.toString();
}
- private String makeBasicURL( final String context, final String page, String parms, final boolean absolute ) {
+ private String makeBasicURL( final String context, final String page, String parms ) {
final WikiEngine engine = m_wikiContext.getEngine();
if( context.equals( WikiContext.DIFF ) ) {
@@ -340,12 +331,6 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
public int doEndTag() {
try {
final WikiEngine engine = m_wikiContext.getEngine();
-
- if( !m_overrideAbsolute ) {
- // TODO: see WikiContext.getURL(); this check needs to be specified somewhere.
- m_absolute = "absolute".equals( engine.getWikiProperties().getProperty( WikiEngine.PROP_REFSTYLE ) );
- }
-
final JspWriter out = pageContext.getOut();
final String url = figureOutURL();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
index 756a710..e2a8f40 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
@@ -21,7 +21,6 @@ package org.apache.wiki.xmlrpc;
import org.apache.log4j.Logger;
import org.apache.wiki.LinkCollector;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiPage;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.auth.permissions.PagePermission;
@@ -219,8 +218,6 @@ public class RPCHandler extends AbstractRPCHandler {
final LinkCollector attCollector = new LinkCollector();
final WikiContext context = new WikiContext( m_engine, page );
- context.setVariable( WikiEngine.PROP_REFSTYLE, "absolute" );
-
m_engine.getRenderingManager().textToHTML( context, pagedata, localCollector, extCollector, attCollector );
final Vector< Hashtable< String, String > > result = new Vector<>();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
index a0b323b..40f143f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java
@@ -20,7 +20,6 @@ package org.apache.wiki.xmlrpc;
import org.apache.wiki.LinkCollector;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiPage;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.auth.permissions.PagePermission;
@@ -173,8 +172,6 @@ public class RPCHandlerUTF8 extends AbstractRPCHandler {
final LinkCollector attCollector = new LinkCollector();
final WikiContext context = new WikiContext( m_engine, page );
- context.setVariable( WikiEngine.PROP_REFSTYLE, "absolute" );
-
m_engine.getRenderingManager().textToHTML( context, pagedata, localCollector, extCollector, attCollector );
final Vector< Hashtable< String, String > > result = new Vector<>();