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/03/24 22:10:19 UTC
[jspwiki] 03/15: use Page instead of WikiPage whenever possible
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 58101a7496d2db189531227065532b47f98f434c
Author: juanpablo <ju...@apache.org>
AuthorDate: Tue Mar 24 15:46:06 2020 +0100
use Page instead of WikiPage whenever possible
---
.../apache/wiki/attachment/AttachmentServlet.java | 4 +-
.../java/org/apache/wiki/filters/SpamFilter.java | 3 +-
.../org/apache/wiki/plugin/BugReportHandler.java | 2 +-
.../apache/wiki/plugin/RecentChangesPlugin.java | 3 +-
.../wiki/providers/BasicAttachmentProvider.java | 2 +-
.../apache/wiki/providers/FileSystemProvider.java | 11 +-
.../apache/wiki/search/LuceneSearchProvider.java | 2 +-
.../apache/wiki/tags/AttachmentsIteratorTag.java | 4 +-
.../java/org/apache/wiki/tags/CalendarTag.java | 6 +-
.../java/org/apache/wiki/tags/CheckLockTag.java | 4 +-
.../java/org/apache/wiki/tags/CheckVersionTag.java | 3 +-
.../java/org/apache/wiki/tags/CommentLinkTag.java | 59 ++++-------
.../org/apache/wiki/tags/HasAttachmentsTag.java | 4 +-
.../org/apache/wiki/tags/HistoryIteratorTag.java | 14 +--
.../java/org/apache/wiki/tags/InsertPageTag.java | 3 +-
.../java/org/apache/wiki/tags/IteratorTag.java | 15 +--
.../main/java/org/apache/wiki/tags/LinkTag.java | 3 +-
.../java/org/apache/wiki/tags/LinkToParentTag.java | 44 +++-----
.../main/java/org/apache/wiki/tags/LinkToTag.java | 112 +++++++++------------
.../java/org/apache/wiki/tags/NextVersionTag.java | 24 ++---
.../java/org/apache/wiki/tags/PageDateTag.java | 74 ++++++--------
.../java/org/apache/wiki/tags/PageInfoLinkTag.java | 4 +-
.../java/org/apache/wiki/tags/PageTypeTag.java | 37 +++----
.../java/org/apache/wiki/tags/PageVersionTag.java | 36 +++----
.../org/apache/wiki/tags/PreviousVersionTag.java | 21 ++--
.../apache/wiki/tasks/pages/SaveWikiPageTask.java | 8 +-
.../java/org/apache/wiki/plugin/IfPluginTest.java | 5 +-
27 files changed, 201 insertions(+), 306 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
index 3edf733..522ba79 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
@@ -27,10 +27,10 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.log4j.Logger;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.WikiSession;
import org.apache.wiki.api.core.Attachment;
import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.core.Session;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.exceptions.RedirectException;
@@ -560,7 +560,7 @@ public class AttachmentServlet extends HttpServlet {
}
if( changenote != null && changenote.length() > 0 ) {
- att.setAttribute( WikiPage.CHANGENOTE, changenote );
+ att.setAttribute( Page.CHANGENOTE, changenote );
}
try {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
index 0338d49..666f168 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
@@ -30,7 +30,6 @@ import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
import org.apache.wiki.InternalWikiException;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Attachment;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
@@ -837,7 +836,7 @@ public class SpamFilter extends BasePageFilter {
}
// Don't forget to include the change note, too
- final String changeNote = page.getAttribute( WikiPage.CHANGENOTE );
+ final String changeNote = page.getAttribute( Page.CHANGENOTE );
if( changeNote != null ) {
change.append( "\r\n" );
change.append( changeNote );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
index 5e8852c..107264e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
@@ -141,7 +141,7 @@ public class BugReportHandler implements Plugin {
// Now create a new page for this bug report
final String pageName = findNextPage( context, title, params.get( PARAM_PAGE ) );
final WikiPage newPage = new WikiPage( context.getEngine(), pageName );
- final Context newContext = (Context)context.clone();
+ final Context newContext = context.clone();
newContext.setPage( newPage );
context.getEngine().getManager( PageManager.class ).saveText( newContext, str.toString() );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java
index 1482429..496e859 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java
@@ -21,7 +21,6 @@ package org.apache.wiki.plugin;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
@@ -197,7 +196,7 @@ public class RecentChangesPlugin extends AbstractReferralPlugin implements Plugi
// Change note
if( showChangenote ) {
- final String changenote = pageref.getAttribute( WikiPage.CHANGENOTE );
+ final String changenote = pageref.getAttribute( Page.CHANGENOTE );
final Element td_changenote = XhtmlUtil.element( XHTML.td, changenote );
td_changenote.setAttribute( XHTML.ATTR_class, "changenote" );
row.addContent( td_changenote );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
index 186f8d8..2a52a85 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
@@ -288,7 +288,7 @@ public class BasicAttachmentProvider implements AttachmentProvider {
}
props.setProperty( versionNumber + ".author", author );
- final String changeNote = att.getAttribute( WikiPage.CHANGENOTE );
+ final String changeNote = att.getAttribute( Page.CHANGENOTE );
if( changeNote != null ) {
props.setProperty( versionNumber + ".changenote", changeNote );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
index f2b7f08..067b64c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
@@ -19,7 +19,6 @@
package org.apache.wiki.providers;
import org.apache.log4j.Logger;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.ProviderException;
@@ -98,16 +97,16 @@ public class FileSystemProvider extends AbstractFileProvider {
try( final InputStream in = new FileInputStream( file ) ) {
final Properties props = new Properties();
props.load( in );
- page.setAuthor( props.getProperty( WikiPage.AUTHOR ) );
+ page.setAuthor( props.getProperty( Page.AUTHOR ) );
- final String changenote = props.getProperty( WikiPage.CHANGENOTE );
+ final String changenote = props.getProperty( Page.CHANGENOTE );
if( changenote != null ) {
- page.setAttribute( WikiPage.CHANGENOTE, changenote );
+ page.setAttribute( Page.CHANGENOTE, changenote );
}
- final String viewcount = props.getProperty( WikiPage.VIEWCOUNT );
+ final String viewcount = props.getProperty( Page.VIEWCOUNT );
if( viewcount != null ) {
- page.setAttribute( WikiPage.VIEWCOUNT, viewcount );
+ page.setAttribute( Page.VIEWCOUNT, viewcount );
}
// Set the props values to the page attributes
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index d261e4d..47e3a9b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -307,7 +307,7 @@ public class LuceneSearchProvider implements SearchProvider {
* @param page The WikiPage to check
* @param text The page text to index.
*/
- protected synchronized void updateLuceneIndex( final WikiPage page, final String text ) {
+ protected synchronized void updateLuceneIndex( final Page page, final String text ) {
log.debug("Updating Lucene index for page '" + page.getName() + "'...");
pageRemoved( page );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
index 8f249a0..4314b33 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java
@@ -20,10 +20,10 @@ package org.apache.wiki.tags;
import org.apache.log4j.Logger;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Attachment;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.pages.PageManager;
@@ -58,7 +58,7 @@ public class AttachmentsIteratorTag extends IteratorTag {
m_wikiContext = (WikiContext) pageContext.getAttribute( WikiContext.ATTR_CONTEXT, PageContext.REQUEST_SCOPE );
final Engine engine = m_wikiContext.getEngine();
final AttachmentManager mgr = engine.getManager( AttachmentManager.class );
- final WikiPage page;
+ final Page page;
page = m_wikiContext.getPage();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
index 125e19c..9b1b28b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
@@ -20,8 +20,8 @@ package org.apache.wiki.tags;
import org.apache.log4j.Logger;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.pages.PageManager;
import org.apache.wiki.util.HttpUtil;
import org.apache.wiki.util.TextUtil;
@@ -127,7 +127,7 @@ public class CalendarTag extends WikiTagBase {
}
private String format( final String txt ) {
- final WikiPage p = m_wikiContext.getPage();
+ final Page p = m_wikiContext.getPage();
if( p != null ) {
return TextUtil.replaceString( txt, "%p", p.getName() );
}
@@ -197,7 +197,7 @@ public class CalendarTag extends WikiTagBase {
nextMonth.add( Calendar.MONTH, 1 ); // Now move to 1st day of next month
if ( day.before( nextMonth ) ) {
- final WikiPage thePage = m_wikiContext.getPage();
+ final Page thePage = m_wikiContext.getPage();
final String pageName = thePage.getName();
final String calendarDate = m_dateFormat.format( day.getTime() );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java
index d6753c7..5370494 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockTag.java
@@ -18,8 +18,8 @@
*/
package org.apache.wiki.tags;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.pages.PageLock;
import org.apache.wiki.pages.PageManager;
@@ -79,7 +79,7 @@ public class CheckLockTag extends WikiTagBase {
@Override
public final int doWikiStartTag() throws IOException, ProviderException {
final Engine engine = m_wikiContext.getEngine();
- final WikiPage page = m_wikiContext.getPage();
+ final Page page = m_wikiContext.getPage();
if( page != null ) {
final PageManager mgr = engine.getManager( PageManager.class );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckVersionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckVersionTag.java
index 28e7ea9..f7abbfd 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckVersionTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckVersionTag.java
@@ -19,7 +19,6 @@
package org.apache.wiki.tags;
import org.apache.wiki.InternalWikiException;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.pages.PageManager;
@@ -79,7 +78,7 @@ public class CheckVersionTag extends WikiTagBase {
@Override
public final int doWikiStartTag() {
final Engine engine = m_wikiContext.getEngine();
- final WikiPage page = m_wikiContext.getPage();
+ final Page page = m_wikiContext.getPage();
if( page != null && engine.getManager( PageManager.class ).wikiPageExists( page.getName() ) ) {
final int version = page.getVersion();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java
index 421b2ca..d8205ae 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CommentLinkTag.java
@@ -18,13 +18,13 @@
*/
package org.apache.wiki.tags;
-import java.io.IOException;
+import org.apache.wiki.InternalWikiException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.core.Page;
import javax.servlet.jsp.JspWriter;
+import java.io.IOException;
-import org.apache.wiki.InternalWikiException;
-import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
/**
* Writes a comment link. Body of the link becomes the link text.
@@ -45,58 +45,35 @@ public class CommentLinkTag
* {@inheritDoc}
*/
@Override
- public final int doWikiStartTag()
- throws IOException
- {
- WikiPage page = null;
- String pageName = null;
+ public final int doWikiStartTag() throws IOException {
+ final Page page;
+ final String pageName;
- //
// Determine the page and the link.
- //
- if( m_pageName == null )
- {
+ if( m_pageName == null ) {
page = m_wikiContext.getPage();
- if( page == null )
- {
+ if( page == null ) {
// You can't call this on the page itself anyways.
return SKIP_BODY;
}
-
pageName = page.getName();
- }
- else
- {
+ } else {
pageName = m_pageName;
}
- //
- // Finally, print out the correct link, according to what
- // user commanded.
- //
- JspWriter out = pageContext.getOut();
-
- switch( m_format )
- {
- case ANCHOR:
- out.print("<a href=\""+getCommentURL(pageName)+"\">");
- break;
-
- case URL:
- out.print( getCommentURL(pageName) );
- break;
-
- default:
- throw new InternalWikiException("Impossible format "+m_format);
-
+ // Finally, print out the correct link, according to what user commanded.
+ final JspWriter out = pageContext.getOut();
+ switch( m_format ) {
+ case ANCHOR: out.print( "<a href=\"" + getCommentURL( pageName ) + "\">" ); break;
+ case URL: out.print( getCommentURL( pageName ) ); break;
+ default: throw new InternalWikiException( "Impossible format " + m_format );
}
return EVAL_BODY_INCLUDE;
}
- private String getCommentURL( String pageName )
- {
- return m_wikiContext.getURL(WikiContext.COMMENT, pageName);
+ private String getCommentURL( final String pageName ) {
+ return m_wikiContext.getURL( WikiContext.COMMENT, pageName );
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/HasAttachmentsTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/HasAttachmentsTag.java
index 1d58bbd..483f295 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/HasAttachmentsTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/HasAttachmentsTag.java
@@ -19,8 +19,8 @@
package org.apache.wiki.tags;
import org.apache.log4j.Logger;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.pages.PageManager;
@@ -39,7 +39,7 @@ public class HasAttachmentsTag extends WikiTagBase {
@Override
public final int doWikiStartTag() {
final Engine engine = m_wikiContext.getEngine();
- final WikiPage page = m_wikiContext.getPage();
+ final Page page = m_wikiContext.getPage();
final AttachmentManager mgr = engine.getManager( AttachmentManager.class );
try {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java
index b52aaf5..30d1dc7 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java
@@ -20,9 +20,9 @@ package org.apache.wiki.tags;
import org.apache.log4j.Logger;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.pages.PageManager;
@@ -51,11 +51,11 @@ public class HistoryIteratorTag extends IteratorTag {
public final int doStartTag() {
m_wikiContext = (WikiContext) pageContext.getAttribute( WikiContext.ATTR_CONTEXT, PageContext.REQUEST_SCOPE );
final Engine engine = m_wikiContext.getEngine();
- final WikiPage page = m_wikiContext.getPage();
+ final Page page = m_wikiContext.getPage();
try {
if( page != null && engine.getManager( PageManager.class ).wikiPageExists( page ) ) {
- final List< WikiPage > versions = engine.getManager( PageManager.class ).getVersionHistory( page.getName() );
+ final List< Page > versions = engine.getManager( PageManager.class ).getVersionHistory( page.getName() );
if( versions == null ) {
// There is no history
@@ -65,8 +65,8 @@ public class HistoryIteratorTag extends IteratorTag {
m_iterator = versions.iterator();
if( m_iterator.hasNext() ) {
- final WikiContext context = m_wikiContext.clone();
- context.setPage( ( WikiPage )m_iterator.next() );
+ final Context context = m_wikiContext.clone();
+ context.setPage( ( Page )m_iterator.next() );
pageContext.setAttribute( Context.ATTR_CONTEXT, context, PageContext.REQUEST_SCOPE );
pageContext.setAttribute( getId(), context.getPage() );
} else {
@@ -97,8 +97,8 @@ public class HistoryIteratorTag extends IteratorTag {
}
if( m_iterator != null && m_iterator.hasNext() ) {
- final WikiContext context = m_wikiContext.clone();
- context.setPage( ( WikiPage )m_iterator.next() );
+ final Context context = m_wikiContext.clone();
+ context.setPage( ( Page )m_iterator.next() );
pageContext.setAttribute( Context.ATTR_CONTEXT, context, PageContext.REQUEST_SCOPE );
pageContext.setAttribute( getId(), context.getPage() );
return EVAL_BODY_BUFFERED;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
index f8b36ce..d5e0259 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
@@ -19,7 +19,6 @@
package org.apache.wiki.tags;
import org.apache.log4j.Logger;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.ProviderException;
@@ -111,7 +110,7 @@ public class InsertPageTag extends WikiTagBase {
log.debug("Inserting page "+insertedPage);
final JspWriter out = pageContext.getOut();
- final WikiPage oldPage = m_wikiContext.setRealPage( insertedPage );
+ final Page oldPage = m_wikiContext.setRealPage( insertedPage );
switch( m_mode ) {
case HTML: out.print( engine.getManager( RenderingManager.class ).getHTML( m_wikiContext, insertedPage ) ); break;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java
index f94929c..08ac9fc 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java
@@ -20,8 +20,8 @@ package org.apache.wiki.tags;
import org.apache.log4j.Logger;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Context;
+import org.apache.wiki.api.core.Page;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
@@ -109,19 +109,12 @@ public abstract class IteratorTag extends BodyTagSupport implements TryCatchFina
* Arg, I hate globals.
*/
private void buildContext() {
- //
- // Build a clone of the current context
- //
- final WikiContext context = m_wikiContext.clone();
-
+ final Context context = m_wikiContext.clone();
final Object o = m_iterator.next();
- if( o instanceof WikiPage ) {
- context.setPage( (WikiPage)o );
+ if( o instanceof Page ) {
+ context.setPage( ( Page )o );
}
- //
- // Push it to the iterator stack, and set the id.
- //
pageContext.setAttribute( Context.ATTR_CONTEXT, context, PageContext.REQUEST_SCOPE );
pageContext.setAttribute( getId(), o );
}
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 872aa83..16740d8 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
@@ -20,7 +20,6 @@ package org.apache.wiki.tags;
import org.apache.log4j.Logger;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Attachment;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
@@ -173,7 +172,7 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
final Engine engine = m_wikiContext.getEngine();
if( m_pageName == null ) {
- final WikiPage page = m_wikiContext.getPage();
+ final Page page = m_wikiContext.getPage();
if( page != null ) {
m_pageName = page.getName();
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToParentTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToParentTag.java
index 6a48b83..2e59104 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToParentTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToParentTag.java
@@ -18,10 +18,10 @@
*/
package org.apache.wiki.tags;
-import java.io.IOException;
+import org.apache.wiki.api.core.Attachment;
+import org.apache.wiki.api.core.Page;
-import org.apache.wiki.WikiPage;
-import org.apache.wiki.attachment.Attachment;
+import java.io.IOException;
/**
* Writes a link to a parent of a Wiki page.
@@ -34,39 +34,25 @@ import org.apache.wiki.attachment.Attachment;
*
* @since 2.0
*/
-public class LinkToParentTag
- extends LinkToTag
-{
+public class LinkToParentTag extends LinkToTag {
+
private static final long serialVersionUID = 0L;
- public int doWikiStartTag()
- throws IOException
- {
- WikiPage p = m_wikiContext.getPage();
+ public int doWikiStartTag() throws IOException {
+ final Page p = m_wikiContext.getPage();
- //
- // We just simply set the page to be our parent page
- // and call the superclass.
- //
- if( p instanceof Attachment )
- {
+ // We just simply set the page to be our parent page and call the superclass.
+ if( p instanceof Attachment ) {
setPage( ((Attachment)p).getParentName() );
- }
- else
- {
- String name = p.getName();
-
- int entrystart = name.indexOf("_blogentry_");
-
- if( entrystart != -1 )
- {
+ } else {
+ final String name = p.getName();
+ final int entrystart = name.indexOf( "_blogentry_" );
+ if( entrystart != -1 ) {
setPage( name.substring( 0, entrystart ) );
}
- int commentstart = name.indexOf("_comments_");
-
- if( commentstart != -1 )
- {
+ final int commentstart = name.indexOf( "_comments_" );
+ if( commentstart != -1 ) {
setPage( name.substring( 0, commentstart ) );
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java
index 8e48cbc..6aba5a0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java
@@ -19,8 +19,8 @@
package org.apache.wiki.tags;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
-import org.apache.wiki.attachment.Attachment;
+import org.apache.wiki.api.core.Attachment;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.attachment.AttachmentManager;
import javax.servlet.jsp.JspWriter;
@@ -28,74 +28,62 @@ import java.io.IOException;
/**
- * Writes a link to a Wiki page. Body of the link becomes the actual text.
- * The link is written regardless to whether the page exists or not.
+ * Writes a link to a Wiki page. Body of the link becomes the actual text.
+ * The link is written regardless to whether the page exists or not.
+ * <P><B>Attributes</B></P>
+ * <UL>
+ * <LI>page - Page name to refer to. Default is the current page.
+ * <LI>format - either "anchor" or "url" to output either an <A>... or just the HREF part of one.
+ * <LI>template - Which template should we link to.
+ * <LI>title - Is used in page actions to display hover text (tooltip)
+ * <LI>accesskey - Set an accesskey (ALT+[Char])
+ * </UL>
*
- * <P><B>Attributes</B></P>
- * <UL>
- * <LI>page - Page name to refer to. Default is the current page.
- * <LI>format - either "anchor" or "url" to output either an <A>... or just the HREF part of one.
- * <LI>template - Which template should we link to.
- * <LI>title - Is used in page actions to display hover text (tooltip)
- * <LI>accesskey - Set an accesskey (ALT+[Char])
- * </UL>
- *
- * @since 2.0
+ * @since 2.0
*/
-public class LinkToTag
- extends WikiLinkTag
-{
+public class LinkToTag extends WikiLinkTag {
+
private static final long serialVersionUID = 0L;
private String m_version = null;
public String m_title = "";
public String m_accesskey = "";
- @Override public void initTag()
- {
+ @Override
+ public void initTag() {
super.initTag();
m_version = null;
}
- public String getVersion()
- {
+ public String getVersion() {
return m_version;
}
- public void setVersion( final String arg )
- {
+ public void setVersion( final String arg ) {
m_version = arg;
}
- public void setTitle( final String title )
- {
+ public void setTitle( final String title ) {
m_title = title;
}
- public void setAccesskey( final String access )
- {
+ public void setAccesskey( final String access ) {
m_accesskey = access;
}
+ @Override
+ public int doWikiStartTag() throws IOException {
+ String pageName = m_pageName;
+ boolean isattachment = false;
- @Override public int doWikiStartTag()
- throws IOException
- {
- String pageName = m_pageName;
- boolean isattachment = false;
+ if( m_pageName == null ) {
+ final Page p = m_wikiContext.getPage();
- if( m_pageName == null )
- {
- final WikiPage p = m_wikiContext.getPage();
-
- if( p != null )
- {
+ if( p != null ) {
pageName = p.getName();
isattachment = p instanceof Attachment;
- }
- else
- {
+ } else {
return SKIP_BODY;
}
}
@@ -105,37 +93,35 @@ public class LinkToTag
final String linkclass;
String forceDownload = "";
- if( isattachment )
- {
- url = m_wikiContext.getURL(WikiContext.ATTACH, pageName,
- (getVersion() != null) ? "version="+getVersion() : null );
+ if( isattachment ) {
+ url = m_wikiContext.getURL( WikiContext.ATTACH, pageName, ( getVersion() != null ) ? "version=" + getVersion() : null );
linkclass = "attachment";
- if( m_wikiContext.getEngine().getManager( AttachmentManager.class ).forceDownload( pageName ) )
- {
+ if( m_wikiContext.getEngine().getManager( AttachmentManager.class ).forceDownload( pageName ) ) {
forceDownload = "download ";
}
- }
- else
- {
- final StringBuilder params = new StringBuilder();
- if( getVersion() != null ) params.append( "version="+getVersion() );
- if( getTemplate() != null ) params.append( (params.length()>0?"&":"") + "skin="+getTemplate() );
-
- url = m_wikiContext.getURL( WikiContext.VIEW, pageName,
- params.toString() );
+ } else {
+ final StringBuilder params = new StringBuilder();
+ if( getVersion() != null ) {
+ params.append( "version=" ).append( getVersion() );
+ }
+ if( getTemplate() != null ) {
+ params.append( params.length() > 0 ? "&" : "" ).append( "skin=" ).append( getTemplate() );
+ }
+
+ url = m_wikiContext.getURL( WikiContext.VIEW, pageName, params.toString() );
linkclass = "wikipage";
}
- switch( m_format )
- {
- case ANCHOR:
- out.print("<a class=\""+linkclass+"\" href=\""+url+"\" accesskey=\""
- + m_accesskey + "\" title=\"" + m_title
- + "\" " + forceDownload + ">");
+ switch( m_format ) {
+ case ANCHOR:
+ out.print( "<a class=\"" + linkclass +
+ "\" href=\"" + url +
+ "\" accesskey=\"" + m_accesskey +
+ "\" title=\"" + m_title + "\" " + forceDownload + ">" );
break;
- case URL:
+ case URL:
out.print( url );
break;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/NextVersionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/NextVersionTag.java
index 0db9ea9..407712a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/NextVersionTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/NextVersionTag.java
@@ -18,34 +18,30 @@
*/
package org.apache.wiki.tags;
+import org.apache.wiki.api.core.Page;
+import org.apache.wiki.api.providers.WikiProvider;
+
import java.io.IOException;
-import org.apache.wiki.WikiPage;
/**
* Writes the version number of the next version of the page.
*
* @since 2.2
*/
-public class NextVersionTag
- extends WikiTagBase
-{
+public class NextVersionTag extends WikiTagBase {
+
private static final long serialVersionUID = 0L;
-
- public final int doWikiStartTag()
- throws IOException
- {
- WikiPage page = m_wikiContext.getPage();
+ public final int doWikiStartTag() throws IOException {
+ final Page page = m_wikiContext.getPage();
int version = page.getVersion();
-
- if( version == -1 )
- version = -1;
- else
+ if( version != WikiProvider.LATEST_VERSION ) {
version++;
+ }
pageContext.getOut().print( version );
-
return SKIP_BODY;
}
+
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageDateTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageDateTag.java
index 3ee4db1..5fe0d3e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageDateTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageDateTag.java
@@ -18,82 +18,68 @@
*/
package org.apache.wiki.tags;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.io.IOException;
-
-import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.preferences.Preferences.TimeFormat;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
/**
- * Writes the modification date of the page, formatted
- * as specified in the attribute "format".
+ * Writes the modification date of the page, formatted
+ * as specified in the attribute "format".
+ * <UL>
+ * <LI>format = A string describing which format you want to use.
+ * This is exactly like in "java.text.SimpleDateFormat".
+ * </UL>
*
- * <UL>
- * <LI>format = A string describing which format you want to use.
- * This is exactly like in "java.text.SimpleDateFormat".
- * </UL>
- *
- * @since 2.0
+ * @since 2.0
*/
// FIXME: Should also take the current user TimeZone into account.
-public class PageDateTag
- extends WikiTagBase
-{
+public class PageDateTag extends WikiTagBase {
+
private static final long serialVersionUID = 0L;
-
+
public static final String DEFAULT_FORMAT = "dd-MMM-yyyy HH:mm:ss zzz";
private String m_format = null;
- public void initTag()
- {
+ public void initTag() {
super.initTag();
m_format = null;
}
- public String getFormat()
- {
+ public String getFormat() {
return m_format;
}
- public void setFormat( String arg )
- {
+ public void setFormat( final String arg ) {
m_format = arg;
}
- public final int doWikiStartTag()
- throws IOException
- {
- WikiPage page = m_wikiContext.getPage();
-
- if( page != null )
- {
- Date d = page.getLastModified();
-
- //
+ public final int doWikiStartTag() throws IOException {
+ final Page page = m_wikiContext.getPage();
+ if( page != null ) {
+ final Date d = page.getLastModified();
// Date may be null if the page does not exist.
- //
- if( d != null )
- {
- SimpleDateFormat fmt;
-
- if( m_format == null )
+ if( d != null ) {
+ final SimpleDateFormat fmt;
+ if( m_format == null ) {
fmt = Preferences.getDateFormat( m_wikiContext, TimeFormat.DATETIME );
- else
+ } else {
fmt = new SimpleDateFormat( m_format );
+ }
pageContext.getOut().write( fmt.format( d ) );
- }
- else
- {
+ } else {
pageContext.getOut().write( "<never>" );
}
}
-
return SKIP_BODY;
}
+
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java
index 1ecbd73..d698874 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageInfoLinkTag.java
@@ -19,8 +19,8 @@
package org.apache.wiki.tags;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.pages.PageManager;
import javax.servlet.jsp.JspWriter;
@@ -60,7 +60,7 @@ public class PageInfoLinkTag extends WikiLinkTag {
String pageName = m_pageName;
if( m_pageName == null ) {
- final WikiPage p = m_wikiContext.getPage();
+ final Page p = m_wikiContext.getPage();
if( p != null ) {
pageName = p.getName();
} else {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageTypeTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageTypeTag.java
index d4c19f5..dfd4153 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageTypeTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageTypeTag.java
@@ -18,10 +18,10 @@
*/
package org.apache.wiki.tags;
-import java.io.IOException;
+import org.apache.wiki.api.core.Attachment;
+import org.apache.wiki.api.core.Page;
-import org.apache.wiki.WikiPage;
-import org.apache.wiki.attachment.Attachment;
+import java.io.IOException;
/**
* Includes the body, if the current page is of proper type.
@@ -33,43 +33,32 @@ import org.apache.wiki.attachment.Attachment;
*
* @since 2.0
*/
-public class PageTypeTag
- extends WikiTagBase
-{
+public class PageTypeTag extends WikiTagBase {
+
private static final long serialVersionUID = 0L;
private String m_type;
- public void initTag()
- {
+ public void initTag() {
super.initTag();
m_type = null;
}
- public void setType( String arg )
+ public void setType( final String arg )
{
m_type = arg.toLowerCase();
}
- public final int doWikiStartTag()
- throws IOException
- {
- WikiPage page = m_wikiContext.getPage();
-
- if( page != null )
- {
- if( m_type.equals("attachment") && page instanceof Attachment )
- {
+ public final int doWikiStartTag() throws IOException {
+ final Page page = m_wikiContext.getPage();
+ if( page != null ) {
+ if( m_type.equals( "attachment" ) && page instanceof Attachment ) {
return EVAL_BODY_INCLUDE;
}
-
- if( m_type.equals("page") && !(page instanceof Attachment) )
- {
+ if( m_type.equals( "page" ) && !( page instanceof Attachment ) ) {
return EVAL_BODY_INCLUDE;
}
-
- if( m_type.equals("weblogentry") && !(page instanceof Attachment) && page.getName().indexOf("_blogentry_") != -1 )
- {
+ if( m_type.equals( "weblogentry" ) && !( page instanceof Attachment ) && page.getName().contains( "_blogentry_" ) ) {
return EVAL_BODY_INCLUDE;
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageVersionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageVersionTag.java
index 6233cce..85c58cf 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageVersionTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageVersionTag.java
@@ -18,38 +18,30 @@
*/
package org.apache.wiki.tags;
+import org.apache.wiki.api.core.Page;
+
import java.io.IOException;
-import org.apache.wiki.WikiPage;
/**
- * Writes the version of the current page. If this is
- * marked as the current version, then includes body as text instead of
- * version number.
+ * Writes the version of the current page. If this is marked as the current version, then includes body as text instead of version number.
*
- * @since 2.0
+ * @since 2.0
*/
-public class PageVersionTag
- extends WikiTagBase
-{
+public class PageVersionTag extends WikiTagBase {
+
private static final long serialVersionUID = 0L;
-
- public final int doWikiStartTag()
- throws IOException
- {
- WikiPage page = m_wikiContext.getPage();
-
- if( page != null )
- {
- int version = page.getVersion();
-
- if( version > 0 )
- {
- pageContext.getOut().print( Integer.toString(version) );
+
+ public final int doWikiStartTag() throws IOException {
+ final Page page = m_wikiContext.getPage();
+ if( page != null ) {
+ final int version = page.getVersion();
+ if( version > 0 ) {
+ pageContext.getOut().print( Integer.toString( version ) );
return SKIP_BODY;
}
}
-
return EVAL_BODY_INCLUDE;
}
+
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PreviousVersionTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/PreviousVersionTag.java
index adcdf38..5c71659 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PreviousVersionTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PreviousVersionTag.java
@@ -18,36 +18,33 @@
*/
package org.apache.wiki.tags;
+import org.apache.wiki.api.core.Page;
+
import java.io.IOException;
-import org.apache.wiki.WikiPage;
/**
* Outputs the version number of the previous version of this page.
*
* @since 2.2
*/
-public class PreviousVersionTag
- extends WikiTagBase
-{
+public class PreviousVersionTag extends WikiTagBase {
+
private static final long serialVersionUID = 0L;
/**
* {@inheritDoc}
*/
@Override
- public final int doWikiStartTag()
- throws IOException
- {
- WikiPage page = m_wikiContext.getPage();
-
+ public final int doWikiStartTag() throws IOException {
+ final Page page = m_wikiContext.getPage();
int version = page.getVersion();
-
version--;
-
- if( version > 0 )
+ if( version > 0 ) {
pageContext.getOut().print( version );
+ }
return SKIP_BODY;
}
+
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tasks/pages/SaveWikiPageTask.java b/jspwiki-main/src/main/java/org/apache/wiki/tasks/pages/SaveWikiPageTask.java
index dde704c..3f83d08 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tasks/pages/SaveWikiPageTask.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tasks/pages/SaveWikiPageTask.java
@@ -18,9 +18,9 @@
*/
package org.apache.wiki.tasks.pages;
-import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.filters.FilterManager;
import org.apache.wiki.pages.PageManager;
@@ -51,11 +51,11 @@ public class SaveWikiPageTask extends Task {
@Override
public Outcome execute() throws WikiException {
// Retrieve attributes
- final WikiContext context = ( WikiContext ) getWorkflow().getAttribute( WorkflowManager.WF_WP_SAVE_ATTR_PRESAVE_WIKI_CONTEXT );
+ final Context context = ( Context ) getWorkflow().getAttribute( WorkflowManager.WF_WP_SAVE_ATTR_PRESAVE_WIKI_CONTEXT );
final String proposedText = (String) getWorkflow().getAttribute( WorkflowManager.WF_WP_SAVE_FACT_PROPOSED_TEXT );
final Engine engine = context.getEngine();
- final WikiPage page = context.getPage();
+ final Page page = context.getPage();
// Let the rest of the engine handle actual saving.
engine.getManager( PageManager.class ).putPageText( page, proposedText );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/IfPluginTest.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/IfPluginTest.java
index 4560e93..f737cbe 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/IfPluginTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/IfPluginTest.java
@@ -21,7 +21,6 @@ package org.apache.wiki.plugin;
import net.sourceforge.stripes.mock.MockHttpServletRequest;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.wiki.WikiSession;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.core.Session;
@@ -47,8 +46,8 @@ public class IfPluginTest {
/**
* Returns a {@link WikiContext} for the given page, with user {@link Users#JANNE} logged in.
*
- * @param page given {@link WikiPage}.
- * @return {@link WikiContext} associated to given {@link WikiPage}.
+ * @param page given {@link Page}.
+ * @return {@link WikiContext} associated to given {@link Page}.
* @throws WikiException problems while logging in.
*/
WikiContext getJanneBasedWikiContextFor( final Page page ) throws WikiException {