You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/07/15 23:42:34 UTC
svn commit: r1503490 - in /incubator/jspwiki/trunk: ./
jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wiki/auth/ jspwiki-wa...
Author: gmazza
Date: Mon Jul 15 21:42:34 2013
New Revision: 1503490
URL: http://svn.apache.org/r1503490
Log:
Removed redundant final modifiers on methods in final classes (Sonar analysis.)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiSession.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/Role.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Jul 15 21:42:34 2013
@@ -1,3 +1,10 @@
+2013-07-15 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-19
+
+ * Some Sonar complaints removed regarding redundant final declarations within
+ final classes.
+
2013-07-14 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-18
Modified: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext (original)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext Mon Jul 15 21:42:34 2013
@@ -1,5 +1,22 @@
Title: Changelog
+#### 2013-07-15 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-19
+
+* Minor amount of Sonar complaints removed regarding redundant final declarations within
+ final classes.
+
+#### 2013-07-14 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-18
+
+* Fixed the 160-170 Sonar complaints about redundant methods/variables redundantly being
+ declared "public" or "public static final" within interfaces, also removed unused imports.
+ Pre-commit we're at 77.5% rules compliance (ranked 69 of 87 Apache projects).
+
+* Moved POM dependency scope declarations out of root pom and into jspwiki-war pom.
+
#### 2013-07-11 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-17
Modified: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Mon Jul 15 21:42:34 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-17
\ No newline at end of file
+JSPWiki v2.10.0-svn-19
\ No newline at end of file
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Mon Jul 15 21:42:34 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "18";
+ public static final String BUILD = "19";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiSession.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiSession.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiSession.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiSession.java Mon Jul 15 21:42:34 2013
@@ -128,7 +128,7 @@ public final class WikiSession implement
* @param group the group to test
* @return the result
*/
- protected final boolean isInGroup( Group group )
+ protected boolean isInGroup( Group group )
{
for ( Principal principal : getPrincipals() )
{
@@ -154,7 +154,7 @@ public final class WikiSession implement
* Role.ASSERTED.
* @return Returns <code>true</code> if the user is asserted
*/
- public final boolean isAsserted()
+ public boolean isAsserted()
{
return m_subject.getPrincipals().contains( Role.ASSERTED );
}
@@ -167,7 +167,7 @@ public final class WikiSession implement
* if the user is not anonymous <em>and</em> not asserted.
* @return Returns <code>true</code> if the user is authenticated
*/
- public final boolean isAuthenticated()
+ public boolean isAuthenticated()
{
// If Role.AUTHENTICATED is in principals set, always return true.
if ( m_subject.getPrincipals().contains( Role.AUTHENTICATED ) )
@@ -203,7 +203,7 @@ public final class WikiSession implement
* @return whether the current user's identity is equivalent to an IP
* address
*/
- public final boolean isAnonymous()
+ public boolean isAnonymous()
{
Set<Principal> principals = m_subject.getPrincipals();
return principals.contains( Role.ANONYMOUS ) ||
@@ -223,7 +223,7 @@ public final class WikiSession implement
* externally-provided Principal, the object returned is the Principal, not
* the wrapper around it.
*/
- public final Principal getLoginPrincipal()
+ public Principal getLoginPrincipal()
{
return m_loginPrincipal;
}
@@ -241,7 +241,7 @@ public final class WikiSession implement
* {@link org.apache.wiki.auth.WikiPrincipal#GUEST}.
* @return the primary user Principal
*/
- public final Principal getUserPrincipal()
+ public Principal getUserPrincipal()
{
return m_userPrincipal;
}
@@ -257,7 +257,7 @@ public final class WikiSession implement
* @return A cached Locale object
* @since 2.5.96
*/
- public final Locale getLocale()
+ public Locale getLocale()
{
return m_cachedLocale;
}
@@ -268,7 +268,7 @@ public final class WikiSession implement
* the {@link #clearMessages()} method is called.
* @param message the message to add; if <code>null</code> it is ignored.
*/
- public final void addMessage(String message)
+ public void addMessage(String message)
{
addMessage( ALL, message );
}
@@ -281,7 +281,7 @@ public final class WikiSession implement
* @param topic the topic to associate the message to;
* @param message the message to add
*/
- public final void addMessage(String topic, String message)
+ public void addMessage(String topic, String message)
{
if ( topic == null )
{
@@ -299,7 +299,7 @@ public final class WikiSession implement
/**
* Clears all messages associated with this session.
*/
- public final void clearMessages()
+ public void clearMessages()
{
m_messages.clear();
}
@@ -308,7 +308,7 @@ public final class WikiSession implement
* Clears all messages associated with a session topic.
* @param topic the topic whose messages should be cleared.
*/
- public final void clearMessages( String topic )
+ public void clearMessages( String topic )
{
Set<String> messages = m_messages.get( topic );
if ( messages != null )
@@ -323,7 +323,7 @@ public final class WikiSession implement
* session unless they have been reset with {@link #clearMessages()}.
* @return the current messages.
*/
- public final String[] getMessages()
+ public String[] getMessages()
{
return getMessages( ALL );
}
@@ -335,7 +335,7 @@ public final class WikiSession implement
* @return the current messages.
* @param topic The topic
*/
- public final String[] getMessages( String topic )
+ public String[] getMessages( String topic )
{
Set<String> messages = m_messages.get( topic );
if ( messages == null || messages.size() == 0 )
@@ -352,7 +352,7 @@ public final class WikiSession implement
* @return Returns the user principal
* @see org.apache.wiki.auth.AuthenticationManager#isUserPrincipal(Principal)
*/
- public final Principal[] getPrincipals()
+ public Principal[] getPrincipals()
{
ArrayList<Principal> principals = new ArrayList<Principal>();
@@ -381,7 +381,7 @@ public final class WikiSession implement
* @return an array of Principal objects corresponding to the roles the
* Subject possesses
*/
- public final Principal[] getRoles()
+ public Principal[] getRoles()
{
Set<Principal> roles = new HashSet<Principal>();
@@ -404,7 +404,7 @@ public final class WikiSession implement
* @param engine the wiki engine
* @param request the users's HTTP request
*/
- public static final void removeWikiSession( WikiEngine engine, HttpServletRequest request )
+ public static void removeWikiSession( WikiEngine engine, HttpServletRequest request )
{
if ( engine == null || request == null )
{
@@ -421,7 +421,7 @@ public final class WikiSession implement
* @param principal the Principal to test
* @return the result
*/
- public final boolean hasPrincipal( Principal principal )
+ public boolean hasPrincipal( Principal principal )
{
return m_subject.getPrincipals().contains( principal );
@@ -433,7 +433,7 @@ public final class WikiSession implement
* by the WikiSession.
* @see org.apache.wiki.event.WikiEventListener#actionPerformed(org.apache.wiki.event.WikiEvent)
*/
- public final void actionPerformed( WikiEvent event )
+ public void actionPerformed( WikiEvent event )
{
if ( event instanceof WikiSecurityEvent )
{
@@ -597,7 +597,7 @@ public final class WikiSession implement
* Invalidates the WikiSession and resets its Subject's
* Principals to the equivalent of a "guest session".
*/
- public final void invalidate()
+ public void invalidate()
{
m_subject.getPrincipals().clear();
m_subject.getPrincipals().add( WikiPrincipal.GUEST );
@@ -620,7 +620,7 @@ public final class WikiSession implement
* saved. If the wiki session is null, or there is no matching user profile,
* the method returns silently.
*/
- protected final void injectGroupPrincipals()
+ protected void injectGroupPrincipals()
{
// Flush the existing GroupPrincipals
m_subject.getPrincipals().removeAll( m_subject.getPrincipals(GroupPrincipal.class) );
@@ -643,7 +643,7 @@ public final class WikiSession implement
* will replace all other WikiPrincipals in the Subject. <em>Note:
* this method is never called during anonymous or asserted sessions.</em>
*/
- protected final void injectUserProfilePrincipals()
+ protected void injectUserProfilePrincipals()
{
// Search for the user profile
String searchId = m_loginPrincipal.getName();
@@ -698,7 +698,7 @@ public final class WikiSession implement
* </ul>
* @return the user's session status
*/
- public final String getStatus()
+ public String getStatus()
{
return m_status;
}
@@ -717,7 +717,7 @@ public final class WikiSession implement
* @param request the servlet request object
* @return the existing (or newly created) wiki session
*/
- public static final WikiSession getWikiSession( WikiEngine engine, HttpServletRequest request )
+ public static WikiSession getWikiSession( WikiEngine engine, HttpServletRequest request )
{
// If request is null, return guest session
if ( request == null )
@@ -752,7 +752,7 @@ public final class WikiSession implement
* @param engine the wiki engine
* @return the guest wiki session
*/
- public static final WikiSession guestSession( WikiEngine engine )
+ public static WikiSession guestSession( WikiEngine engine )
{
WikiSession session = new WikiSession();
session.m_engine = engine;
@@ -802,7 +802,7 @@ public final class WikiSession implement
* @param engine the wiki session
* @return the number of sessions
*/
- public static final int sessions( WikiEngine engine )
+ public static int sessions( WikiEngine engine )
{
SessionMonitor monitor = SessionMonitor.getInstance( engine );
return monitor.sessions();
@@ -816,7 +816,7 @@ public final class WikiSession implement
* @param engine the wiki engine
* @return an array of Principal objects, sorted by name
*/
- public static final Principal[] userPrincipals( WikiEngine engine )
+ public static Principal[] userPrincipals( WikiEngine engine )
{
SessionMonitor monitor = SessionMonitor.getInstance( engine );
return monitor.userPrincipals();
@@ -835,7 +835,7 @@ public final class WikiSession implement
* @throws java.security.AccessControlException if the action is not permitted
* by the security policy
*/
- public static final Object doPrivileged( WikiSession session, PrivilegedAction<?> action ) throws AccessControlException
+ public static Object doPrivileged( WikiSession session, PrivilegedAction<?> action ) throws AccessControlException
{
return Subject.doAsPrivileged( session.m_subject, action, null );
}
@@ -846,7 +846,7 @@ public final class WikiSession implement
* @param name the address to test
* @return the result
*/
- protected static final boolean isIPV4Address( String name )
+ protected static boolean isIPV4Address( String name )
{
if ( name.charAt( 0 ) == DOT || name.charAt( name.length() - 1 ) == DOT )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java Mon Jul 15 21:42:34 2013
@@ -158,7 +158,7 @@ public final class AuthenticationManager
* @throws WikiException if the AuthenticationManager cannot be initialized
*/
@SuppressWarnings("unchecked")
- public final void initialize( WikiEngine engine, Properties props ) throws WikiException
+ public void initialize( WikiEngine engine, Properties props ) throws WikiException
{
m_engine = engine;
m_storeIPAddress = TextUtil.getBooleanProperty( props, PROP_STOREIPADDRESS, m_storeIPAddress );
@@ -206,7 +206,7 @@ public final class AuthenticationManager
* @return <code>true</code> if the wiki's authentication is managed by
* the container, <code>false</code> otherwise
*/
- public final boolean isContainerAuthenticated()
+ public boolean isContainerAuthenticated()
{
if( !m_useJAAS ) return true;
@@ -260,7 +260,7 @@ public final class AuthenticationManager
* @throws org.apache.wiki.auth.WikiSecurityException if the user cannot be logged in for any reason
* @since 2.3
*/
- public final boolean login( HttpServletRequest request ) throws WikiSecurityException
+ public boolean login( HttpServletRequest request ) throws WikiSecurityException
{
HttpSession httpSession = request.getSession();
WikiSession session = SessionMonitor.getInstance(m_engine).find( httpSession );
@@ -337,7 +337,7 @@ public final class AuthenticationManager
* @throws org.apache.wiki.auth.WikiSecurityException if the Authorizer or UserManager cannot be obtained
* @deprecated use {@link #login(WikiSession, HttpServletRequest, String, String)} instead
*/
- public final boolean login( WikiSession session, String username, String password ) throws WikiSecurityException
+ public boolean login( WikiSession session, String username, String password ) throws WikiSecurityException
{
return login( session, null, username, password );
}
@@ -362,7 +362,7 @@ public final class AuthenticationManager
* @return true, if the username/password is valid
* @throws org.apache.wiki.auth.WikiSecurityException if the Authorizer or UserManager cannot be obtained
*/
- public final boolean login( WikiSession session, HttpServletRequest request, String username, String password ) throws WikiSecurityException
+ public boolean login( WikiSession session, HttpServletRequest request, String username, String password ) throws WikiSecurityException
{
if ( session == null )
{
@@ -437,7 +437,7 @@ public final class AuthenticationManager
* the user's browser session, if it was set.
* @param request the current HTTP request
*/
- public final void logout( HttpServletRequest request )
+ public void logout( HttpServletRequest request )
{
if( request == null )
{
@@ -475,7 +475,7 @@ public final class AuthenticationManager
* the WikiEngine property {@link #PROP_ALLOW_COOKIE_ASSERTIONS}.
* @return <code>true</code> if cookies are allowed
*/
- public final boolean allowsCookieAssertions()
+ public boolean allowsCookieAssertions()
{
return m_allowsCookieAssertions;
}
@@ -487,7 +487,7 @@ public final class AuthenticationManager
* @return <code>true</code> if cookies are allowed for authentication
* @since 2.5.62
*/
- public final boolean allowsCookieAuthentication()
+ public boolean allowsCookieAuthentication()
{
return m_allowsCookieAuthentication;
}
@@ -500,7 +500,7 @@ public final class AuthenticationManager
* {@link org.apache.wiki.auth.authorize.Role},
* <code>false</code> otherwise
*/
- public static final boolean isRolePrincipal( Principal principal )
+ public static boolean isRolePrincipal( Principal principal )
{
return principal instanceof Role || principal instanceof GroupPrincipal;
}
@@ -513,7 +513,7 @@ public final class AuthenticationManager
* {@link org.apache.wiki.auth.authorize.Role},
* <code>true</code> otherwise
*/
- public static final boolean isUserPrincipal( Principal principal )
+ public static boolean isUserPrincipal( Principal principal )
{
return !isRolePrincipal( principal );
}
@@ -588,7 +588,7 @@ public final class AuthenticationManager
* @param name the file to obtain, <em>e.g.</em>, <code>jspwiki.policy</code>
* @return the URL to the file
*/
- protected static final URL findConfigFile( WikiEngine engine, String name )
+ protected static URL findConfigFile( WikiEngine engine, String name )
{
// Try creating an absolute path first
File defaultFile = null;
@@ -676,7 +676,7 @@ public final class AuthenticationManager
* This is a convenience method.
* @param listener the event listener
*/
- public final synchronized void addWikiEventListener( WikiEventListener listener )
+ public synchronized void addWikiEventListener( WikiEventListener listener )
{
WikiEventManager.addWikiEventListener( this, listener );
}
@@ -686,7 +686,7 @@ public final class AuthenticationManager
* This is a convenience method.
* @param listener the event listener
*/
- public final synchronized void removeWikiEventListener( WikiEventListener listener )
+ public synchronized void removeWikiEventListener( WikiEventListener listener )
{
WikiEventManager.removeWikiEventListener( this, listener );
}
@@ -700,7 +700,7 @@ public final class AuthenticationManager
* @param principal the subject of the event, which may be <code>null</code>
* @param target the changed Object, which may be <code>null</code>
*/
- protected final void fireEvent( int type, Principal principal, Object target )
+ protected void fireEvent( int type, Principal principal, Object target )
{
if ( WikiEventManager.isListening(this) )
{
@@ -709,8 +709,8 @@ public final class AuthenticationManager
}
/**
- * Initializes the options Map supplied to the configured LoginModule every time it is invoked by
- * {@link #doLoginModule(Class, CallbackHandler)}. The properties and values extracted from
+ * Initializes the options Map supplied to the configured LoginModule every time it is invoked.
+ * The properties and values extracted from
* <code>jspwiki.properties</code> are of the form
* <code>jspwiki.loginModule.options.<var>param</var> = <var>value</var>, where
* <var>param</var> is the key name, and <var>value</var> is the value.
@@ -753,7 +753,7 @@ public final class AuthenticationManager
* @param authorizer the WikiEngine's configured Authorizer
* @param request the user's HTTP session, which may be <code>null</code>
*/
- private final void injectAuthorizerRoles( WikiSession session, Authorizer authorizer, HttpServletRequest request )
+ private void injectAuthorizerRoles( WikiSession session, Authorizer authorizer, HttpServletRequest request )
{
// Test each role the authorizer knows about
for ( Principal role : authorizer.getRoles() )
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java Mon Jul 15 21:42:34 2013
@@ -165,7 +165,7 @@ public final class AuthorizationManager
* @see #hasRoleOrPrincipal(WikiSession, Principal)
* @return the result of the Permission check
*/
- public final boolean checkPermission( WikiSession session, Permission permission )
+ public boolean checkPermission( WikiSession session, Permission permission )
{
if( !m_useJAAS )
{
@@ -285,7 +285,7 @@ public final class AuthorizationManager
* @return <code>true</code> if the Subject supplied with the WikiContext
* posesses the Role or GroupPrincipal, <code>false</code> otherwise
*/
- public final boolean isUserInRole( WikiSession session, Principal principal )
+ public boolean isUserInRole( WikiSession session, Principal principal )
{
if ( session == null || principal == null ||
AuthenticationManager.isUserPrincipal( principal ) )
@@ -316,7 +316,7 @@ public final class AuthorizationManager
* not be initialized
* @return the current Authorizer
*/
- public final Authorizer getAuthorizer() throws WikiSecurityException
+ public Authorizer getAuthorizer() throws WikiSecurityException
{
if ( m_authorizer != null )
{
@@ -463,7 +463,7 @@ public final class AuthorizationManager
* @throws WikiException if the AuthorizationManager cannot be initialized
*/
@SuppressWarnings("deprecation")
- public final void initialize( WikiEngine engine, Properties properties ) throws WikiException
+ public void initialize( WikiEngine engine, Properties properties ) throws WikiException
{
m_engine = engine;
@@ -529,13 +529,13 @@ public final class AuthorizationManager
* @return a Authorizer used to get page authorization information
* @throws WikiException
*/
- private final Authorizer getAuthorizerImplementation( Properties props ) throws WikiException
+ private Authorizer getAuthorizerImplementation( Properties props ) throws WikiException
{
String authClassName = props.getProperty( PROP_AUTHORIZER, DEFAULT_AUTHORIZER );
return (Authorizer) locateImplementation( authClassName );
}
- private final Object locateImplementation( String clazz ) throws WikiException
+ private Object locateImplementation( String clazz ) throws WikiException
{
if ( clazz != null )
{
@@ -615,7 +615,7 @@ public final class AuthorizationManager
* @return <code>true</code> if the Subject possesses the permission,
* <code>false</code> otherwise
*/
- protected final boolean checkStaticPermission( final WikiSession session, final Permission permission )
+ protected boolean checkStaticPermission( final WikiSession session, final Permission permission )
{
if( !m_useJAAS ) return true;
@@ -668,7 +668,7 @@ public final class AuthorizationManager
* @param name the name of the Principal to resolve
* @return the fully-resolved Principal
*/
- public final Principal resolvePrincipal( String name )
+ public Principal resolvePrincipal( String name )
{
if( !m_useJAAS )
{
@@ -728,7 +728,7 @@ public final class AuthorizationManager
* Registers a WikiEventListener with this instance.
* @param listener the event listener
*/
- public final synchronized void addWikiEventListener( WikiEventListener listener )
+ public synchronized void addWikiEventListener( WikiEventListener listener )
{
WikiEventManager.addWikiEventListener( this, listener );
}
@@ -737,7 +737,7 @@ public final class AuthorizationManager
* Un-registers a WikiEventListener with this instance.
* @param listener the event listener
*/
- public final synchronized void removeWikiEventListener( WikiEventListener listener )
+ public synchronized void removeWikiEventListener( WikiEventListener listener )
{
WikiEventManager.removeWikiEventListener( this, listener );
}
@@ -751,7 +751,7 @@ public final class AuthorizationManager
* @param user the user associated with the event
* @param permission the permission the subject must possess
*/
- protected final void fireEvent( int type, Principal user, Object permission )
+ protected void fireEvent( int type, Principal user, Object permission )
{
if ( WikiEventManager.isListening(this) )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/SecurityVerifier.java Mon Jul 15 21:42:34 2013
@@ -160,7 +160,7 @@ public final class SecurityVerifier
* the policy.
* @return the array of principals
*/
- public final Principal[] policyPrincipals()
+ public Principal[] policyPrincipals()
{
return m_policyPrincipals;
}
@@ -172,7 +172,7 @@ public final class SecurityVerifier
* {@link org.apache.wiki.auth.authorize.WebContainerAuthorizer}
* @return the formatted HTML table containing the result of the tests
*/
- public final String policyRoleTable()
+ public String policyRoleTable()
{
Principal[] roles = m_policyPrincipals;
String wiki = m_engine.getApplicationName();
@@ -295,10 +295,11 @@ public final class SecurityVerifier
/**
* Prints a <td> HTML element with the results of a permission test.
- * @param perm the permission to format
- * @param allowed whether the permission is allowed
+ * @param permission the permission to format
+ * @param principal
+ * @param cols
*/
- private final String printPermissionTest( Permission permission, Principal principal, int cols )
+ private String printPermissionTest( Permission permission, Principal principal, int cols )
{
StringBuffer s = new StringBuffer();
if ( permission == null )
@@ -341,7 +342,7 @@ public final class SecurityVerifier
* @return the formatted HTML table containing the result of the tests
* @throws WikiException if tests fail for unexpected reasons
*/
- public final String containerRoleTable() throws WikiException
+ public String containerRoleTable() throws WikiException
{
AuthorizationManager authorizationManager = m_engine.getAuthorizationManager();
@@ -431,7 +432,7 @@ public final class SecurityVerifier
* correctly, and it verifies as valid.
* @return the result of the configuration check
*/
- public final boolean isSecurityPolicyConfigured()
+ public boolean isSecurityPolicyConfigured()
{
return m_isSecurityPolicyConfigured;
}
@@ -442,7 +443,7 @@ public final class SecurityVerifier
* @return the roles parsed from <code>web.xml</code>, or a zero-length array
* @throws WikiException if the web authorizer cannot obtain the list of roles
*/
- public final Principal[] webContainerRoles() throws WikiException
+ public Principal[] webContainerRoles() throws WikiException
{
Authorizer authorizer = m_engine.getAuthorizationManager().getAuthorizer();
if ( authorizer instanceof WebContainerAuthorizer )
@@ -457,7 +458,7 @@ public final class SecurityVerifier
* container <code>web.xml</code> file.
* @throws WikiException if the web authorizer cannot verify the roles
*/
- protected final void verifyPolicyAndContainerRoles() throws WikiException
+ protected void verifyPolicyAndContainerRoles() throws WikiException
{
Authorizer authorizer = m_engine.getAuthorizationManager().getAuthorizer();
Principal[] containerRoles = authorizer.getRoles();
@@ -485,7 +486,7 @@ public final class SecurityVerifier
* Verifies that the group datbase was initialized properly, and that
* user add and delete operations work as they should.
*/
- protected final void verifyGroupDatabase()
+ protected void verifyGroupDatabase()
{
GroupManager mgr = m_engine.getGroupManager();
GroupDatabase db = null;
@@ -585,7 +586,7 @@ public final class SecurityVerifier
* {@value org.apache.wiki.auth.AuthenticationManager#PROP_LOGIN_MODULE}
* resolves to a valid class on the classpath.
*/
- protected final void verifyJaas()
+ protected void verifyJaas()
{
// See if JAAS is on
AuthorizationManager authMgr = m_engine.getAuthorizationManager();
@@ -645,7 +646,7 @@ public final class SecurityVerifier
* @param property the system property to look up
* @return the file object, or <code>null</code> if not found
*/
- protected final File getFileFromProperty( String property )
+ protected File getFileFromProperty( String property )
{
String propertyValue = null;
try
@@ -707,7 +708,7 @@ public final class SecurityVerifier
* represents a valid policy.
*/
@SuppressWarnings("unchecked")
- protected final void verifyPolicy()
+ protected void verifyPolicy()
{
// Look up the policy file and set the status text.
URL policyURL = AuthenticationManager.findConfigFile( m_engine, AuthorizationManager.DEFAULT_POLICY );
@@ -786,7 +787,7 @@ public final class SecurityVerifier
* @return the result, based on consultation with the active Java security
* policy
*/
- protected final boolean verifyStaticPermission( Principal principal, final Permission permission )
+ protected boolean verifyStaticPermission( Principal principal, final Permission permission )
{
Subject subject = new Subject();
subject.getPrincipals().add( principal );
@@ -821,7 +822,7 @@ public final class SecurityVerifier
* Verifies that the user datbase was initialized properly, and that
* user add and delete operations work as they should.
*/
- protected final void verifyUserDatabase()
+ protected void verifyUserDatabase()
{
UserDatabase db = m_engine.getUserManager().getUserDatabase();
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java Mon Jul 15 21:42:34 2013
@@ -107,7 +107,7 @@ public final class UserManager
* @param props the wiki engine initialization properties
*/
@SuppressWarnings("deprecation")
- public final void initialize( WikiEngine engine, Properties props )
+ public void initialize( WikiEngine engine, Properties props )
{
m_engine = engine;
@@ -128,7 +128,7 @@ public final class UserManager
* @return the dummy user database
* @since 2.3
*/
- public final UserDatabase getUserDatabase()
+ public UserDatabase getUserDatabase()
{
// FIXME: Must not throw RuntimeException, but something else.
if( m_database != null )
@@ -206,7 +206,7 @@ public final class UserManager
* is anonymous or asserted, or if the user cannot be found in the user
* database
*/
- public final UserProfile getUserProfile( WikiSession session )
+ public UserProfile getUserProfile( WikiSession session )
{
// Look up cached user profile
UserProfile profile = m_profiles.get( session );
@@ -282,7 +282,7 @@ public final class UserManager
* {@link org.apache.wiki.workflow.DecisionRequiredException}. All other WikiException
* indicate a condition that is not normal is probably due to mis-configuration
*/
- public final void setUserProfile( WikiSession session, UserProfile profile ) throws DuplicateUserException, WikiException
+ public void setUserProfile( WikiSession session, UserProfile profile ) throws DuplicateUserException, WikiException
{
// Verify user is allowed to save profile!
Permission p = new WikiPermission( m_engine.getApplicationName(), WikiPermission.EDIT_PROFILE_ACTION );
@@ -428,7 +428,7 @@ public final class UserManager
* @param context the current wiki context
* @return a new, populated user profile
*/
- public final UserProfile parseProfile( WikiContext context )
+ public UserProfile parseProfile( WikiContext context )
{
// Retrieve the user's profile (may have been previously cached)
UserProfile profile = getUserProfile( context.getWikiSession() );
@@ -474,7 +474,7 @@ public final class UserManager
* @param context the current wiki context
* @param profile the supplied UserProfile
*/
- public final void validateProfile( WikiContext context, UserProfile profile )
+ public void validateProfile( WikiContext context, UserProfile profile )
{
boolean isNew = profile.isNew();
WikiSession session = context.getWikiSession();
@@ -794,7 +794,7 @@ public final class UserManager
* This is a convenience method.
* @param listener the event listener
*/
- public final synchronized void addWikiEventListener( WikiEventListener listener )
+ public synchronized void addWikiEventListener( WikiEventListener listener )
{
WikiEventManager.addWikiEventListener( this, listener );
}
@@ -804,7 +804,7 @@ public final class UserManager
* This is a convenience method.
* @param listener the event listener
*/
- public final synchronized void removeWikiEventListener( WikiEventListener listener )
+ public synchronized void removeWikiEventListener( WikiEventListener listener )
{
WikiEventManager.removeWikiEventListener( this, listener );
}
@@ -818,7 +818,7 @@ public final class UserManager
* @param session the wiki session supporting the event
* @param profile the user profile (or array of user profiles), which may be <code>null</code>
*/
- protected final void fireEvent( int type, WikiSession session, Object profile )
+ protected void fireEvent( int type, WikiSession session, Object profile )
{
if ( WikiEventManager.isListening(this) )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java Mon Jul 15 21:42:34 2013
@@ -100,7 +100,7 @@ public final class GroupManager implemen
* @return the group
* @throws NoSuchPrincipalException if the group cannot be found
*/
- public final Group getGroup( String name ) throws NoSuchPrincipalException
+ public Group getGroup( String name ) throws NoSuchPrincipalException
{
Group group = m_groups.get( new GroupPrincipal( name ) );
if ( group != null )
@@ -121,7 +121,7 @@ public final class GroupManager implemen
* @return the current GroupDatabase
* @since 2.3
*/
- public final GroupDatabase getGroupDatabase() throws WikiSecurityException
+ public GroupDatabase getGroupDatabase() throws WikiSecurityException
{
if ( m_groupDatabase != null )
{
@@ -185,7 +185,7 @@ public final class GroupManager implemen
* defensive copy of an internally stored hashmap.
* @return an array of Principals representing the roles
*/
- public final Principal[] getRoles()
+ public Principal[] getRoles()
{
return m_groups.keySet().toArray( new Principal[m_groups.size()] );
}
@@ -200,7 +200,7 @@ public final class GroupManager implemen
* @see GroupDatabase#groups()
* @throws WikiSecurityException if GroupManager cannot be initialized
*/
- public final void initialize( WikiEngine engine, Properties props ) throws WikiSecurityException
+ public void initialize( WikiEngine engine, Properties props ) throws WikiSecurityException
{
m_engine = engine;
@@ -254,7 +254,7 @@ public final class GroupManager implemen
* @return <code>true</code> if the user is considered to be in the role,
* <code>false</code> otherwise
*/
- public final boolean isUserInRole( WikiSession session, Principal role )
+ public boolean isUserInRole( WikiSession session, Principal role )
{
// Always return false if session/role is null, or if
// role isn't a GroupPrincipal
@@ -311,7 +311,7 @@ public final class GroupManager implemen
* <code>create</code> is <code>false</code>
* and the Group named <code>name</code> does not exist
*/
- public final Group parseGroup( String name, String memberLine, boolean create ) throws WikiSecurityException
+ public Group parseGroup( String name, String memberLine, boolean create ) throws WikiSecurityException
{
// If null name parameter, it's because someone's creating a new group
if ( name == null )
@@ -406,7 +406,7 @@ public final class GroupManager implemen
* <code>create</code> is <code>false</code>
* and the Group does not exist
*/
- public final Group parseGroup( WikiContext context, boolean create ) throws WikiSecurityException
+ public Group parseGroup( WikiContext context, boolean create ) throws WikiSecurityException
{
// Extract parameters
HttpServletRequest request = context.getHttpRequest();
@@ -439,7 +439,7 @@ public final class GroupManager implemen
* the back-end
* @see org.apache.wiki.auth.authorize.GroupDatabase#delete(Group)
*/
- public final void removeGroup( String index ) throws WikiSecurityException
+ public void removeGroup( String index ) throws WikiSecurityException
{
if ( index == null )
{
@@ -502,7 +502,7 @@ public final class GroupManager implemen
* @param group the Group, which may not be <code>null</code>
* @throws WikiSecurityException if the Group cannot be saved by the back-end
*/
- public final void setGroup( WikiSession session, Group group ) throws WikiSecurityException
+ public void setGroup( WikiSession session, Group group ) throws WikiSecurityException
{
// TODO: check for appropriate permissions
@@ -567,7 +567,7 @@ public final class GroupManager implemen
* @param context the current wiki context
* @param group the supplied Group
*/
- public final void validateGroup( WikiContext context, Group group )
+ public void validateGroup( WikiContext context, Group group )
{
InputValidator validator = new InputValidator( MESSAGES_KEY, context );
@@ -594,7 +594,7 @@ public final class GroupManager implemen
* @param memberLine the list of members
* @return the list of members
*/
- protected final String[] extractMembers( String memberLine )
+ protected String[] extractMembers( String memberLine )
{
Set<String> members = new HashSet<String>();
if ( memberLine != null )
@@ -621,7 +621,7 @@ public final class GroupManager implemen
* <code>null</code> or the Group name is illegal
* @see Group#RESTRICTED_GROUPNAMES
*/
- protected final void checkGroupName( WikiContext context, String name ) throws WikiSecurityException
+ protected void checkGroupName( WikiContext context, String name ) throws WikiSecurityException
{
//TODO: groups cannot have the same name as a user
@@ -644,7 +644,7 @@ public final class GroupManager implemen
* This is a convenience method.
* @param listener the event listener
*/
- public final synchronized void addWikiEventListener( WikiEventListener listener )
+ public synchronized void addWikiEventListener( WikiEventListener listener )
{
WikiEventManager.addWikiEventListener( this, listener );
}
@@ -654,7 +654,7 @@ public final class GroupManager implemen
* This is a convenience method.
* @param listener the event listener
*/
- public final synchronized void removeWikiEventListener( WikiEventListener listener )
+ public synchronized void removeWikiEventListener( WikiEventListener listener )
{
WikiEventManager.removeWikiEventListener( this, listener );
}
@@ -667,7 +667,7 @@ public final class GroupManager implemen
* @param type the event type to be fired
* @param target the changed Object, which may be <code>null</code>
*/
- protected final void fireEvent( int type, Object target )
+ protected void fireEvent( int type, Object target )
{
if ( WikiEventManager.isListening(this) )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/Role.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/Role.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/Role.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/Role.java Mon Jul 15 21:42:34 2013
@@ -70,7 +70,7 @@ public final class Role implements Princ
* @param role the role to check
* @return the result of the check
*/
- public static final boolean isBuiltInRole(Role role)
+ public static boolean isBuiltInRole(Role role)
{
return role.equals( ALL ) || role.equals( ANONYMOUS ) ||
role.equals( ASSERTED ) || role.equals( AUTHENTICATED );
@@ -86,7 +86,7 @@ public final class Role implements Princ
* @return <code>true</code> if the name is reserved; <code>false</code>
* if not
*/
- public static final boolean isReservedName(String name)
+ public static boolean isReservedName(String name)
{
return name.equals( ALL.m_name ) ||
name.equals( ANONYMOUS.m_name ) || name.equals( ASSERTED.m_name ) ||
@@ -97,7 +97,7 @@ public final class Role implements Princ
* Returns a unique hashcode for the Role.
* @return the hashcode
*/
- public final int hashCode()
+ public int hashCode()
{
return m_name.hashCode();
}
@@ -108,7 +108,7 @@ public final class Role implements Princ
* @return <code>true</code> if both objects are of type Role and have identical names
* @see java.lang.Object#equals(java.lang.Object)
*/
- public final boolean equals( Object obj )
+ public boolean equals( Object obj )
{
if ( obj == null || !( obj instanceof Role ) ) return false;
return m_name.equals( ( (Role) obj ).getName() );
@@ -118,7 +118,7 @@ public final class Role implements Princ
* Returns the name of the Principal.
* @return the name of the Role
*/
- public final String getName()
+ public String getName()
{
return m_name;
}
@@ -128,7 +128,7 @@ public final class Role implements Princ
* @return the string representation of the role
* @see java.lang.Object#toString()
*/
- public final String toString()
+ public String toString()
{
return "[" + this.getClass().getName() + ": " + m_name + "]";
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/AllPermission.java Mon Jul 15 21:42:34 2013
@@ -61,7 +61,7 @@ public final class AllPermission extends
* @return {@inheritDoc}
* @param obj {@inheritDoc}
*/
- public final boolean equals( Object obj )
+ public boolean equals( Object obj )
{
if ( !( obj instanceof AllPermission ) )
{
@@ -77,7 +77,7 @@ public final class AllPermission extends
*
* @return Always null.
*/
- public final String getActions()
+ public String getActions()
{
return null;
}
@@ -87,7 +87,7 @@ public final class AllPermission extends
* permission; may return the wildcard string.
* @return The wiki
*/
- public final String getWiki()
+ public String getWiki()
{
return m_wiki;
}
@@ -98,7 +98,7 @@ public final class AllPermission extends
*
* @return {@inheritDoc}
*/
- public final int hashCode()
+ public int hashCode()
{
return m_wiki.hashCode();
}
@@ -114,7 +114,7 @@ public final class AllPermission extends
* <code>false</code> otherwise
* @see java.security.Permission#implies(java.security.Permission)
*/
- public final boolean implies( Permission permission )
+ public boolean implies( Permission permission )
{
// Permission must be a JSPWiki permission, PagePermission or AllPermission
if ( !isJSPWikiPermission( permission ) )
@@ -159,7 +159,7 @@ public final class AllPermission extends
* @see java.lang.Object#toString()
* @return {@inheritDoc}
*/
- public final String toString()
+ public String toString()
{
return "(\"" + this.getClass().getName() + "\",\"" + m_wiki + "\")";
}
@@ -170,7 +170,7 @@ public final class AllPermission extends
* @param permission Permission to check
* @return true, if the permission is a JSPWiki permission; false otherwise.
*/
- protected static final boolean isJSPWikiPermission( Permission permission )
+ protected static boolean isJSPWikiPermission( Permission permission )
{
return permission instanceof WikiPermission ||
permission instanceof PagePermission ||
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java Mon Jul 15 21:42:34 2013
@@ -190,7 +190,7 @@ public final class GroupPermission exten
* @return the result of the comparison
* @see java.lang.Object#equals(java.lang.Object)
*/
- public final boolean equals( Object obj )
+ public boolean equals( Object obj )
{
if ( !( obj instanceof GroupPermission ) )
{
@@ -207,7 +207,7 @@ public final class GroupPermission exten
* @return the actions
* @see java.security.Permission#getActions()
*/
- public final String getActions()
+ public String getActions()
{
return m_actionString;
}
@@ -216,7 +216,7 @@ public final class GroupPermission exten
* Returns the name of the wiki group represented by this permission.
* @return the page name
*/
- public final String getGroup()
+ public String getGroup()
{
return m_group;
}
@@ -226,7 +226,7 @@ public final class GroupPermission exten
* permission; may return the wildcard string.
* @return the wiki
*/
- public final String getWiki()
+ public String getWiki()
{
return m_wiki;
}
@@ -236,7 +236,7 @@ public final class GroupPermission exten
* @return the hash code
* @see java.lang.Object#hashCode()
*/
- public final int hashCode()
+ public int hashCode()
{
// If the wiki has not been set, uses a dummy value for the hashcode
// calculation. This may occur if the page given does not refer
@@ -268,7 +268,7 @@ public final class GroupPermission exten
* supplied Permission; <code>false</code> otherwise
* @see java.security.Permission#implies(java.security.Permission)
*/
- public final boolean implies( Permission permission )
+ public boolean implies( Permission permission )
{
// Permission must be a GroupPermission
if ( !( permission instanceof GroupPermission ) )
@@ -313,7 +313,7 @@ public final class GroupPermission exten
* @return the string
* @see java.lang.Object#toString()
*/
- public final String toString()
+ public String toString()
{
String wiki = ( m_wiki == null ) ? "" : m_wiki;
return "(\"" + this.getClass().getName() + "\",\"" + wiki + WIKI_SEPARATOR + m_group + "\",\"" + getActions()
@@ -326,7 +326,7 @@ public final class GroupPermission exten
* @param mask binary mask for actions
* @return binary mask for implied actions
*/
- protected static final int impliedMask( int mask )
+ protected static int impliedMask( int mask )
{
if ( ( mask & DELETE_MASK ) > 0 )
{
@@ -345,7 +345,7 @@ public final class GroupPermission exten
* @param actions the actions for this permission, separated by commas
* @return the binary actions mask
*/
- protected static final int createMask( String actions )
+ protected static int createMask( String actions )
{
if ( actions == null || actions.length() == 0 )
{
@@ -463,7 +463,7 @@ public final class GroupPermission exten
* GroupPrincipal matching the implied GroupPermission’s group;
* <code>false</code> otherwise
*/
- protected final boolean impliesMember( Permission permission )
+ protected boolean impliesMember( Permission permission )
{
if ( !( permission instanceof GroupPermission ) )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java Mon Jul 15 21:42:34 2013
@@ -219,7 +219,7 @@ public final class PagePermission extend
* @param obj {@inheritDoc}
* @return {@inheritDoc}
*/
- public final boolean equals( Object obj )
+ public boolean equals( Object obj )
{
if ( !( obj instanceof PagePermission ) )
{
@@ -237,7 +237,7 @@ public final class PagePermission extend
*
* @return {@inheritDoc}
*/
- public final String getActions()
+ public String getActions()
{
return m_actionString;
}
@@ -246,7 +246,7 @@ public final class PagePermission extend
* Returns the name of the wiki page represented by this permission.
* @return the page name
*/
- public final String getPage()
+ public String getPage()
{
return m_page;
}
@@ -256,7 +256,7 @@ public final class PagePermission extend
* this permission; may return the wildcard string.
* @return the wiki
*/
- public final String getWiki()
+ public String getWiki()
{
return m_wiki;
}
@@ -265,7 +265,7 @@ public final class PagePermission extend
* Returns the hash code for this PagePermission.
* @return {@inheritDoc}
*/
- public final int hashCode()
+ public int hashCode()
{
// If the wiki has not been set, uses a dummy value for the hashcode
// calculation. This may occur if the page given does not refer
@@ -297,7 +297,7 @@ public final class PagePermission extend
* @param permission {@inheritDoc}
* @return {@inheritDoc}
*/
- public final boolean implies( Permission permission )
+ public boolean implies( Permission permission )
{
// Permission must be a PagePermission
if ( !( permission instanceof PagePermission ) )
@@ -342,7 +342,7 @@ public final class PagePermission extend
*
* @return Something human-readable
*/
- public final String toString()
+ public String toString()
{
String wiki = ( m_wiki == null ) ? "" : m_wiki;
return "(\"" + this.getClass().getName() + "\",\"" + wiki + WIKI_SEPARATOR + m_page + "\",\"" + getActions() + "\")";
@@ -354,7 +354,7 @@ public final class PagePermission extend
* @param mask binary mask for actions
* @return binary mask for implied actions
*/
- protected static final int impliedMask( int mask )
+ protected static int impliedMask( int mask )
{
if ( ( mask & DELETE_MASK ) > 0 )
{
@@ -390,7 +390,7 @@ public final class PagePermission extend
* @return the results of the test, where <code>true</code> indicates that
* <code>subSet</code> is a subset of <code>superSet</code>
*/
- protected static final boolean isSubset( String superSet, String subSet )
+ protected static boolean isSubset( String superSet, String subSet )
{
// If either is null, return false
if ( superSet == null || subSet == null )
@@ -433,7 +433,7 @@ public final class PagePermission extend
* @param actions the actions for this permission, separated by commas
* @return the binary actions mask
*/
- protected static final int createMask( String actions )
+ protected static int createMask( String actions )
{
if ( actions == null || actions.length() == 0 )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java Mon Jul 15 21:42:34 2013
@@ -119,7 +119,7 @@ public final class WikiPermission extend
* @return the result
* @see java.lang.Object#equals(java.lang.Object)
*/
- public final boolean equals( Object obj )
+ public boolean equals( Object obj )
{
if ( !( obj instanceof WikiPermission ) )
{
@@ -137,7 +137,7 @@ public final class WikiPermission extend
* @return the actions
* @see java.security.Permission#getActions()
*/
- public final String getActions()
+ public String getActions()
{
return m_actionString;
}
@@ -147,7 +147,7 @@ public final class WikiPermission extend
* permission; may return the wildcard string.
* @return the wiki
*/
- public final String getWiki()
+ public String getWiki()
{
return m_wiki;
}
@@ -156,7 +156,7 @@ public final class WikiPermission extend
* Returns the hash code for this WikiPermission.
* @return {@inheritDoc}
*/
- public final int hashCode()
+ public int hashCode()
{
return m_mask + ( ( 13 * m_actionString.hashCode() ) * 23 * m_wiki.hashCode() );
}
@@ -172,7 +172,7 @@ public final class WikiPermission extend
* <code>false</code> otherwise
* @see java.security.Permission#implies(java.security.Permission)
*/
- public final boolean implies( Permission permission )
+ public boolean implies( Permission permission )
{
// Permission must be a WikiPermission
if ( !( permission instanceof WikiPermission ) )
@@ -204,7 +204,7 @@ public final class WikiPermission extend
* Prints a human-readable representation of this permission.
* @return {@inheritDoc}
*/
- public final String toString()
+ public String toString()
{
return "(\"" + this.getClass().getName() + "\",\"" + m_wiki + "\",\"" + getActions() + "\")";
}
@@ -215,7 +215,7 @@ public final class WikiPermission extend
* @param mask the initial mask
* @return the implied mask
*/
- protected static final int impliedMask( int mask )
+ protected static int impliedMask( int mask )
{
if ( ( mask & CREATE_GROUPS_MASK ) > 0 )
{
@@ -230,7 +230,7 @@ public final class WikiPermission extend
* @param actions the permission actions, separated by commas
* @return binary mask representing the permissions
*/
- protected static final int createMask( String actions )
+ protected static int createMask( String actions )
{
if ( actions == null || actions.length() == 0 )
{
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java?rev=1503490&r1=1503489&r2=1503490&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java Mon Jul 15 21:42:34 2013
@@ -195,7 +195,7 @@ public final class CommandResolver
* @param defaultContext the request context to use by default
* @return the resolved wiki command
*/
- public final Command findCommand( HttpServletRequest request, String defaultContext )
+ public Command findCommand( HttpServletRequest request, String defaultContext )
{
// Corner case if request is null
if ( request == null )
@@ -295,7 +295,7 @@ public final class CommandResolver
* @throws ProviderException if the underlyng page provider that locates pages
* throws an exception
*/
- public final String getFinalPageName( String page ) throws ProviderException
+ public String getFinalPageName( String page ) throws ProviderException
{
boolean isThere = simplePageExists( page );
String finalName = page;
@@ -351,7 +351,7 @@ public final class CommandResolver
* @param page the page name ro search for
* @return the URL of the special page, if the supplied page is one, or <code>null</code>
*/
- public final String getSpecialPageReference( String page )
+ public String getSpecialPageReference( String page )
{
Command command = m_specialPages.get( page );
@@ -371,7 +371,7 @@ public final class CommandResolver
* @param request the HTTP request
* @return the resolved Command, or <code>null</code> if not found
*/
- protected final Command extractCommandFromPath( HttpServletRequest request )
+ protected Command extractCommandFromPath( HttpServletRequest request )
{
String jsp = request.getServletPath();
@@ -432,7 +432,7 @@ public final class CommandResolver
* @param request the HTTP request
* @return the resolved page name
*/
- protected final String extractPageFromParameter( String requestContext, HttpServletRequest request )
+ protected String extractPageFromParameter( String requestContext, HttpServletRequest request )
{
String page;
@@ -478,7 +478,7 @@ public final class CommandResolver
* @param page the name of the page to look up; this page <em>must</em> exist
* @return the wiki page
*/
- protected final WikiPage resolvePage( HttpServletRequest request, String page )
+ protected WikiPage resolvePage( HttpServletRequest request, String page )
{
// See if the user included a version parameter
WikiPage wikipage;
@@ -518,7 +518,7 @@ public final class CommandResolver
* @throws ProviderException if the underlyng page provider that locates pages
* throws an exception
*/
- protected final boolean simplePageExists( String page ) throws ProviderException
+ protected boolean simplePageExists( String page ) throws ProviderException
{
if ( m_specialPages.containsKey( page ) )
{