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
The following commit(s) were added to refs/heads/master by this push:
new 1f1a47440 Missing @override.
1f1a47440 is described below
commit 1f1a47440f9a3080ea1cebccbb257ef858a5f0c9
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Fri Jul 15 23:06:35 2022 +0200
Missing @override.
---
.../apache/wiki/api/filters/BasicPageFilter.java | 15 ++++++++-----
.../engine/EngineLifecycleExtensionTestImpl.java | 9 +++++---
.../org/apache/wiki/event/WikiPageRenameEvent.java | 2 ++
.../main/java/org/apache/wiki/LinkCollector.java | 3 ++-
.../src/main/java/org/apache/wiki/WikiContext.java | 2 ++
.../src/main/java/org/apache/wiki/WikiPage.java | 4 +++-
.../org/apache/wiki/attachment/Attachment.java | 9 ++++++--
.../java/org/apache/wiki/auth/GroupPrincipal.java | 1 +
.../org/apache/wiki/auth/acl/AclEntryImpl.java | 14 ++++++++----
.../apache/wiki/auth/acl/UnresolvedPrincipal.java | 1 +
.../java/org/apache/wiki/auth/authorize/Role.java | 1 +
.../wiki/auth/login/AbstractLoginModule.java | 7 +++++-
.../wiki/auth/login/AnonymousLoginModule.java | 1 +
.../auth/login/CookieAssertionLoginModule.java | 1 +
.../apache/wiki/auth/login/PrincipalWrapper.java | 1 +
.../wiki/auth/login/UserDatabaseLoginModule.java | 1 +
.../wiki/auth/login/WebContainerLoginModule.java | 1 +
.../wiki/auth/permissions/AllPermission.java | 5 ++++-
.../auth/permissions/AllPermissionCollection.java | 5 ++++-
.../wiki/auth/permissions/GroupPermission.java | 2 ++
.../wiki/auth/permissions/PagePermission.java | 4 +++-
.../wiki/auth/permissions/WikiPermission.java | 3 +++
.../org/apache/wiki/pages/PageTimeComparator.java | 3 ++-
.../org/apache/wiki/render/CleanTextRenderer.java | 1 +
.../org/apache/wiki/render/CreoleRenderer.java | 1 +
.../wiki/render/CustomXMLOutputProcessor.java | 3 ++-
.../apache/wiki/render/WysiwygEditingRenderer.java | 1 +
.../java/org/apache/wiki/render/XHTMLRenderer.java | 1 +
.../java/org/apache/wiki/search/SearchResult.java | 1 +
.../apache/wiki/search/SearchResultComparator.java | 3 ++-
.../main/java/org/apache/wiki/tags/CookieTag.java | 2 ++
.../org/apache/wiki/tags/EditorIteratorInfo.java | 1 +
.../org/apache/wiki/tags/HistoryIteratorInfo.java | 3 ++-
.../org/apache/wiki/tags/IfNoSearchResultsTag.java | 1 +
.../org/apache/wiki/tags/IncludeResourcesTag.java | 2 ++
.../java/org/apache/wiki/tags/LinkToParentTag.java | 1 +
.../java/org/apache/wiki/tags/NextVersionTag.java | 1 +
.../java/org/apache/wiki/tags/PageDateTag.java | 2 ++
.../java/org/apache/wiki/tags/PageExistsTag.java | 1 +
.../java/org/apache/wiki/tags/PageTypeTag.java | 2 ++
.../java/org/apache/wiki/tags/PageVersionTag.java | 1 +
.../apache/wiki/tags/SearchResultIteratorInfo.java | 3 ++-
.../org/apache/wiki/tags/SearchResultsSizeTag.java | 1 +
.../org/apache/wiki/tags/SearchResultsTag.java | 1 +
.../org/apache/wiki/tags/SetPaginationTag.java | 2 ++
.../src/main/java/org/apache/wiki/tags/TabTag.java | 3 +++
.../java/org/apache/wiki/tags/TemplateDirTag.java | 1 +
.../java/org/apache/wiki/tags/WikiBodyTag.java | 5 ++++-
.../java/org/apache/wiki/tags/WikiLinkTag.java | 4 +++-
.../java/org/apache/wiki/tags/WikiTagBase.java | 2 ++
.../java/org/apache/wiki/ui/AbstractCommand.java | 9 +++++++-
.../main/java/org/apache/wiki/ui/GroupCommand.java | 5 ++++-
.../main/java/org/apache/wiki/ui/PageCommand.java | 5 ++++-
.../java/org/apache/wiki/ui/RedirectCommand.java | 5 ++++-
.../wiki/ui/progress/DefaultProgressManager.java | 9 ++++++--
.../org/apache/wiki/workflow/AbstractStep.java | 25 +++++++++++++++++-----
.../java/org/apache/wiki/workflow/Decision.java | 4 +++-
.../apache/wiki/workflow/SimpleNotification.java | 1 +
.../org/apache/wiki/workflow/SystemPrincipal.java | 1 +
.../main/java/org/apache/wiki/workflow/Task.java | 1 +
jspwiki-main/src/test/java/SamplePlugin2.java | 3 ++-
.../org/apache/wiki/auth/SecurityEventTrap.java | 1 +
.../java/org/apache/wiki/plugin/SamplePlugin3.java | 3 ++-
.../java/org/apache/wiki/web/TestContainer.java | 1 +
.../java/org/apache/wiki/workflow/TaskTest.java | 6 ++++--
.../main/java/org/apache/wiki/util/MailUtil.java | 1 +
.../java/org/apache/wiki/util/PriorityList.java | 3 +++
.../wiki/util/comparators/CollatorComparator.java | 1 +
.../wiki/util/comparators/HumanComparator.java | 1 +
.../util/comparators/JavaNaturalComparator.java | 1 +
70 files changed, 188 insertions(+), 43 deletions(-)
diff --git
a/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java
b/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java
index dc44e28d2..10b25af73 100644
---
a/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java
+++
b/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java
@@ -52,7 +52,8 @@ public class BasicPageFilter extends BasePageFilter {
return content;
}
- public String preTranslate( final Context wikiContext, final String
content ) throws FilterException {
+ @Override
+ public String preTranslate(final Context wikiContext, final String content
) throws FilterException {
final Method m = methodOfNonPublicAPI( this, "preTranslate",
"org.apache.wiki.WikiContext", "java.lang.String" );
return executePageFilterPhase( () -> content, m, this, wikiContext,
content );
// return content;
@@ -62,7 +63,8 @@ public class BasicPageFilter extends BasePageFilter {
return htmlContent;
}
- public String postTranslate( final Context wikiContext, final String
htmlContent ) throws FilterException {
+ @Override
+ public String postTranslate(final Context wikiContext, final String
htmlContent ) throws FilterException {
final Method m = methodOfNonPublicAPI( this, "postTranslate",
"org.apache.wiki.WikiContext", "java.lang.String" );
return executePageFilterPhase( () -> htmlContent, m, this,
wikiContext, htmlContent );
// return htmlContent;
@@ -72,7 +74,8 @@ public class BasicPageFilter extends BasePageFilter {
return content;
}
- public String preSave( final Context wikiContext, final String content )
throws FilterException {
+ @Override
+ public String preSave(final Context wikiContext, final String content )
throws FilterException {
final Method m = methodOfNonPublicAPI( this, "preSave",
"org.apache.wiki.WikiContext", "java.lang.String" );
return executePageFilterPhase( () -> content, m, this, wikiContext,
content );
// return content;
@@ -81,7 +84,8 @@ public class BasicPageFilter extends BasePageFilter {
public void postSave( final WikiContext wikiContext, final String content
) throws FilterException {
}
- public void postSave( final Context wikiContext, final String content )
throws FilterException {
+ @Override
+ public void postSave(final Context wikiContext, final String content )
throws FilterException {
final Method m = methodOfNonPublicAPI( this, "postSave",
"org.apache.wiki.WikiContext", "java.lang.String" );
executePageFilterPhase( () -> null, m, this, wikiContext, content );
// empty method
@@ -90,7 +94,8 @@ public class BasicPageFilter extends BasePageFilter {
public void destroy( final WikiEngine engine ) {
}
- public void destroy( final Engine engine ) {
+ @Override
+ public void destroy(final Engine engine ) {
final Method m = methodOfNonPublicAPI( this, "destroy",
"org.apache.wiki.WikiEngine" );
executePageFilterPhase( () -> null, m, this, engine );
// empty method
diff --git
a/jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTestImpl.java
b/jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTestImpl.java
index 5dbfddc03..193e09d11 100644
---
a/jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTestImpl.java
+++
b/jspwiki-api/src/test/java/org/apache/wiki/api/engine/EngineLifecycleExtensionTestImpl.java
@@ -25,17 +25,20 @@ import java.util.Properties;
public class EngineLifecycleExtensionTestImpl implements
EngineLifecycleExtension {
/** {@inheritDoc */
- public void onInit( final Properties properties ) {
+ @Override
+ public void onInit(final Properties properties ) {
properties.put( "test", "onInit" );
}
/** {@inheritDoc */
- public void onStart( final Engine e, final Properties properties ) {
+ @Override
+ public void onStart(final Engine e, final Properties properties ) {
properties.put( "test", "onStart" );
}
/** {@inheritDoc */
- public void onShutdown( final Engine e, final Properties properties ) {
+ @Override
+ public void onShutdown(final Engine e, final Properties properties ) {
properties.put( "test", "onShutdown" );
}
diff --git
a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
index e1a54be8c..8d6696ea6 100644
--- a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
+++ b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
@@ -81,6 +81,7 @@ public class WikiPageRenameEvent extends WikiPageEvent {
*
* @return a String representation of the type
*/
+ @Override
public String eventName() {
return "PAGE_RENAMED";
// switch ( getType() )
@@ -94,6 +95,7 @@ public class WikiPageRenameEvent extends WikiPageEvent {
/** Returns a human-readable description of the event type.
* @return a String description of the type
*/
+ @Override
public String getTypeDescription() {
return "page renamed event";
// switch ( getType() )
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/LinkCollector.java
b/jspwiki-main/src/main/java/org/apache/wiki/LinkCollector.java
index dd5fc5488..809b8c99f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/LinkCollector.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/LinkCollector.java
@@ -42,7 +42,8 @@ public class LinkCollector implements StringTransmutator {
/**
* {@inheritDoc}
*/
- public String mutate( final Context context, final String in ) {
+ @Override
+ public String mutate(final Context context, final String in ) {
m_items.add( in );
return in;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
index 0a4a8a1d4..640b9ae90 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
@@ -592,6 +592,7 @@ public class WikiContext implements Context, Command {
*
* @return the command
*/
+ @Override
public Command getCommand() {
return m_command;
}
@@ -631,6 +632,7 @@ public class WikiContext implements Context, Command {
* @since 2.8.0
* @return A deep clone of the WikiContext.
*/
+ @Override
@SuppressWarnings("unchecked")
public WikiContext deepClone() {
try {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
b/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
index 770938d8b..44f308795 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
@@ -202,6 +202,7 @@ public class WikiPage implements Page {
*
* @return The access control list. May return null, if there is no acl.
*/
+ @Override
public Acl getAcl() {
return m_accessList;
}
@@ -227,7 +228,8 @@ public class WikiPage implements Page {
*
* @param acl The Acl to set
*/
- public void setAcl( final org.apache.wiki.api.core.Acl acl ) {
+ @Override
+ public void setAcl(final org.apache.wiki.api.core.Acl acl ) {
m_accessList = ( Acl )acl;
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/attachment/Attachment.java
b/jspwiki-main/src/main/java/org/apache/wiki/attachment/Attachment.java
index 05db02554..4493a80f0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/Attachment.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/Attachment.java
@@ -73,6 +73,7 @@ public class Attachment extends WikiPage implements
org.apache.wiki.api.core.Att
*
* @return A String with the file name.
*/
+ @Override
public String getFileName() {
return m_fileName;
}
@@ -82,7 +83,8 @@ public class Attachment extends WikiPage implements
org.apache.wiki.api.core.Att
*
* @param name The name of the attachment. Must be a legal file name
without the path.
*/
- public void setFileName( final String name ) {
+ @Override
+ public void setFileName(final String name ) {
m_fileName = name;
}
@@ -91,6 +93,7 @@ public class Attachment extends WikiPage implements
org.apache.wiki.api.core.Att
*
* @return String depicting the parent of the attachment.
*/
+ @Override
public String getParentName() {
return m_parentName;
}
@@ -101,6 +104,7 @@ public class Attachment extends WikiPage implements
org.apache.wiki.api.core.Att
* @return False, if the attachment should not be cached by the user agent.
* @since 2.5.34
*/
+ @Override
public boolean isCacheable() {
return m_cacheable;
}
@@ -112,7 +116,8 @@ public class Attachment extends WikiPage implements
org.apache.wiki.api.core.Att
* @param value True or false, depending on whether you want this
attachment to be cacheable or not.
* @since 2.5.34
*/
- public void setCacheable( final boolean value ) {
+ @Override
+ public void setCacheable(final boolean value ) {
m_cacheable = value;
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/GroupPrincipal.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/GroupPrincipal.java
index 1bad8b00b..718dff412 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/GroupPrincipal.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/GroupPrincipal.java
@@ -57,6 +57,7 @@ public final class GroupPrincipal implements Principal,
Serializable
* @return the name
* @see java.security.Principal#getName()
*/
+ @Override
public String getName()
{
return m_name;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
index 3e5c056b8..87cdac7b1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
@@ -52,7 +52,8 @@ public class AclEntryImpl implements AclEntry, Serializable {
* @return <code>true</code> if the permission was added,
<code>false</code> if the permission was
* already part of this entry's permission set, and <code>false</code> if
the permission is not of type PagePermission
*/
- public synchronized boolean addPermission( final Permission permission ) {
+ @Override
+ public synchronized boolean addPermission(final Permission permission ) {
if( permission instanceof PagePermission && findPermission( permission
) == null ) {
m_permissions.add( permission );
return true;
@@ -67,7 +68,8 @@ public class AclEntryImpl implements AclEntry, Serializable {
* @param permission the permission to be checked for.
* @return true if the permission is part of the permission set in this
entry, false otherwise.
*/
- public boolean checkPermission( final Permission permission ) {
+ @Override
+ public boolean checkPermission(final Permission permission ) {
return findPermission( permission ) != null;
}
@@ -77,6 +79,7 @@ public class AclEntryImpl implements AclEntry, Serializable {
*
* @return the principal associated with this entry.
*/
+ @Override
public synchronized Principal getPrincipal() {
return m_principal;
}
@@ -86,6 +89,7 @@ public class AclEntryImpl implements AclEntry, Serializable {
*
* @return an enumeration of the permissions
*/
+ @Override
public Enumeration< Permission > permissions() {
return m_permissions.elements();
}
@@ -96,7 +100,8 @@ public class AclEntryImpl implements AclEntry, Serializable {
* @param permission the permission to be removed from this entry.
* @return true if the permission is removed, false if the permission was
not part of this entry's permission set.
*/
- public synchronized boolean removePermission( final Permission permission
) {
+ @Override
+ public synchronized boolean removePermission(final Permission permission )
{
final Permission p = findPermission( permission );
if( p != null ) {
m_permissions.remove( p );
@@ -114,7 +119,8 @@ public class AclEntryImpl implements AclEntry, Serializable
{
* @return true if the principal is set, false if there was already a
* principal set for this entry
*/
- public synchronized boolean setPrincipal( final Principal user ) {
+ @Override
+ public synchronized boolean setPrincipal(final Principal user ) {
if( m_principal != null || user == null ) {
return false;
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
index 97c87885e..65a7967e6 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/UnresolvedPrincipal.java
@@ -52,6 +52,7 @@ public final class UnresolvedPrincipal implements Principal,
Serializable
* @return the name
* @see java.security.Principal#getName()
*/
+ @Override
public String getName()
{
return m_name;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Role.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Role.java
index 1aacfb6a6..7ed2478e5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Role.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Role.java
@@ -118,6 +118,7 @@ public final class Role implements Principal, Serializable
* Returns the name of the Principal.
* @return the name of the Role
*/
+ @Override
public String getName()
{
return m_name;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java
index 731b7f40e..641d1e614 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AbstractLoginModule.java
@@ -70,6 +70,7 @@ public abstract class AbstractLoginModule implements
LoginModule {
* @see javax.security.auth.spi.LoginModule#abort()
* @return True, always.
*/
+ @Override
public final boolean abort()
{
removePrincipals( m_principals );
@@ -96,6 +97,7 @@ public abstract class AbstractLoginModule implements
LoginModule {
* failed
* @see javax.security.auth.spi.LoginModule#commit()
*/
+ @Override
public final boolean commit() {
if ( succeeded() ) {
for ( final Principal principal : m_principals ) {
@@ -126,7 +128,8 @@ public abstract class AbstractLoginModule implements
LoginModule {
* @param sharedState {@inheritDoc}
* @param options {@inheritDoc}
*/
- public final void initialize( final Subject subject, final CallbackHandler
callbackHandler, final Map<String,?> sharedState, final Map<String,?> options )
{
+ @Override
+ public final void initialize(final Subject subject, final CallbackHandler
callbackHandler, final Map<String,?> sharedState, final Map<String,?> options )
{
m_principals = new HashSet<>();
m_subject = subject;
m_handler = callbackHandler;
@@ -149,6 +152,7 @@ public abstract class AbstractLoginModule implements
LoginModule {
* @throws LoginException if the authentication fails
* @see javax.security.auth.spi.LoginModule#login()
*/
+ @Override
public abstract boolean login() throws LoginException;
/**
@@ -158,6 +162,7 @@ public abstract class AbstractLoginModule implements
LoginModule {
* <code>false</code> if this LoginModule should be ignored
* @see javax.security.auth.spi.LoginModule#logout()
*/
+ @Override
public final boolean logout() {
removePrincipals( m_principals );
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java
index 3051d0837..6da91a51f 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/AnonymousLoginModule.java
@@ -71,6 +71,7 @@ public class AnonymousLoginModule extends AbstractLoginModule
* @see javax.security.auth.spi.LoginModule#login()
* @throws LoginException if unable to handle callback
*/
+ @Override
public boolean login() throws LoginException
{
// Let's go and make a Principal based on the IP address
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
index bfdb7574f..ac626b1e7 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/CookieAssertionLoginModule.java
@@ -73,6 +73,7 @@ public class CookieAssertionLoginModule extends
AbstractLoginModule {
* method throws a <code>FailedLoginException</code>.
* @see javax.security.auth.spi.LoginModule#login()
*/
+ @Override
public boolean login() throws LoginException {
// Otherwise, let's go and look for the cookie!
final HttpRequestCallback hcb = new HttpRequestCallback();
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java
index 99f4ff67f..974a5a864 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/PrincipalWrapper.java
@@ -53,6 +53,7 @@ public final class PrincipalWrapper implements Principal
*
* @return The name of the wrapped principal.
*/
+ @Override
public String getName()
{
return m_principal.getName();
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java
index 9a7a58548..97f1a8dce 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/UserDatabaseLoginModule.java
@@ -62,6 +62,7 @@ public class UserDatabaseLoginModule extends
AbstractLoginModule {
*
* {@inheritDoc}
*/
+ @Override
public boolean login() throws LoginException
{
final UserDatabaseCallback ucb = new UserDatabaseCallback();
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
index 3aef9ea4e..68f3c8dd1 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WebContainerLoginModule.java
@@ -69,6 +69,7 @@ public class WebContainerLoginModule extends
AbstractLoginModule {
* @return {@inheritDoc}
* @throws LoginException {@inheritDoc}
*/
+ @Override
public boolean login() throws LoginException
{
final HttpRequestCallback rcb = new HttpRequestCallback();
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
index fe502da37..8a12a41c8 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
@@ -73,6 +73,7 @@ public final class AllPermission extends Permission
implements Serializable {
* @return Always null.
* @see java.security.Permission#getActions()
*/
+ @Override
public String getActions() {
return null;
}
@@ -109,7 +110,8 @@ public final class AllPermission extends Permission
implements Serializable {
* <code>false</code> otherwise
* @see java.security.Permission#implies(java.security.Permission)
*/
- public boolean implies( final Permission permission ) {
+ @Override
+ public boolean implies(final Permission permission ) {
// Permission must be a JSPWiki permission, PagePermission or
AllPermission
if( !PermissionChecks.isJSPWikiPermission( permission ) ) {
return false;
@@ -137,6 +139,7 @@ public final class AllPermission extends Permission
implements Serializable {
* @return {@inheritDoc}
* @see java.security.Permission#newPermissionCollection()
*/
+ @Override
public PermissionCollection newPermissionCollection() {
return new AllPermissionCollection();
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java
index 6d6566ddd..152ecea70 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/AllPermissionCollection.java
@@ -96,7 +96,8 @@ public class AllPermissionCollection extends
PermissionCollection
*
* @return {@inheritDoc}
*/
- public boolean implies( final Permission permission )
+ @Override
+ public boolean implies(final Permission permission )
{
// If nothing in the collection yet, fail fast
if ( !m_notEmpty )
@@ -126,6 +127,7 @@ public class AllPermissionCollection extends
PermissionCollection
/**
* {@inheritDoc}
*/
+ @Override
public boolean isReadOnly()
{
return m_readOnly;
@@ -134,6 +136,7 @@ public class AllPermissionCollection extends
PermissionCollection
/**
* @see java.security.PermissionCollection#setReadOnly()
*/
+ @Override
public void setReadOnly()
{
m_readOnly = true;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
index 7731e6c18..cef601ab1 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
@@ -208,6 +208,7 @@ public final class GroupPermission extends Permission
implements Serializable
* @return the actions
* @see java.security.Permission#getActions()
*/
+ @Override
public String getActions()
{
return m_actionString;
@@ -269,6 +270,7 @@ public final class GroupPermission extends Permission
implements Serializable
* supplied Permission; <code>false</code> otherwise
* @see java.security.Permission#implies(java.security.Permission)
*/
+ @Override
public boolean implies(final Permission permission )
{
// Permission must be a GroupPermission
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
index 8e6b5786a..c3524d224 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
@@ -235,6 +235,7 @@ public final class PagePermission extends Permission
implements Serializable
*
* @return {@inheritDoc}
*/
+ @Override
public String getActions()
{
return m_actionString;
@@ -294,7 +295,8 @@ public final class PagePermission extends Permission
implements Serializable
* @param permission {@inheritDoc}
* @return {@inheritDoc}
*/
- public boolean implies( final Permission permission )
+ @Override
+ public boolean implies(final Permission permission )
{
// Permission must be a PagePermission
if ( !( permission instanceof PagePermission ) )
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
index af475e82c..c949c5536 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
@@ -137,6 +137,7 @@ public final class WikiPermission extends Permission
implements Serializable
* @return the actions
* @see java.security.Permission#getActions()
*/
+ @Override
public String getActions()
{
return m_actionString;
@@ -172,6 +173,7 @@ public final class WikiPermission extends Permission
implements Serializable
* <code>false</code> otherwise
* @see java.security.Permission#implies(java.security.Permission)
*/
+ @Override
public boolean implies(final Permission permission )
{
// Permission must be a WikiPermission
@@ -195,6 +197,7 @@ public final class WikiPermission extends Permission
implements Serializable
* Returns a new {@link AllPermissionCollection}.
* @return {@inheritDoc}
*/
+ @Override
public PermissionCollection newPermissionCollection()
{
return new AllPermissionCollection();
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageTimeComparator.java
b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageTimeComparator.java
index 7def64ad9..01803d3a9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageTimeComparator.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageTimeComparator.java
@@ -39,7 +39,8 @@ public class PageTimeComparator implements Comparator< Page
>, Serializable {
/**
* {@inheritDoc}
*/
- public int compare( final Page p1, final Page p2 ) {
+ @Override
+ public int compare(final Page p1, final Page p2 ) {
if( p1 == null || p2 == null ) {
LOG.error( "W1 or W2 is NULL in PageTimeComparator!");
return 0; // FIXME: Is this correct?
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/render/CleanTextRenderer.java
b/jspwiki-main/src/main/java/org/apache/wiki/render/CleanTextRenderer.java
index e3e967383..e720c396e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/render/CleanTextRenderer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/render/CleanTextRenderer.java
@@ -43,6 +43,7 @@ public class CleanTextRenderer extends WikiRenderer {
/**
* {@inheritDoc}
*/
+ @Override
public String getString() {
return m_document != null ? XmlUtil.extractTextFromDocument(
m_document.getDocument() ) : "";
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/render/CreoleRenderer.java
b/jspwiki-main/src/main/java/org/apache/wiki/render/CreoleRenderer.java
index 3c40cdbb6..263295204 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/render/CreoleRenderer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/render/CreoleRenderer.java
@@ -156,6 +156,7 @@ public class CreoleRenderer extends WikiRenderer {
/**
* {@inheritDoc}
*/
+ @Override
public String getString() {
final StringBuilder sb = new StringBuilder(1000);
final Element ce = m_document.getRootElement();
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java
b/jspwiki-main/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java
index de5cb56a4..9ec941236 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/render/CustomXMLOutputProcessor.java
@@ -33,7 +33,8 @@ import java.io.Writer;
*/
public class CustomXMLOutputProcessor extends AbstractXMLOutputProcessor {
- protected void attributeEscapedEntitiesFilter( final Writer out, final
FormatStack fstack, final String value ) throws IOException {
+ @Override
+ protected void attributeEscapedEntitiesFilter(final Writer out, final
FormatStack fstack, final String value ) throws IOException {
write( out, Format.escapeAttribute( fstack.getEscapeStrategy(), value
) );
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java
b/jspwiki-main/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java
index 4fc389451..995011d90 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/render/WysiwygEditingRenderer.java
@@ -132,6 +132,7 @@ public class WysiwygEditingRenderer extends WikiRenderer {
/**
* {@inheritDoc}
*/
+ @Override
public String getString() throws IOException {
final Element rootElement = m_document.getRootElement();
processChildren( rootElement );
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/render/XHTMLRenderer.java
b/jspwiki-main/src/main/java/org/apache/wiki/render/XHTMLRenderer.java
index 93f0afa91..cf81ce8dd 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/render/XHTMLRenderer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/render/XHTMLRenderer.java
@@ -50,6 +50,7 @@ public class XHTMLRenderer extends WikiRenderer {
/**
* {@inheritDoc}
*/
+ @Override
public String getString() throws IOException {
m_document.setContext( m_context );
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResult.java
b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResult.java
index dbb93ceaa..a2a19f5fc 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResult.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResult.java
@@ -35,6 +35,7 @@ public interface SearchResult extends
org.apache.wiki.api.search.SearchResult {
*
* @return the WikiPage object containing this result
*/
+ @Override
WikiPage getPage();
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResultComparator.java
b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResultComparator.java
index cbc45183f..7a2a58f62 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResultComparator.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchResultComparator.java
@@ -36,7 +36,8 @@ public class SearchResultComparator implements Comparator<
SearchResult >, Seria
*
* {@inheritDoc}
*/
- public int compare( final SearchResult s1, final SearchResult s2 ) {
+ @Override
+ public int compare(final SearchResult s1, final SearchResult s2 ) {
// Bigger scores are first.
int res = s2.getScore() - s1.getScore();
if( res == 0 ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
index 607c6c75a..d41c3e647 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
@@ -177,6 +177,7 @@ public class CookieTag
/**
* {@inheritDoc}
*/
+ @Override
public void release()
{
m_name = m_item = m_var = m_value = m_clear = m_scope = null;
@@ -214,6 +215,7 @@ public class CookieTag
/**
* {@inheritDoc}
*/
+ @Override
public int doEndTag()
{
String out = null;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
index ba0685209..1da79cad2 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
@@ -29,6 +29,7 @@ import javax.servlet.jsp.tagext.VariableInfo;
*/
public class EditorIteratorInfo extends TagExtraInfo
{
+ @Override
public VariableInfo[] getVariableInfo(final TagData data)
{
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
index 1afa6ca12..374902736 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
@@ -29,7 +29,8 @@ import javax.servlet.jsp.tagext.VariableInfo;
*/
public class HistoryIteratorInfo extends TagExtraInfo
{
- public VariableInfo[] getVariableInfo( final TagData data)
+ @Override
+ public VariableInfo[] getVariableInfo(final TagData data)
{
return new VariableInfo[]{ new VariableInfo(
data.getAttributeString("id"),
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
index 334f021ed..1215fb5a2 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IfNoSearchResultsTag.java
@@ -31,6 +31,7 @@ import javax.servlet.jsp.PageContext;
public class IfNoSearchResultsTag extends WikiTagBase {
private static final long serialVersionUID = 0L;
+ @Override
public final int doWikiStartTag() throws IOException {
final Collection< ? > list = (Collection< ?
>)pageContext.getAttribute( "searchresults", PageContext.REQUEST_SCOPE );
if( list == null || list.size() == 0 ) {
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeResourcesTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeResourcesTag.java
index 88c4cde21..b61fa049c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeResourcesTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/IncludeResourcesTag.java
@@ -34,6 +34,7 @@ public class IncludeResourcesTag extends WikiTagBase
private String m_type;
+ @Override
public void initTag()
{
super.initTag();
@@ -45,6 +46,7 @@ public class IncludeResourcesTag extends WikiTagBase
m_type = type;
}
+ @Override
public int doWikiStartTag() throws Exception
{
//String marker =
m_wikiContext.getEngine().getTemplateManager().getMarker(m_wikiContext, m_type);
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 2e59104f7..6833a89de 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
@@ -38,6 +38,7 @@ public class LinkToParentTag extends LinkToTag {
private static final long serialVersionUID = 0L;
+ @Override
public int doWikiStartTag() throws IOException {
final Page p = m_wikiContext.getPage();
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 407712a76..068c1cdd6 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
@@ -33,6 +33,7 @@ public class NextVersionTag extends WikiTagBase {
private static final long serialVersionUID = 0L;
+ @Override
public final int doWikiStartTag() throws IOException {
final Page page = m_wikiContext.getPage();
int version = page.getVersion();
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 25c571bf6..5c5f006f9 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
@@ -48,6 +48,7 @@ public class PageDateTag extends WikiTagBase {
private String m_format;
+ @Override
public void initTag() {
super.initTag();
m_format = null;
@@ -61,6 +62,7 @@ public class PageDateTag extends WikiTagBase {
m_format = arg;
}
+ @Override
public final int doWikiStartTag() throws IOException {
final Page page = m_wikiContext.getPage();
if( page != null ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageExistsTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageExistsTag.java
index 6f82ce54b..14cb7d7f9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/PageExistsTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/PageExistsTag.java
@@ -35,6 +35,7 @@ public class PageExistsTag
{
private static final long serialVersionUID = 0L;
+ @Override
public final int doWikiStartTag()
throws IOException,
ProviderException
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 dfd4153ae..f558d16b7 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
@@ -39,6 +39,7 @@ public class PageTypeTag extends WikiTagBase {
private String m_type;
+ @Override
public void initTag() {
super.initTag();
m_type = null;
@@ -49,6 +50,7 @@ public class PageTypeTag extends WikiTagBase {
m_type = arg.toLowerCase();
}
+ @Override
public final int doWikiStartTag() throws IOException {
final Page page = m_wikiContext.getPage();
if( page != null ) {
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 85c58cf8e..5b79aa2ae 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
@@ -32,6 +32,7 @@ public class PageVersionTag extends WikiTagBase {
private static final long serialVersionUID = 0L;
+ @Override
public final int doWikiStartTag() throws IOException {
final Page page = m_wikiContext.getPage();
if( page != null ) {
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
index fbdfe33c2..4ee2e3f27 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
@@ -30,7 +30,8 @@ import javax.servlet.jsp.tagext.VariableInfo;
*/
public class SearchResultIteratorInfo extends TagExtraInfo {
- public VariableInfo[] getVariableInfo( final TagData data ) {
+ @Override
+ public VariableInfo[] getVariableInfo(final TagData data ) {
return new VariableInfo[]{ new VariableInfo( data.getAttributeString(
"id" ),
"org.apache.wiki.api.search.SearchResult",
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java
index e966ce815..a7095f80d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsSizeTag.java
@@ -33,6 +33,7 @@ public class SearchResultsSizeTag
{
private static final long serialVersionUID = 0L;
+ @Override
public final int doWikiStartTag() throws IOException {
final Collection< ? > list = ( Collection< ? >
)pageContext.getAttribute( "searchresults", PageContext.REQUEST_SCOPE );
if( list != null ) {
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java
index 7b5a150ef..96ac7ef7b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultsTag.java
@@ -31,6 +31,7 @@ import javax.servlet.jsp.PageContext;
public class SearchResultsTag extends WikiTagBase {
private static final long serialVersionUID = 0L;
+ @Override
public final int doWikiStartTag() throws IOException {
final Collection< ? > list = ( Collection< ? >
)pageContext.getAttribute( "searchresults", PageContext.REQUEST_SCOPE );
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
index 6a3b2d3fd..6b3e105ea 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
@@ -69,6 +69,7 @@ public class SetPaginationTag
private String m_href;
private String m_onclick;
+ @Override
public void initTag()
{
super.initTag();
@@ -122,6 +123,7 @@ public class SetPaginationTag
// 0 20 40 60 80 next last
// first previous 20 40 *60* 80 100 next last
// fist previous 40 60 80 100 120
+ @Override
public int doWikiStartTag()
throws IOException
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
index 92fdccea8..e93760e8a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/TabTag.java
@@ -56,6 +56,7 @@ public class TabTag extends WikiTagBase
/**
* {@inheritDoc}
*/
+ @Override
public void doFinally()
{
super.doFinally();
@@ -109,6 +110,7 @@ public class TabTag extends WikiTagBase
/**
* {@inheritDoc}
*/
+ @Override
public int doWikiStartTag() throws JspTagException
{
final TabbedSectionTag parent=(TabbedSectionTag)findAncestorWithClass(
this, TabbedSectionTag.class );
@@ -156,6 +158,7 @@ public class TabTag extends WikiTagBase
/**
* {@inheritDoc}
*/
+ @Override
public int doEndTag() throws JspTagException
{
final TabbedSectionTag parent=(TabbedSectionTag)findAncestorWithClass(
this, TabbedSectionTag.class );
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/TemplateDirTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/TemplateDirTag.java
index a215064fe..9c19f48d1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/TemplateDirTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/TemplateDirTag.java
@@ -31,6 +31,7 @@ public class TemplateDirTag
{
private static final long serialVersionUID = 0L;
+ @Override
public final int doWikiStartTag()
throws IOException
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java
index dc6a2fef1..39bafbd24 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiBodyTag.java
@@ -40,6 +40,7 @@ public abstract class WikiBodyTag extends BodyTagSupport
implements TryCatchFina
protected WikiContext m_wikiContext;
private static final Logger LOG = LogManager.getLogger( WikiBodyTag.class
);
+ @Override
public int doStartTag() throws JspException {
try {
m_wikiContext = (WikiContext) pageContext.getAttribute(
Context.ATTR_CONTEXT, PageContext.REQUEST_SCOPE );
@@ -63,9 +64,11 @@ public abstract class WikiBodyTag extends BodyTagSupport
implements TryCatchFina
*/
public abstract int doWikiStartTag() throws JspException, IOException;
- public void doCatch( final Throwable arg0) throws Throwable {
+ @Override
+ public void doCatch(final Throwable arg0) throws Throwable {
}
+ @Override
public void doFinally()
{
m_wikiContext = null;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiLinkTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiLinkTag.java
index 7b5bb075d..5a90fbd14 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiLinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiLinkTag.java
@@ -47,7 +47,8 @@ public abstract class WikiLinkTag extends WikiTagBase {
protected String m_template;
- public void initTag()
+ @Override
+ public void initTag()
{
super.initTag();
m_pageName = m_template = null;
@@ -87,6 +88,7 @@ public abstract class WikiLinkTag extends WikiTagBase {
}
}
+ @Override
public int doEndTag()
{
try
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java
index e282bf0ca..8eeb701f4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/WikiTagBase.java
@@ -47,6 +47,7 @@ public abstract class WikiTagBase extends TagSupport
implements TryCatchFinally
* This method calls the parent setPageContext() but it also provides a
way for a tag to initialize itself before
* any of the setXXX() methods are called.
*/
+ @Override
public void setPageContext( final PageContext arg0 ) {
super.setPageContext( arg0 );
initTag();
@@ -85,6 +86,7 @@ public abstract class WikiTagBase extends TagSupport
implements TryCatchFinally
return EVAL_PAGE;
}
+ @Override
public void doCatch( final Throwable th ) throws Throwable {
LOG.error( th.getMessage(), th );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java
index 869de6bed..922fbb47e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java
@@ -102,11 +102,13 @@ public abstract class AbstractCommand implements Command {
/**
* @see org.apache.wiki.api.core.Command#targetedCommand(Object)
*/
- public abstract Command targetedCommand( final Object target );
+ @Override
+ public abstract Command targetedCommand(final Object target );
/**
* @see org.apache.wiki.api.core.Command#getContentTemplate()
*/
+ @Override
public final String getContentTemplate() {
return m_contentTemplate;
}
@@ -114,6 +116,7 @@ public abstract class AbstractCommand implements Command {
/**
* @see org.apache.wiki.api.core.Command#getJSP()
*/
+ @Override
public final String getJSP() {
return m_jsp;
}
@@ -121,11 +124,13 @@ public abstract class AbstractCommand implements Command {
/**
* @see org.apache.wiki.api.core.Command#getName()
*/
+ @Override
public abstract String getName();
/**
* @see org.apache.wiki.api.core.Command#getRequestContext()
*/
+ @Override
public final String getRequestContext() {
return m_requestContext;
}
@@ -133,6 +138,7 @@ public abstract class AbstractCommand implements Command {
/**
* @see org.apache.wiki.api.core.Command#getTarget()
*/
+ @Override
public final Object getTarget() {
return m_target;
}
@@ -140,6 +146,7 @@ public abstract class AbstractCommand implements Command {
/**
* @see org.apache.wiki.api.core.Command#getURLPattern()
*/
+ @Override
public final String getURLPattern() {
return m_urlPattern;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/GroupCommand.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/GroupCommand.java
index ef390b88d..df0a1ce5e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/GroupCommand.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/GroupCommand.java
@@ -92,7 +92,8 @@ public final class GroupCommand extends AbstractCommand {
* @param target the GroupPrincipal to combine into the current Command
* @return the new, targeted command
*/
- public Command targetedCommand( final Object target ) {
+ @Override
+ public Command targetedCommand(final Object target ) {
if( !( target instanceof GroupPrincipal ) ) {
throw new IllegalArgumentException( "Target must non-null and of
type GroupPrincipal." );
}
@@ -105,6 +106,7 @@ public final class GroupCommand extends AbstractCommand {
* @return the name
* @see org.apache.wiki.api.core.Command#getName()
*/
+ @Override
public String getName() {
final Object target = getTarget();
if ( target == null ) {
@@ -119,6 +121,7 @@ public final class GroupCommand extends AbstractCommand {
* @return the permission
* @see org.apache.wiki.api.core.Command#requiredPermission()
*/
+ @Override
public Permission requiredPermission() {
return m_permission;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/PageCommand.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/PageCommand.java
index 36b3a5d62..9dbcdfeea 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/PageCommand.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/PageCommand.java
@@ -99,7 +99,8 @@ public final class PageCommand extends AbstractCommand {
* @return the new targeted command
* @throws IllegalArgumentException if the target is not of the correct
type
*/
- public Command targetedCommand( final Object target ) {
+ @Override
+ public Command targetedCommand(final Object target ) {
if( !( target instanceof Page ) ) {
throw new IllegalArgumentException( "Target must non-null and of
type Page." );
}
@@ -109,6 +110,7 @@ public final class PageCommand extends AbstractCommand {
/**
* @see org.apache.wiki.api.core.Command#getName()
*/
+ @Override
public String getName() {
final Object target = getTarget();
if( target == null ) {
@@ -120,6 +122,7 @@ public final class PageCommand extends AbstractCommand {
/**
* @see org.apache.wiki.api.core.Command#requiredPermission()
*/
+ @Override
public Permission requiredPermission() {
return m_permission;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/RedirectCommand.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/RedirectCommand.java
index bccb1e9db..e6125c330 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/RedirectCommand.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/RedirectCommand.java
@@ -68,7 +68,8 @@ public final class RedirectCommand extends AbstractCommand {
* @param target the object to combine
* @throws IllegalArgumentException if the target is not of the correct
type
*/
- public Command targetedCommand( final Object target ) {
+ @Override
+ public Command targetedCommand(final Object target ) {
if ( !( target instanceof String ) ) {
throw new IllegalArgumentException( "Target must non-null and of
type String." );
}
@@ -78,6 +79,7 @@ public final class RedirectCommand extends AbstractCommand {
/**
* @see org.apache.wiki.api.core.Command#getName()
*/
+ @Override
public String getName() {
final Object target = getTarget();
if ( target == null ) {
@@ -91,6 +93,7 @@ public final class RedirectCommand extends AbstractCommand {
*
* @see org.apache.wiki.api.core.Command#requiredPermission()
*/
+ @Override
public Permission requiredPermission() {
return null;
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
index 3ca3d1fa8..be14611f1 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
@@ -69,6 +69,7 @@ public class DefaultProgressManager implements
ProgressManager {
* @param pi ProgressItem to start
* @param id The progress identifier
*/
+ @Override
public void startProgress( final ProgressItem pi, final String id ) {
LOG.debug( "Adding " + id + " to progress queue" );
m_progressingTasks.put( id, pi );
@@ -81,6 +82,7 @@ public class DefaultProgressManager implements
ProgressManager {
*
* @param id The progress identifier
*/
+ @Override
public void stopProgress( final String id ) {
LOG.debug( "Removed " + id + " from progress queue" );
final ProgressItem pi = m_progressingTasks.remove( id );
@@ -96,6 +98,7 @@ public class DefaultProgressManager implements
ProgressManager {
* @return a value between 0 to 100 indicating the progress
* @throws IllegalArgumentException If no such progress item exists.
*/
+ @Override
public int getProgress( final String id ) throws IllegalArgumentException {
final ProgressItem pi = m_progressingTasks.get( id );
if( pi != null ) {
@@ -120,11 +123,13 @@ public class DefaultProgressManager implements
ProgressManager {
{
return DefaultProgressManager.this.getProgress( progressId );
}
-
+
+ @Override
public String getServletMapping() {
return JSON_PROGRESSTRACKER;
}
-
+
+ @Override
public void service( final HttpServletRequest req,
final HttpServletResponse resp,
final String actionName,
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java
b/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java
index acf44318d..3f42bebf6 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java
@@ -92,13 +92,15 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
- public final void addSuccessor( final Outcome outcome, final Step step ) {
+ @Override
+ public final void addSuccessor(final Outcome outcome, final Step step ) {
m_successors.put( outcome, step );
}
/**
* {@inheritDoc}
*/
+ @Override
public final Collection< Outcome > getAvailableOutcomes() {
final Set< Outcome > outcomes = m_successors.keySet();
return Collections.unmodifiableCollection( outcomes );
@@ -107,6 +109,7 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
+ @Override
public final List< String > getErrors() {
return Collections.unmodifiableList( m_errors );
}
@@ -114,16 +117,19 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
- public abstract Outcome execute( Context ctx ) throws WikiException;
+ @Override
+ public abstract Outcome execute(Context ctx ) throws WikiException;
/**
* {@inheritDoc}
*/
+ @Override
public abstract Principal getActor();
/**
* {@inheritDoc}
*/
+ @Override
public final Date getEndTime() {
return m_end;
}
@@ -131,6 +137,7 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
+ @Override
public final String getMessageKey() {
return m_key;
}
@@ -138,6 +145,7 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
+ @Override
public final synchronized Outcome getOutcome() {
return m_outcome;
}
@@ -145,6 +153,7 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
+ @Override
public final Date getStartTime() {
return m_start;
}
@@ -152,6 +161,7 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
+ @Override
public final boolean isCompleted() {
return m_completed;
}
@@ -159,6 +169,7 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
+ @Override
public final boolean isStarted() {
return m_started;
}
@@ -166,7 +177,8 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
- public final synchronized void setOutcome( final Outcome outcome ) {
+ @Override
+ public final synchronized void setOutcome(final Outcome outcome ) {
// Is this an allowed Outcome?
if( !m_successors.containsKey( outcome ) ) {
if( !Outcome.STEP_CONTINUE.equals( outcome ) &&
!Outcome.STEP_ABORT.equals( outcome ) ) {
@@ -188,6 +200,7 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
+ @Override
public final synchronized void start() throws WikiException {
if( m_started ) {
throw new IllegalStateException( "Step already started." );
@@ -199,7 +212,8 @@ public abstract class AbstractStep implements Step {
/**
* {@inheritDoc}
*/
- public final Step getSuccessor( final Outcome outcome ) {
+ @Override
+ public final Step getSuccessor(final Outcome outcome ) {
return m_successors.get( outcome );
}
@@ -211,7 +225,8 @@ public abstract class AbstractStep implements Step {
* @param workflowId the parent workflow id to set
* @param workflowContext the parent workflow context to set
*/
- public final synchronized void setWorkflow( final int workflowId, final
Map< String, Serializable > workflowContext ) {
+ @Override
+ public final synchronized void setWorkflow(final int workflowId, final
Map< String, Serializable > workflowContext ) {
this.workflowId = workflowId;
this.workflowContext = workflowContext;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Decision.java
b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Decision.java
index 6777f2876..7f833ecc5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Decision.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Decision.java
@@ -121,7 +121,8 @@ public abstract class Decision extends AbstractStep {
* @return the Outcome of the execution
* @throws WikiException never
*/
- public Outcome execute( final Context context ) throws WikiException {
+ @Override
+ public Outcome execute(final Context context ) throws WikiException {
if( getOutcome().isCompletion() ) {
return getOutcome();
}
@@ -136,6 +137,7 @@ public abstract class Decision extends AbstractStep {
/**
* {@inheritDoc}
*/
+ @Override
public final Principal getActor() {
return m_actor;
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/workflow/SimpleNotification.java
b/jspwiki-main/src/main/java/org/apache/wiki/workflow/SimpleNotification.java
index 29cb4b2ee..6cf383f8e 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/workflow/SimpleNotification.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/workflow/SimpleNotification.java
@@ -63,6 +63,7 @@ public final class SimpleNotification extends Decision {
*
* @return <code>false</code> always.
*/
+ @Override
public boolean isReassignable() {
return false;
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java
b/jspwiki-main/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java
index 4de73ae41..8e75b0008 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/SystemPrincipal.java
@@ -43,6 +43,7 @@ public final class SystemPrincipal implements Principal {
/**
* {@inheritDoc}
*/
+ @Override
public String getName() {
return m_name;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Task.java
b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Task.java
index cfe33985c..87a68400b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Task.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Task.java
@@ -69,6 +69,7 @@ public abstract class Task extends AbstractStep {
*
* @return the system principal
*/
+ @Override
public final Principal getActor() {
return SystemPrincipal.SYSTEM_USER;
}
diff --git a/jspwiki-main/src/test/java/SamplePlugin2.java
b/jspwiki-main/src/test/java/SamplePlugin2.java
index 5ea6d32c3..e188ddc05 100644
--- a/jspwiki-main/src/test/java/SamplePlugin2.java
+++ b/jspwiki-main/src/test/java/SamplePlugin2.java
@@ -30,7 +30,8 @@ public class SamplePlugin2 implements Plugin {
public void initialize( final Engine engine ) throws PluginException {
}
- public String execute( final Context context, final Map< String, String >
params ) throws PluginException {
+ @Override
+ public String execute(final Context context, final Map< String, String >
params ) throws PluginException {
return params.get( "text" );
}
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
index c52102d56..21c2db494 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
@@ -34,6 +34,7 @@ public class SecurityEventTrap implements WikiEventListener
private WikiSecurityEvent m_lastEvent;
private final List<WikiSecurityEvent> m_events = new
ArrayList<WikiSecurityEvent>();
+ @Override
public void actionPerformed(final WikiEvent event )
{
if ( event instanceof WikiSecurityEvent )
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin3.java
b/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin3.java
index f7afdcaad..4d41f7ef5 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin3.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin3.java
@@ -36,7 +36,8 @@ public class SamplePlugin3 implements Plugin {
public void initialize( final Engine engine ) throws PluginException {
}
- public String execute( final Context context, final Map< String, String >
params ) throws PluginException {
+ @Override
+ public String execute(final Context context, final Map< String, String >
params ) throws PluginException {
return params.get( "text" );
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
index 931ba8a1f..70a8d316d 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
@@ -283,6 +283,7 @@ public class TestContainer {
*/
public static final class ShutdownHandler extends AbstractHandler {
+ @Override
public void handle(final String target, final Request baseRequest,
final HttpServletRequest request, final HttpServletResponse response ) throws
IOException, ServletException {
if( request.getRequestURI().contains( SHUTDOWN_CMD ) ) {
LOG.error( "stop cmd received, shutting down server" );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/workflow/TaskTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/workflow/TaskTest.java
index dcbe890e2..fe2bdf0e1 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/workflow/TaskTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/workflow/TaskTest.java
@@ -47,7 +47,8 @@ public class TaskTest {
super( workflow.getId(), workflow.getAttributes(), "task.normal" );
}
- public Outcome execute( final Context context ) {
+ @Override
+ public Outcome execute(final Context context ) {
return Outcome.STEP_COMPLETE;
}
@@ -62,7 +63,8 @@ public class TaskTest {
super( workflow.getId(), workflow.getAttributes(), "task.error" );
}
- public Outcome execute( final Context context ) {
+ @Override
+ public Outcome execute(final Context context ) {
addError( "Found an error." );
addError( "Found a second one!" );
return Outcome.STEP_ABORT;
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
index b0c29cd4f..3a3720c54 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
@@ -445,6 +445,7 @@ public final class MailUtil {
* Returns the password used to authenticate to the SMTP server.
* @return <code>PasswordAuthentication</code>
*/
+ @Override
public PasswordAuthentication getPasswordAuthentication()
{
if ( BLANK.equals(m_pass) )
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/PriorityList.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/PriorityList.java
index 87c2ffd4a..3e847e805 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/PriorityList.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PriorityList.java
@@ -75,6 +75,7 @@ public class PriorityList<E>
* @param o Object to add.
* @return true, as per the general Collections.add contract.
*/
+ @Override
public boolean add(final E o )
{
add( o, DEFAULT_PRIORITY );
@@ -88,6 +89,7 @@ public class PriorityList<E>
* @param index The index.
* @return The object at the list at the position "index".
*/
+ @Override
public E get(final int index )
{
return m_elements.get( index ).m_object;
@@ -98,6 +100,7 @@ public class PriorityList<E>
*
* @return size of the list.
*/
+ @Override
public int size()
{
return m_elements.size();
diff --git
a/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
index 94f44f6f2..cdc77462a 100644
---
a/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
+++
b/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/CollatorComparator.java
@@ -61,6 +61,7 @@ public class CollatorComparator implements Comparator<String>
* (non-Javadoc)
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
+ @Override
public int compare(final String str1, final String str2 )
{
if( StringUtils.equals( str1, str2 ) ) {
diff --git
a/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
index 4baac9ca7..d1ea2787f 100644
---
a/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
+++
b/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/HumanComparator.java
@@ -78,6 +78,7 @@ public class HumanComparator implements Comparator< String > {
* (non-Javadoc)
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
+ @Override
public int compare(final String str1, final String str2 )
{
// Some quick and easy checks
diff --git
a/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java
index e57feedc9..687d9d57d 100644
---
a/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java
+++
b/jspwiki-util/src/main/java/org/apache/wiki/util/comparators/JavaNaturalComparator.java
@@ -36,6 +36,7 @@ public class JavaNaturalComparator implements
Comparator<String>
* (non-Javadoc)
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
+ @Override
public int compare(final String str1, final String str2 ) {
if (StringUtils.equals( str1, str2 ) ) {
return 0; // the same object
